From fbf3e9fee3a561adafdc3fc3b177e06bb7bce849 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Sun, 24 Sep 2023 23:35:48 +0200 Subject: [PATCH] Small cleanup. More credits. --- language.def_menu | 1 + language.es_menu | 1 + language.version | 4 ++-- zscript/dlc1/swwm_ammoitems_dlc.zsc | 24 ------------------------ zscript/items/swwm_ammoitems.zsc | 21 --------------------- zscript/items/swwm_baseammo.zsc | 4 ++++ zscript/menu/swwm_credits.zsc | 2 +- 7 files changed, 9 insertions(+), 48 deletions(-) diff --git a/language.def_menu b/language.def_menu index 1e82ebbcf..016ea8a75 100644 --- a/language.def_menu +++ b/language.def_menu @@ -334,6 +334,7 @@ SWWM_CPATRON = "Patreon Backers:"; SWWM_CTHANK = "Special Thanks:"; SWWM_CMAB2 = "For your work in Lithium, one of the mods that have inspired me the most. I'm really really happy to have met you."; SWWM_CDRAGON2 = "For being a good pet dragon who cares about me. No matter what, our love will stay strong."; +SWWM_CVYOLETTE2 = "For your love and support during my hardest times. I can't thank you enough."; SWWM_CLUCY2 = "For the Tewi font, which I've used for many many years. I hope you're doing well, wherever you are."; SWWM_CGUTA2 = "For the Gutamatics library, and for helping me with learning ZScript."; SWWM_CMIKO2 = "For the VERY useful ZPolyobject library."; diff --git a/language.es_menu b/language.es_menu index ea4c07883..f0c29e8d0 100644 --- a/language.es_menu +++ b/language.es_menu @@ -292,6 +292,7 @@ SWWM_CPATRON = "Mecenas de Patreon:"; SWWM_CTHANK = "Agradecimientos Especiales:"; SWWM_CMAB2 = "Por tu trabajo en Lithium, uno de los mods que más me han inspirado. Me alegro muchísimo de haberte conocido."; SWWM_CDRAGON2 = "Por ser un buen dragón mascota que se preocupa por mí. A pesar de todo, nuestro amor permanecerá fuerte."; +SWWM_CVYOLETTE2 = "Por tu cariño y apoyo durante mis peores momentos. No me sobran formas de agradecértelo."; SWWM_CLUCY2 = "Por la fuente Tewi, que he seguido usando todos estos años. Espero que estés donde estés, te encuentres bien."; SWWM_CGUTA2 = "Por la librería de Gutamatics, y por ayudarme a aprender ZScript."; SWWM_CMIKO2 = "Por la MUY útil librería de ZPolyobject."; diff --git a/language.version b/language.version index 8a0e261b2..d913bed3d 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r960 \cu(Sun 24 Sep 22:21:57 CEST 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r960 \cu(2023-09-24 22:21:57)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r961 \cu(Sun 24 Sep 23:35:48 CEST 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r961 \cu(2023-09-24 23:35:48)\c-"; diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc1/swwm_ammoitems_dlc.zsc index d7700e71e..3e9cd1ff0 100644 --- a/zscript/dlc1/swwm_ammoitems_dlc.zsc +++ b/zscript/dlc1/swwm_ammoitems_dlc.zsc @@ -12,8 +12,6 @@ Class SMW05Ammo : SWWMAmmo Ammo.BackpackAmount 6; Ammo.BackpackMaxAmount 210; Ammo.DropAmount 3; - +FLOATBOB; - FloatBobStrength 0.25; Accuracy 20; } States @@ -64,8 +62,6 @@ Class SheenAmmo : SWWMAmmo Ammo.BackpackAmount 10; Ammo.BackpackMaxAmount 400; Ammo.DropAmount 20; - +FLOATBOB; - FloatBobStrength 0.25; Accuracy 30; } States @@ -116,8 +112,6 @@ Class QuadravolAmmo : SWWMAmmo Ammo.BackpackAmount 4; Ammo.BackpackMaxAmount 80; Ammo.DropAmount 1; - +FLOATBOB; - FloatBobStrength 0.25; Accuracy 45; } States @@ -154,8 +148,6 @@ Class SparksterBAmmo : SWWMAmmo Ammo.BackpackAmount 1; Ammo.BackpackMaxAmount 40; Ammo.DropAmount 1; - +FLOATBOB; - FloatBobStrength 0.25; Accuracy 70; } States @@ -192,8 +184,6 @@ Class SparksterRAmmo : SWWMAmmo Ammo.BackpackAmount 1; Ammo.BackpackMaxAmount 40; Ammo.DropAmount 1; - +FLOATBOB; - FloatBobStrength 0.25; Accuracy 75; } States @@ -229,8 +219,6 @@ Class RayBolt : MagAmmo MagAmmo.ClipSize 10; MagAmmo.BackpackAmount 2; Inventory.MaxAmount 10; - +FLOATBOB; - FloatBobStrength 0.25; } States { @@ -267,8 +255,6 @@ Class RayAmmo : SWWMAmmo Ammo.BackpackMaxAmount 5; Ammo.DropAmount 1; SWWMAmmo.MagAmmoType "RayBolt"; - +FLOATBOB; - FloatBobStrength 0.25; Accuracy 90; } States @@ -290,8 +276,6 @@ Class MisterRound : MagAmmo MagAmmo.ClipSize 12; MagAmmo.BackpackAmount 1; Inventory.MaxAmount 12; - +FLOATBOB; - FloatBobStrength 0.25; } States { @@ -335,8 +319,6 @@ Class MisterAmmo : SWWMAmmo Ammo.BackpackMaxAmount 4; Ammo.DropAmount 1; SWWMAmmo.MagAmmoType "MisterRound"; - +FLOATBOB; - FloatBobStrength 0.25; Accuracy 90; } States @@ -359,8 +341,6 @@ Class MisterGAmmo : SWWMAmmo Ammo.BackpackAmount 0; Ammo.BackpackMaxAmount 6; Ammo.DropAmount 1; - +FLOATBOB; - FloatBobStrength 0.25; Accuracy 90; } States @@ -382,8 +362,6 @@ Class UltimatePod : MagAmmo MagAmmo.ParentAmmo "UltimateAmmo"; MagAmmo.ClipSize 4; Inventory.MaxAmount 4; - +FLOATBOB; - FloatBobStrength 0.25; } States { @@ -407,8 +385,6 @@ Class UltimateAmmo : SWWMAmmo Ammo.BackpackMaxAmount 2; Ammo.DropAmount 1; SWWMAmmo.MagAmmoType "UltimatePod"; - +FLOATBOB; - FloatBobStrength 0.25; } States { diff --git a/zscript/items/swwm_ammoitems.zsc b/zscript/items/swwm_ammoitems.zsc index b1b6c9b94..38f424ab3 100644 --- a/zscript/items/swwm_ammoitems.zsc +++ b/zscript/items/swwm_ammoitems.zsc @@ -14,8 +14,6 @@ Class RedShell : SWWMAmmo Ammo.BackpackAmount 4; Ammo.BackpackMaxAmount 160; Ammo.DropAmount 2; - +FLOATBOB; - FloatBobStrength 0.25; Accuracy 50; } States @@ -99,9 +97,6 @@ Class GoldShell : SWWMAmmo Ammo.BackpackAmount 0; Ammo.BackpackMaxAmount 7; Ammo.DropAmount 1; - +FLOATBOB; - +DONTGIB; // don't crush these, they're valuable - FloatBobStrength 0.25; } States { @@ -128,9 +123,7 @@ Class EvisceratorShell : SWWMAmmo Ammo.BackpackAmount 3; Ammo.BackpackMaxAmount 60; Ammo.DropAmount 1; - +FLOATBOB; +SWWMAMMO.USEPICKUPMSG; - FloatBobStrength 0.25; Accuracy 60; } override void ModifyDropAmount( int dropamount ) @@ -187,8 +180,6 @@ Class HellblazerMissiles : SWWMAmmo Ammo.BackpackAmount 3; Ammo.BackpackMaxAmount 90; Ammo.DropAmount 1; - +FLOATBOB; - FloatBobStrength 0.25; Accuracy 70; } override void ModifyDropAmount( int dropamount ) @@ -243,8 +234,6 @@ Class SparkUnit : SWWMAmmo Ammo.BackpackAmount 1; Ammo.BackpackMaxAmount 24; Ammo.DropAmount 1; - +FLOATBOB; - FloatBobStrength 0.25; Accuracy 70; } States @@ -279,8 +268,6 @@ Class SilverBulletAmmo : SWWMAmmo Ammo.BackpackMaxAmount 9; Ammo.DropAmount 1; SWWMAmmo.MagAmmoType "SilverBullets"; - +FLOATBOB; - FloatBobStrength 0.25; Accuracy 75; } States @@ -302,8 +289,6 @@ Class SilverBullets : MagAmmo MagAmmo.ClipSize 5; MagAmmo.BackpackAmount 2; Inventory.MaxAmount 5; - +FLOATBOB; - FloatBobStrength 0.25; } States { @@ -344,8 +329,6 @@ Class CandyGunAmmo : SWWMAmmo Ammo.BackpackMaxAmount 4; Ammo.DropAmount 1; SWWMAmmo.MagAmmoType "CandyGunBullets"; - +FLOATBOB; - FloatBobStrength 0.25; Accuracy 90; } States @@ -367,8 +350,6 @@ Class CandyGunBullets : MagAmmo MagAmmo.ClipSize 7; MagAmmo.BackpackAmount 1; Inventory.MaxAmount 7; - +FLOATBOB; - FloatBobStrength 0.25; } States { @@ -462,8 +443,6 @@ Class YnykronAmmo : SWWMAmmo Ammo.BackpackAmount 0; Ammo.BackpackMaxAmount 3; Ammo.DropAmount 1; - +FLOATBOB; - FloatBobStrength 0.25; } States { diff --git a/zscript/items/swwm_baseammo.zsc b/zscript/items/swwm_baseammo.zsc index 9c5de200b..1d358f186 100644 --- a/zscript/items/swwm_baseammo.zsc +++ b/zscript/items/swwm_baseammo.zsc @@ -268,6 +268,8 @@ Class SWWMAmmo : Ammo +INVENTORY.IGNORESKILL; +DONTGIB; Inventory.PickupFlash "SWWMPickupFlash"; + +FLOATBOB; + FloatBobStrength 0.25; } } @@ -298,6 +300,8 @@ Class MagAmmo : Inventory abstract Inventory.PickupSound "misc/bullet_pkup"; Inventory.Amount 1; Inventory.PickupFlash "SWWMPickupFlash"; + +FLOATBOB; + FloatBobStrength 0.25; } virtual Class GetParentMagAmmo() diff --git a/zscript/menu/swwm_credits.zsc b/zscript/menu/swwm_credits.zsc index 0ca2a3303..4ad54b894 100644 --- a/zscript/menu/swwm_credits.zsc +++ b/zscript/menu/swwm_credits.zsc @@ -102,7 +102,6 @@ Class SWWMCreditsMenu : GenericMenu String stitle, stitle2; String sdev, sassets, smusic, svoice, slocal, spatrons, sthanks; Array cdev, cassets, cmusic, cvoice, clocal, cpatrons, cthanks; - String oldlang; Vector2 ss; double hs; Vector2 logosz; @@ -172,6 +171,7 @@ Class SWWMCreditsMenu : GenericMenu cpatrons.Push(new("SWWMCreditsEntry").Init("YaGirlJuniper")); cthanks.Push(new("SWWMCreditsEntry").Init("Marrub","$SWWM_CMAB2",Font.FindFontColor('Heliotrope'),Font.FindFontColor('BlushPink'))); cthanks.Push(new("SWWMCreditsEntry").Init("KynikossDragonn","$SWWM_CDRAGON2")); + cthanks.Push(new("SWWMCreditsEntry").Init("Vyolette","$SWWM_CVYOLETTE2")); cthanks.Push(new("SWWMCreditsEntry").Init("Lucy","$SWWM_CLUCY2")); cthanks.Push(new("SWWMCreditsEntry").Init("Gutawer","$SWWM_CGUTA2")); cthanks.Push(new("SWWMCreditsEntry").Init("Mikolah","$SWWM_CMIKO2"));