diff --git a/language.version b/language.version index 839bc627c..65e461415 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r617 \cu(Wed 16 Nov 22:34:26 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r617 \cu(2022-11-16 22:34:26)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r619 \cu(Wed 16 Nov 22:35:32 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r619 \cu(2022-11-16 22:35:32)\c-"; diff --git a/modeldef.ammo b/modeldef.ammo index 9c81d4e7f..0fa832b42 100644 --- a/modeldef.ammo +++ b/modeldef.ammo @@ -48,32 +48,6 @@ Model "RedShell8" FrameIndex XZW1 A 0 0 } -Model "RedShell12" -{ - Path "models" - - Model 0 "ShellAmmo_Twelve_d.3d" - SurfaceSkin 0 0 "Shell_Normal.png" - SurfaceSkin 0 1 "envmap/silverenv.png" - Scale 0.024 0.024 0.024 - ZOffset 16 - ROTATING - - FrameIndex XZW1 A 0 0 -} -Model "RedShell16" -{ - Path "models" - - Model 0 "ShellAmmo_Sixteen_d.3d" - SurfaceSkin 0 0 "Shell_Normal.png" - SurfaceSkin 0 1 "envmap/silverenv.png" - Scale 0.024 0.024 0.024 - ZOffset 16 - ROTATING - - FrameIndex XZW1 A 0 0 -} Model "GoldShell" { diff --git a/models/ShellAmmo_Sixteen_a.3d b/models/ShellAmmo_Sixteen_a.3d deleted file mode 100644 index 3dac8400c..000000000 Binary files a/models/ShellAmmo_Sixteen_a.3d and /dev/null differ diff --git a/models/ShellAmmo_Sixteen_d.3d b/models/ShellAmmo_Sixteen_d.3d deleted file mode 100644 index d6959b43d..000000000 Binary files a/models/ShellAmmo_Sixteen_d.3d and /dev/null differ diff --git a/models/ShellAmmo_Twelve_a.3d b/models/ShellAmmo_Twelve_a.3d deleted file mode 100644 index 06b664679..000000000 Binary files a/models/ShellAmmo_Twelve_a.3d and /dev/null differ diff --git a/models/ShellAmmo_Twelve_d.3d b/models/ShellAmmo_Twelve_d.3d deleted file mode 100644 index 31e2a30d2..000000000 Binary files a/models/ShellAmmo_Twelve_d.3d and /dev/null differ diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc1/swwm_ammoitems_dlc.zsc index eea1046ab..51cf3bc14 100644 --- a/zscript/dlc1/swwm_ammoitems_dlc.zsc +++ b/zscript/dlc1/swwm_ammoitems_dlc.zsc @@ -8,9 +8,9 @@ Class SMW05Ammo : SWWMAmmo SWWMAmmo.PickupTag "SMW05BULLET"; Stamina 600; Inventory.Amount 1; - Inventory.MaxAmount 100; + Inventory.MaxAmount 80; Ammo.BackpackAmount 20; - Ammo.BackpackMaxAmount 300; + Ammo.BackpackMaxAmount 200; Ammo.DropAmount 3; +FLOATBOB; FloatBobStrength 0.25; @@ -62,7 +62,7 @@ Class SheenAmmo : SWWMAmmo Inventory.Amount 1; Inventory.MaxAmount 200; Ammo.BackpackAmount 50; - Ammo.BackpackMaxAmount 600; + Ammo.BackpackMaxAmount 400; Ammo.DropAmount 20; +FLOATBOB; FloatBobStrength 0.25; @@ -114,7 +114,7 @@ Class QuadravolAmmo : SWWMAmmo Inventory.Amount 1; Inventory.MaxAmount 48; Ammo.BackpackAmount 4; - Ammo.BackpackMaxAmount 120; + Ammo.BackpackMaxAmount 80; Ammo.DropAmount 1; +FLOATBOB; FloatBobStrength 0.25; @@ -404,7 +404,7 @@ Class UltimateAmmo : SWWMAmmo Inventory.Amount 1; Inventory.MaxAmount 1; Ammo.BackpackAmount 0; - Ammo.BackpackMaxAmount 3; + Ammo.BackpackMaxAmount 2; Ammo.DropAmount 1; SWWMAmmo.MagAmmoType "UltimatePod"; +FLOATBOB; diff --git a/zscript/items/swwm_ammoitems.zsc b/zscript/items/swwm_ammoitems.zsc index 2a5773233..6693536f8 100644 --- a/zscript/items/swwm_ammoitems.zsc +++ b/zscript/items/swwm_ammoitems.zsc @@ -10,9 +10,9 @@ Class RedShell : SWWMAmmo SWWMAmmo.PickupTag "REDSHELL"; Stamina 500; Inventory.Amount 1; - Inventory.MaxAmount 80; + Inventory.MaxAmount 50; Ammo.BackpackAmount 8; - Ammo.BackpackMaxAmount 200; + Ammo.BackpackMaxAmount 150; Ammo.DropAmount 2; +FLOATBOB; FloatBobStrength 0.25; @@ -46,20 +46,6 @@ Class RedShell8 : RedShell Inventory.Amount 8; } } -Class RedShell12 : RedShell -{ - Default - { - Inventory.Amount 12; - } -} -Class RedShell16 : RedShell -{ - Default - { - Inventory.Amount 16; - } -} Class GoldShellSparkle : SWWMNonInteractiveActor { @@ -302,9 +288,9 @@ Class SilverBulletAmmo : SWWMAmmo SWWMAmmo.PickupTag "XSBMAG"; Stamina 70000; Inventory.Amount 1; - Inventory.MaxAmount 5; + Inventory.MaxAmount 4; Ammo.BackpackAmount 0; - Ammo.BackpackMaxAmount 11; + Ammo.BackpackMaxAmount 9; Ammo.DropAmount 1; SWWMAmmo.MagAmmoType "SilverBullets"; +FLOATBOB;