Small cleanup. More credits.

This commit is contained in:
Mari the Deer 2023-09-24 23:35:48 +02:00
commit fbf3e9fee3
7 changed files with 9 additions and 48 deletions

View file

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

View file

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

View file

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

View file

@ -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
{

View file

@ -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
{

View file

@ -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<MagAmmo> GetParentMagAmmo()

View file

@ -102,7 +102,6 @@ Class SWWMCreditsMenu : GenericMenu
String stitle, stitle2;
String sdev, sassets, smusic, svoice, slocal, spatrons, sthanks;
Array<SWWMCreditsEntry> 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"));