diff --git a/language.version b/language.version index 24e3d1e85..b3b49134a 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r199 \cu(Sat 23 Jul 16:49:11 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r199 \cu(2022-07-23 16:49:11)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r200 \cu(Sat 23 Jul 16:49:18 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r200 \cu(2022-07-23 16:49:18)\c-"; diff --git a/zscript/items/swwm_ammoextra.zsc b/zscript/items/swwm_ammoextra.zsc index fddf54f98..6755cb5ba 100644 --- a/zscript/items/swwm_ammoextra.zsc +++ b/zscript/items/swwm_ammoextra.zsc @@ -244,6 +244,7 @@ Class AmmoFabricator : Inventory abstract { +INVENTORY.AUTOACTIVATE; +FLOATBOB; + +DONTGIB; Inventory.UseSound "fabricator/use"; Inventory.PickupFlash "SWWMPickupFlash"; Inventory.MaxAmount 0; @@ -528,6 +529,7 @@ Class HammerspaceEmbiggener : Inventory +INVENTORY.UNDROPPABLE; +INVENTORY.UNTOSSABLE; +INVENTORY.ALWAYSPICKUP; + +DONTGIB; +FLOATBOB; FloatBobStrength 0.25; Radius 8; diff --git a/zscript/items/swwm_baseammo.zsc b/zscript/items/swwm_baseammo.zsc index 7e21fe2df..2add7e55a 100644 --- a/zscript/items/swwm_baseammo.zsc +++ b/zscript/items/swwm_baseammo.zsc @@ -288,6 +288,7 @@ Class SWWMAmmo : Ammo default { +INVENTORY.IGNORESKILL; + +DONTGIB; Inventory.PickupFlash "SWWMPickupFlash"; } } @@ -313,6 +314,7 @@ Class MagAmmo : Inventory abstract default { +INVENTORY.KEEPDEPLETED; + +DONTGIB; Inventory.PickupSound "misc/bullet_pkup"; Inventory.Amount 1; Inventory.PickupFlash "SWWMPickupFlash"; @@ -673,6 +675,7 @@ Class SWWMAmmoSpawner : Inventory abstract +NOINTERACTION; +NOTELEPORT; +DONTSPLASH; + +DONTGIB; -SPECIAL; } } diff --git a/zscript/items/swwm_basearmor.zsc b/zscript/items/swwm_basearmor.zsc index 7e12854ac..0b5735084 100644 --- a/zscript/items/swwm_basearmor.zsc +++ b/zscript/items/swwm_basearmor.zsc @@ -160,6 +160,7 @@ Class SWWMSpareArmor : Inventory abstract Inventory.InterHubAmount 5; Inventory.PickupFlash "SWWMGreenPickupFlash"; +FLOATBOB; + +DONTGIB; FloatBobStrength 0.25; } } diff --git a/zscript/items/swwm_basehealth.zsc b/zscript/items/swwm_basehealth.zsc index f9d7ac0c7..9ba62e6b2 100644 --- a/zscript/items/swwm_basehealth.zsc +++ b/zscript/items/swwm_basehealth.zsc @@ -141,6 +141,7 @@ Class SWWMHealth : Inventory abstract +INVENTORY.INVBAR; +INVENTORY.ISHEALTH; +INVENTORY.AUTOACTIVATE; + +DONTGIB; Inventory.MaxAmount 5; Inventory.InterHubAmount 5; Inventory.UseSound "misc/health_pkup"; diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc index 711f71c34..f846f93e6 100644 --- a/zscript/items/swwm_powerups.zsc +++ b/zscript/items/swwm_powerups.zsc @@ -229,6 +229,7 @@ Class GrilledCheeseSandwich : Inventory +COUNTITEM; +INVENTORY.BIGPOWERUP; +FLOATBOB; + +DONTGIB; FloatBobStrength 0.25; Radius 12; Height 24; @@ -484,6 +485,7 @@ Class GhostArtifact : Inventory +COUNTITEM; +INVENTORY.BIGPOWERUP; +FLOATBOB; + +DONTGIB; FloatBobStrength 0.25; Radius 12; Height 24; @@ -697,6 +699,7 @@ Class GravitySuppressor : Inventory +COUNTITEM; +INVENTORY.BIGPOWERUP; +FLOATBOB; + +DONTGIB; FloatBobStrength 0.25; Radius 12; Height 28; @@ -945,6 +948,7 @@ Class FuckingInvinciball : Inventory +COUNTITEM; +INVENTORY.BIGPOWERUP; +FLOATBOB; + +DONTGIB; FloatBobStrength 0.25; Radius 10; Height 26; @@ -1233,6 +1237,7 @@ Class Ragekit : Inventory +COUNTITEM; +INVENTORY.BIGPOWERUP; +FLOATBOB; + +DONTGIB; FloatBobStrength 0.25; Radius 12; Height 24; @@ -1300,6 +1305,7 @@ Class Omnisight : Inventory +INVENTORY.BIGPOWERUP; +FLOATBOB; +NOTDMATCH; + +DONTGIB; FloatBobStrength 0.25; Radius 6; Height 26; @@ -1980,6 +1986,7 @@ Class SWWMLamp : Inventory +COUNTITEM; +INVENTORY.BIGPOWERUP; +FLOATBOB; + +DONTGIB; FloatBobStrength 0.25; SWWMLamp.Charge 100; Stamina 70000; @@ -2273,6 +2280,7 @@ Class EBarrier : Inventory +INVENTORY.INVBAR; +INVENTORY.BIGPOWERUP; +FLOATBOB; + +DONTGIB; FloatBobStrength 0.25; Radius 6; Height 28; @@ -2954,6 +2962,7 @@ Class Mykradvo : Inventory +COUNTITEM; +INVENTORY.BIGPOWERUP; +FLOATBOB; + +DONTGIB; FloatBobStrength 0.25; Radius 10; Height 24; @@ -3164,6 +3173,7 @@ Class SafetyTether : Inventory +COUNTITEM; +INVENTORY.BIGPOWERUP; +FLOATBOB; + +DONTGIB; FloatBobStrength 0.25; Radius 5; Height 23; @@ -3377,6 +3387,7 @@ Class AngerySigil : Inventory +COUNTITEM; +INVENTORY.BIGPOWERUP; +FLOATBOB; + +DONTGIB; FloatBobStrength 0.25; Radius 8; Height 28; @@ -3652,6 +3663,7 @@ Class DivineSprite : Inventory +COUNTITEM; +INVENTORY.BIGPOWERUP; +FLOATBOB; + +DONTGIB; FloatBobStrength 0.25; Radius 8; Height 24; diff --git a/zscript/weapons/swwm_baseweapon.zsc b/zscript/weapons/swwm_baseweapon.zsc index 5e016f6f6..f21eee589 100644 --- a/zscript/weapons/swwm_baseweapon.zsc +++ b/zscript/weapons/swwm_baseweapon.zsc @@ -537,6 +537,7 @@ Class SWWMWeapon : Weapon abstract +WEAPON.NOALERT; +WEAPON.NODEATHINPUT; +FLOATBOB; + +DONTGIB; FloatBobStrength 0.25; } } @@ -557,6 +558,7 @@ Class SWWMDualWeaponGiver : Inventory Inventory.PickupFlash "SWWMRedPickupFlash"; +WEAPONSPAWN; +FLOATBOB; + +DONTGIB; +INVENTORY.NEVERRESPAWN; +INVENTORY.QUIET; FloatBobStrength 0.25;