diff --git a/animdefs.misc b/animdefs.misc index 2afb1beb3..95a1578c0 100644 --- a/animdefs.misc +++ b/animdefs.misc @@ -3,7 +3,8 @@ canvastexture LOGOFADE 4 4 // ammo leds canvastexture PLASBLED 64 64 -canvastexture PLASBFAD 4 4 +canvastexture PLASBFDR 4 4 +canvastexture PLASBFDL 4 4 canvastexture SHEENLED 128 128 canvastexture QUADRLED 64 64 canvastexture MORTLED1 256 128 diff --git a/gldefs/dlc1/plasmablast.txt b/gldefs/dlc1/plasmablast.txt index 578fcc328..b96494834 100644 --- a/gldefs/dlc1/plasmablast.txt +++ b/gldefs/dlc1/plasmablast.txt @@ -17,7 +17,7 @@ Material Texture "models/PlasmaLED.png" Shader "shaders/glsl/CanvasProxy.fp" Texture "scrtex" "PLASBLED" } -Material Texture "models/PlasmaBlast_1st.png" +Material Texture "models/PlasmaBlast_1stR.png" { Shader "shaders/glsl/PlasmaBlast.fp" Texture "masktex" "models/PlasmaBlast_mask.png" @@ -27,7 +27,23 @@ Material Texture "models/PlasmaBlast_1st.png" Define "ENVFACT" = "1." Define "RIMFACT" = "1." Define "RIMSTEP" = "0." - Texture "fadetex" "PLASBFAD" + Texture "fadetex" "PLASBFDR" + Texture "battex" "models/PlasmaBlast_battery.png" + Texture "chgtex" "models/PlasmaBlast_charge.png" + Texture "gradtex" "models/PlasmaBlast_grad.png" + Texture "noisetex" "textures/roughwarp.png" +} +Material Texture "models/PlasmaBlast_1stL.png" +{ + Shader "shaders/glsl/PlasmaBlast.fp" + Texture "masktex" "models/PlasmaBlast_mask.png" + Texture "envtex" "models/envmap/iceenv.png" + Texture "rimtex" "models/envmap/icerim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = "1." + Define "RIMFACT" = "1." + Define "RIMSTEP" = "0." + Texture "fadetex" "PLASBFDL" Texture "battex" "models/PlasmaBlast_battery.png" Texture "chgtex" "models/PlasmaBlast_charge.png" Texture "gradtex" "models/PlasmaBlast_grad.png" diff --git a/graphics/HUD/BlastBar.png b/graphics/HUD/BlastBar.png new file mode 100644 index 000000000..a52f53cb8 Binary files /dev/null and b/graphics/HUD/BlastBar.png differ diff --git a/graphics/HUD/BlastDisplay.png b/graphics/HUD/BlastDisplay.png index 7cd51744f..4641a8e95 100644 Binary files a/graphics/HUD/BlastDisplay.png and b/graphics/HUD/BlastDisplay.png differ diff --git a/graphics/HUD/BlastRoundInert.png b/graphics/HUD/BlastRoundInert.png index 43cd18f50..788f420fb 100644 Binary files a/graphics/HUD/BlastRoundInert.png and b/graphics/HUD/BlastRoundInert.png differ diff --git a/graphics/HUD/DemoFace_Angerage.png b/graphics/HUD/DemoFace_Angerage.png index 49ea3f91d..d25d0bca4 100644 Binary files a/graphics/HUD/DemoFace_Angerage.png and b/graphics/HUD/DemoFace_Angerage.png differ diff --git a/graphics/HUD/DemoFace_Angery.png b/graphics/HUD/DemoFace_Angery.png index 2c62957ee..f22ad4859 100644 Binary files a/graphics/HUD/DemoFace_Angery.png and b/graphics/HUD/DemoFace_Angery.png differ diff --git a/graphics/HUD/DemoFace_Head.png b/graphics/HUD/DemoFace_Head.png index 7f695a522..8311b5477 100644 Binary files a/graphics/HUD/DemoFace_Head.png and b/graphics/HUD/DemoFace_Head.png differ diff --git a/graphics/HUD/DemoFace_Off.png b/graphics/HUD/DemoFace_Off.png index d0daf4419..3beb4116b 100644 Binary files a/graphics/HUD/DemoFace_Off.png and b/graphics/HUD/DemoFace_Off.png differ diff --git a/graphics/HUD/DemoFace_Rage.png b/graphics/HUD/DemoFace_Rage.png index f410d3ae2..0882dfd49 100644 Binary files a/graphics/HUD/DemoFace_Rage.png and b/graphics/HUD/DemoFace_Rage.png differ diff --git a/graphics/HUD/RayKhomBar.png b/graphics/HUD/RayKhomBar.png index 3fd5bf618..a17515023 100644 Binary files a/graphics/HUD/RayKhomBar.png and b/graphics/HUD/RayKhomBar.png differ diff --git a/graphics/HUD/SilverBulletZoomBar.png b/graphics/HUD/SilverBulletZoomBar.png index daf314db6..45146f351 100644 Binary files a/graphics/HUD/SilverBulletZoomBar.png and b/graphics/HUD/SilverBulletZoomBar.png differ diff --git a/graphics/HUD/SparksterDisplay.png b/graphics/HUD/SparksterDisplay.png index 3ace2a2c6..3b2bf1407 100644 Binary files a/graphics/HUD/SparksterDisplay.png and b/graphics/HUD/SparksterDisplay.png differ diff --git a/graphics/HUD/SparksterKinylumBar.png b/graphics/HUD/SparksterKinylumBar.png new file mode 100644 index 000000000..72e2178c6 Binary files /dev/null and b/graphics/HUD/SparksterKinylumBar.png differ diff --git a/graphics/HUD/SparksterNokronBar.png b/graphics/HUD/SparksterNokronBar.png new file mode 100644 index 000000000..656e2f6f8 Binary files /dev/null and b/graphics/HUD/SparksterNokronBar.png differ diff --git a/language.def_base b/language.def_base index dff22478e..cb4131949 100644 --- a/language.def_base +++ b/language.def_base @@ -135,6 +135,7 @@ T_KIRINMANGA = "Saya Miyamoto - I Married A Cherry Boy Emperor But It Turns Out T_KIRINPLUSH = "Emperor Kirin Plush"; T_MOTHPLUSH = "Moth Plush"; T_SAYASMUG = "Saya's Coffee Mug"; +T_SHARKPLUSH = "Shark Plush"; // colored tags for keys T_REDCARD = "\cgRed Keycard\c-"; T_BLUECARD = "\chBlue Keycard\c-"; @@ -693,6 +694,7 @@ SWWM_MRNONE = "EMPTY"; SWWM_MRCHARGE = "CHARGING"; SWWM_MRREADY = "READY"; SWWM_SHEENREADY = "The Sheen HMG has cooled down."; +SWWM_RAYKHOMREADY = "The Ray-Khom's capacitors have recharged."; SWWM_SENTRYFILL = "Press \cfUse\c- to restock the sentry (\cx¥\cf%d\c-)."; SWWM_DMRANK = "Rank:"; SWWM_DMSPREAD = "Spread:"; @@ -768,8 +770,8 @@ TT_PUNTZERBETA = "\cfAltfire:\c- Quickshot mode.\n" "\cfReload:\c- Reload weapon."; TT_PUNTZERGAMMA = -"\cfFire:\c- Full-auto fire.\n" -"\cfAltfire:\c- Fuller-auto fire.\n" +"\cfFire:\c- Shoot weapon.\n" +"\cfAltfire:\c- Switch speed.\n" "\cfReload:\c- Reload weapon."; TT_SHEENHMG = "\cfFire:\c- Shoot weapon.\n" diff --git a/language.def_lore b/language.def_lore index e957e0335..d6892d794 100644 --- a/language.def_lore +++ b/language.def_lore @@ -3976,6 +3976,23 @@ SWWM_LORETXT_SERPENTRIDERS2 = "\cfLittle red riding hood back there was such an easy kill, I doubt someone \"considerably stronger\" would make much of a difference, don't you think? Besides, you're smart enough to not fall for anyone's tricks and traps, aren't ya. He doesn't stand a chance, huhu...\c-\n" "\n" "\cfPS: Still think it's stupid they call themselves serpent riders when only one of them rides one.\c-"; +SWWM_LORETAG_SHARKPLUSH = "Shark Plush"; +SWWM_LORETAB_SHARKPLUSH = "Item"; +SWWM_LOREREL_SHARKPLUSH = "Nukritas2xx;Demolitionist;Saya"; +SWWM_LORETXT_SHARKPLUSH = +"\cxDesignation:\c-\n" +"\cf Dr. Shorky\c-\n" +"\cxManufacturer:\c-\n" +"\cf Nukritas 2xx\c-\n" +"\cxClassification:\c-\n" +"\cf Plush Doll\c-\n" +"\n" +"A handcrafted plush doll of a popular shark, dressed in medical garb. Features a coat, stethoscope and head mirror. Yet another of \cfNukritas 2xx\c-'s creations, commissioned as a gift to the \cfDemolitionist\c-.\n" +"\n" +"\cxSaya's Notes:\c-\n" +"\cfExplaining to people how we even came up with this would take hours, heheh.\c-\n" +"\n" +"\cfOh well, at least I figured that you'd want him along for the ride. Not like he's going to get damaged considering the ridiculous quality of whatever the hell it's made of. I never even asked her, really.\c-"; SWWM_LORETAG_SIDHE = "Sidhe"; SWWM_LORETAB_SIDHE = "Lore"; SWWM_LOREREL_SIDHE = "Parthoris;Saya;SerpentRiders;Demolitionist"; diff --git a/language.es_base b/language.es_base index 5e0357d04..0ae591fbd 100644 --- a/language.es_base +++ b/language.es_base @@ -122,6 +122,7 @@ T_KIRINMANGA = "Saya Miyamoto - Me Casé Con Un Emperador Virgen Pero Resulta Qu T_KIRINPLUSH = "Peluche de Emperador Kirin"; T_MOTHPLUSH = "Peluche de Polilla"; T_SAYASMUG = "Taza de Café de Saya"; +T_SHARKPLUSH = "Peluche de Tiburón"; // colored tags for keys T_REDCARD = "\cgTarjeta Llave Roja\c-"; T_BLUECARD = "\chTarjeta Llave Azul\c-"; @@ -576,6 +577,7 @@ SWWM_MRNONE = "VACÍO"; SWWM_MRCHARGE = "CARGANDO"; SWWM_MRREADY = "LISTO"; SWWM_SHEENREADY = "La Ametralladora Sheen se ha enfriado."; +SWWM_RAYKHOMREADY = "Los condensadores de la Ray-Khom se han recargado."; SWWM_DMRANK = "Posición:"; SWWM_DMSPREAD = "Distancia:"; SWWM_PLACE1 = "1º"; @@ -653,8 +655,8 @@ TT_PUNTZERBETA = "\cfSecundario:\c- Modo de disparo rápido.\n" "\cfRecarga:\c- Recargar arma."; TT_PUNTZERGAMMA = -"\cfPrimario:\c- Fuego automático.\n" -"\cfSecundario:\c- Fuego super-automático.\n" +"\cfPrimario:\c- Disparar arma.\n" +"\cfSecundario:\c- Alternar velocidad.\n" "\cfRecarga:\c- Recargar arma."; TT_SHEENHMG = "\cfPrimario:\c- Disparar arma.\n" @@ -699,7 +701,7 @@ BT_DSPARIL = "D'Sparil, Jinete de Serpiente"; BT_DSPARIL2 = "D'Sparil, Jinete de Serpiente"; BT_CLERIC = "Traductus, Patriarca de la Iglesia"; BT_FIGHTER = "Zedek, Mariscal de la Legión"; -BT_MAGE = "Menelkir, Archimago del Arcanum"; +BT_MAGE = "Menelkir, Archimago del Arcánum"; BT_DRAGON = "Wyvern Mortal, Bestia del Inframundo"; BT_HERESIARCH = "Heresiarca, Hechicero Demoníaco"; BT_KORAX = "Korax, Demonio Embaucador"; @@ -722,7 +724,7 @@ BT_DRAGON_FUN = "Un Puñetero Dragón"; BT_HERESIARCH_FUN = "Tío Rojo Muy Cabreado"; BT_KORAX_FUN = "Korax el Bastardo Feo Asqueroso"; BT_DEATHKINGS_FUN = "Un Refrito de Jefes muy Anticlimático"; -BT_DOOMTEST = "Oatley, Azote de los Cuáqueros"; +BT_DOOMTEST = "Avenino, Azote de los Cuáqueros"; // eviternity BT_ARCHANGELUS = "Arcángelus, Agente Celestial"; BT_ARCHANGELUS_FUN = "Un Putísimo Ángel Enorme"; diff --git a/language.es_lore b/language.es_lore index b25eef813..24d0ac06b 100644 --- a/language.es_lore +++ b/language.es_lore @@ -3693,6 +3693,21 @@ SWWM_LORETXT_SERPENTRIDERS2 = "\cfCaperucita roja fue visto y no visto la otra vez, así que dudo que alguien \"considerablemente más fuerte\" haga mucha diferencia, ¿no crees? Además, eres lo suficientemente lista para no caer en los trucos y trampas de nadie, vaya que sí. No va a poder contigo, juju...\c-\n" "\n" "\cfPD: Sigo pensando que es una estupidez que se llamen jinetes de serpiente cuando solo uno de ellos va montado en una.\c-"; +SWWM_LORETAG_SHARKPLUSH = "Peluche Tiburón"; +SWWM_LORETXT_SHARKPLUSH = +"\cxDesignación:\c-\n" +"\cf Dr. Shorky\c-\n" +"\cxFabricante:\c-\n" +"\cf Nukritas 2xx\c-\n" +"\cxClasificación:\c-\n" +"\cf Muñeco de Peluche\c-\n" +"\n" +"Un muñeco de peluche de un popular tiburón hecho a mano, equipado con vestimenta médica. Lleva una bata, un estetoscopio y un espejo frontal. Una más de las creaciones de \cfNukritas 2xx\c-, encargada como regalo a la \cfDemolicionista\c-.\n" +"\n" +"\cxNotas de Saya:\c-\n" +"\cfExplicarle a la gente como se nos ocurrió esto llevaría horas, jeje.\c-\n" +"\n" +"\cfEn fin, al menos se me ocurrió que lo querrías tener contigo. Tampoco es que se vaya a estropear considerando la calidad absurda de lo que se supone de que esté hecho. A ver, es que nunca se lo he preguntado.\c-"; SWWM_LORETXT_SIDHE = "\cxNombre:\c-\n" "\cf Sidhe\c-\n" diff --git a/language.version b/language.version index 2607db58c..11468b57b 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1004 \cu(Fri 10 Nov 20:35:34 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r1004 \cu(2023-11-10 20:35:34)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1005 \cu(Thu 16 Nov 19:55:32 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r1005 \cu(2023-11-16 19:55:32)\c-"; diff --git a/lore/default/sharkplush.txt b/lore/default/sharkplush.txt new file mode 100644 index 000000000..a6b617011 --- /dev/null +++ b/lore/default/sharkplush.txt @@ -0,0 +1,20 @@ +TAG +Shark Plush +TAB +Item +REL +Nukritas2xx;Demolitionist;Saya +TXT +\cxDesignation:\c- +\cf Dr. Shorky\c- +\cxManufacturer:\c- +\cf Nukritas 2xx\c- +\cxClassification:\c- +\cf Plush Doll\c- + +A handcrafted plush doll of a popular shark, dressed in medical garb. Features a coat, stethoscope and head mirror. Yet another of **Nukritas 2xx**'s creations, commissioned as a gift to the **Demolitionist**. + +\cxSaya's Notes:\c- +\cfExplaining to people how we even came up with this would take hours, heheh.\c- + +\cfOh well, at least I figured that you'd want him along for the ride. Not like he's going to get damaged considering the ridiculous quality of whatever the hell it's made of. I never even asked her, really.\c- diff --git a/lore/es/sharkplush.txt b/lore/es/sharkplush.txt new file mode 100644 index 000000000..0a9f5884a --- /dev/null +++ b/lore/es/sharkplush.txt @@ -0,0 +1,16 @@ +TAG +Peluche Tiburón +TXT +\cxDesignación:\c- +\cf Dr. Shorky\c- +\cxFabricante:\c- +\cf Nukritas 2xx\c- +\cxClasificación:\c- +\cf Muñeco de Peluche\c- + +Un muñeco de peluche de un popular tiburón hecho a mano, equipado con vestimenta médica. Lleva una bata, un estetoscopio y un espejo frontal. Una más de las creaciones de **Nukritas 2xx**, encargada como regalo a la **Demolicionista**. + +\cxNotas de Saya:\c- +\cfExplicarle a la gente como se nos ocurrió esto llevaría horas, jeje.\c- + +\cfEn fin, al menos se me ocurrió que lo querrías tener contigo. Tampoco es que se vaya a estropear considerando la calidad absurda de lo que se supone de que esté hecho. A ver, es que nunca se lo he preguntado.\c- diff --git a/models/PlasmaBlast_1st.png b/models/PlasmaBlast_1stL.png similarity index 100% rename from models/PlasmaBlast_1st.png rename to models/PlasmaBlast_1stL.png diff --git a/models/PlasmaBlast_1stR.png b/models/PlasmaBlast_1stR.png new file mode 100644 index 000000000..bec14d3f6 Binary files /dev/null and b/models/PlasmaBlast_1stR.png differ diff --git a/models/canvas/RayZap.png b/models/canvas/RayZap.png new file mode 100644 index 000000000..6c62e5080 Binary files /dev/null and b/models/canvas/RayZap.png differ diff --git a/models/canvas/SheenLEDBar.png b/models/canvas/SheenLEDBar.png index 5d707fa2c..b49973145 100644 Binary files a/models/canvas/SheenLEDBar.png and b/models/canvas/SheenLEDBar.png differ diff --git a/sprites/XBUBD0.png b/sprites/XBUBD0.png index 19dc9cd4c..2ae02c6de 100644 Binary files a/sprites/XBUBD0.png and b/sprites/XBUBD0.png differ diff --git a/sprites/XBUBE0.png b/sprites/XBUBE0.png index 1961cbe74..cd9a6f678 100644 Binary files a/sprites/XBUBE0.png and b/sprites/XBUBE0.png differ diff --git a/sprites/XBUBP0.png b/sprites/XBUBP0.png index 79420f3ab..cd9d853f0 100644 Binary files a/sprites/XBUBP0.png and b/sprites/XBUBP0.png differ diff --git a/sprites/XRG5W0.png b/sprites/XRG5W0.png index 71df52f9d..4222e243a 100644 Binary files a/sprites/XRG5W0.png and b/sprites/XRG5W0.png differ diff --git a/sprites/XRGAV0.png b/sprites/XRGAV0.png index faace5cb6..3f62707cb 100644 Binary files a/sprites/XRGAV0.png and b/sprites/XRGAV0.png differ diff --git a/sprites/XRGAW0.png b/sprites/XRGAW0.png index 60d052dd5..58aedd6a0 100644 Binary files a/sprites/XRGAW0.png and b/sprites/XRGAW0.png differ diff --git a/sprites/XRGBU0.png b/sprites/XRGBU0.png index a58bdb5de..e3289f3d1 100644 Binary files a/sprites/XRGBU0.png and b/sprites/XRGBU0.png differ diff --git a/zscript/dlc1/swwm_blueballs.zsc b/zscript/dlc1/swwm_blueballs.zsc index b8cd46b2a..cd67f21ad 100644 --- a/zscript/dlc1/swwm_blueballs.zsc +++ b/zscript/dlc1/swwm_blueballs.zsc @@ -48,6 +48,7 @@ Class ModernSparkster : SWWMWeapon ModernSparkster.ClipCount2 4; Stamina 220000; +SWWMWEAPON.NOFIRSTGIVE; + +SWWMWEAPON.HASSCRTEX; +WEAPON.EXPLOSIVE; } States diff --git a/zscript/dlc1/swwm_dlcweapons_canvas.zsc b/zscript/dlc1/swwm_dlcweapons_canvas.zsc index 566f07e73..69649395d 100644 --- a/zscript/dlc1/swwm_dlcweapons_canvas.zsc +++ b/zscript/dlc1/swwm_dlcweapons_canvas.zsc @@ -19,6 +19,15 @@ extend Class DualPlasmaBlast // ammo display // dynamic glow } +} + +// Puntzer Gamma +extend Class PuntzerGamma +{ + override void RenderTexture( RenderEvent e ) + { + // ammo display + } }*/ // Sheen HMG @@ -102,13 +111,23 @@ extend Class Quadravol if ( chambered ) AmmoLed.DrawTexture(AmmoLedRound,false,52,52,DTA_LegacyRenderStyle,STYLE_Shaded,DTA_FillColor,charged?0xFF404040:0xFFFF8000); } } +// Sparkster Rifle +/*extend Class ModernSparkster +{ + override void RenderTexture( RenderEvent e ) + { + // ammo display(s) + // charge meter(s) + } +} // Ray-Khom -/*extend Class RayKhom +extend Class RayKhom { override void RenderTexture( RenderEvent e ) { // ammo display + // arc lighting } }*/ diff --git a/zscript/dlc1/swwm_rebolber.zsc b/zscript/dlc1/swwm_rebolber.zsc index eda7b4b92..aba5fdcda 100644 --- a/zscript/dlc1/swwm_rebolber.zsc +++ b/zscript/dlc1/swwm_rebolber.zsc @@ -19,6 +19,7 @@ Class PuntzerBeta : SWWMWeapon int bullets[6]; int rotation; bool initialized; + bool charged; Default { diff --git a/zscript/dlc1/swwm_supermarioworld.zsc b/zscript/dlc1/swwm_supermarioworld.zsc index e5cf6cb69..c79f58803 100644 --- a/zscript/dlc1/swwm_supermarioworld.zsc +++ b/zscript/dlc1/swwm_supermarioworld.zsc @@ -33,6 +33,7 @@ Class PuntzerGamma : SWWMWeapon SWWMWeapon.DropAmmoType "SWWMShellAmmoBig"; Stamina 30000; +SWWMWEAPON.NOFIRSTGIVE; + +SWWMWEAPON.HASSCRTEX; } States {