Various graphical adjustments.

+ Add lore for 1.4 collectible.

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

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"

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"

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";

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";

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"

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-";

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-

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-

zscript/dlc1/swwm_blueballs.zsc

@@ -48,6 +48,7 @@ Class ModernSparkster : SWWMWeapon
 		ModernSparkster.ClipCount2 4;
 		Stamina 220000;
 		+SWWMWEAPON.NOFIRSTGIVE;
+		+SWWMWEAPON.HASSCRTEX;
 		+WEAPON.EXPLOSIVE;
 	}
 	States

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
 	}
 }*/
 

zscript/dlc1/swwm_rebolber.zsc

@@ -19,6 +19,7 @@ Class PuntzerBeta : SWWMWeapon
 	int bullets[6];
 	int rotation;
 	bool initialized;
+	bool charged;
 
 	Default
 	{

zscript/dlc1/swwm_supermarioworld.zsc

@@ -33,6 +33,7 @@ Class PuntzerGamma : SWWMWeapon
 		SWWMWeapon.DropAmmoType "SWWMShellAmmoBig";
 		Stamina 30000;
 		+SWWMWEAPON.NOFIRSTGIVE;
+		+SWWMWEAPON.HASSCRTEX;
 	}
 	States
 	{