From 706a3488d13db360a2f40a3e538981298bf31815 Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Wed, 16 Nov 2022 22:35:03 +0100
Subject: [PATCH] Adjust ammo amounts again. Remove 12/16 shell pickups.

---
 language.version                    |   4 ++--
 modeldef.ammo                       |  26 --------------------------
 models/ShellAmmo_Sixteen_a.3d       | Bin 1380 -> 0 bytes
 models/ShellAmmo_Sixteen_d.3d       | Bin 9648 -> 0 bytes
 models/ShellAmmo_Twelve_a.3d        | Bin 1060 -> 0 bytes
 models/ShellAmmo_Twelve_d.3d        | Bin 7344 -> 0 bytes
 zscript/dlc1/swwm_ammoitems_dlc.zsc |  10 +++++-----
 zscript/items/swwm_ammoitems.zsc    |  22 ++++------------------
 8 files changed, 11 insertions(+), 51 deletions(-)
 delete mode 100644 models/ShellAmmo_Sixteen_a.3d
 delete mode 100644 models/ShellAmmo_Sixteen_d.3d
 delete mode 100644 models/ShellAmmo_Twelve_a.3d
 delete mode 100644 models/ShellAmmo_Twelve_d.3d

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 3dac8400cca6ca428adb8c5491de59b263fb5ab0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1380
zcmZQ%NML0!ZP?CW+Tc-gq!EO-3$(O)2(+|r7ij775NPSzUgFZ{QR33Ko#AS~2gB9=
z?LDr29zCvo+ds5+d3<Q?+Ww)n)#F2J>-L_bjUGKm8@Dr<H-NB5$+1Qd-Y(GA>LJk9
zx?P~H%R`{8YkP@XpGS#X-*$%U{T>Y0`?vSF_j&ZV_ig{s-sSP3y=(i2_EwJ%?XBB;
zjyHPr9B<stVAue{9wi4FL3q1BL#u~CL+f^dhAt0*hOX@;4t*Xa4t?7hF7|scT<qW8
z<JjlX<Jh<TLt~f6hsLh$9~xUdJ~Xy&?>X4$(Q~kIJA-ip2z!(qY6Ri!0!^(R0!^*k
z1)91%1e&_GmpJu#lsNTmXSm$&!Em{MdyjLUM~`#g_7BZn9v_;!wtr}D_4v@-y1nOc
zqesu-#_bHI8$j5j<j6)4-Y(Fx)kC0V>vn;bT^<50ySA6O?DHsb*|(kH>V6M~tNXY2
zxbE}laoxB5L+dV&53Rele`ww6@u79=_MW2~J$jCA+|FRW0faqDj%@_t?E-CEJp|ge
zZWn0V<ss0vYkP^?K93T&ecKtX@AqK1zJGg<`#z5z_kG(xwD0ox(7tQ?hxV-=AKJHW
z?>WBFqv!a>?F@z+K-i<?z(x?>F3_;mL!e>nc7cXn9s&)!wwE~U^C)rHx1HhQeh-F=
z`?vQv?(^tz+_(Kh<1UX6jk~sgXx!@Yp>gZ>o`V}bdJb;f&S1O&ggr_QZ3N-%0!>>z
z1e&&P7iik$A<(pIdx_INj}oVS+ZitJ_h7iZe|wMfK93&fecL}Y@ACN2yleZ1=B*wd
znzwH6IlR%M=kUhu+*4-paZj1`u^?m~UqQ&ckAIHL=lgSH{zsO>^Z8f~&;K|fcpl$`
z;CUavPM*d0b@Hr_e^eHLFkiuzg&_QqyJRUJcgfO^EXoT&nD1-xQV{+)Ve>-137Z#w
zWH6nuoxya1N6C?iAiQ0mWvYij%hc@xEwelXT4rr8ahc~);xcbL!_oO33`gg0?{S^y
z(c?OA`-j$99v@m~ZU4|Z)#F3!)a^Y-CwlZ8ow%LBd;$o2lpLD~!rKMfrg{jpP2Dcg
zHp@exZPxY@w|O2VZu7P?9G~yOaD4vu9`|`3J?`_ie`ufO@u7Xz_7Ck-JwCKg-QIJ2
zqDRm1iQ5?rCxEa=$$^O=yj`GSs)s<s)a?QdvpfVEW^FHVnCDUAFmF4<!TBBx2j_3^
zah&JT<2Y~ohsIeR9~x(E|Ij$q<3r=r?L7x4dh{HexShdx0tkDQ9GVEi+Xb4YdI&U4
z-7e5H%R``P*7g#oc^)NB^R_b_p6|hMc>eYt=XoAI&hxf^XrATqp?TK!56x3OJ~U6=
z-g9`ON6+Dj+Zjw3fUrl&k%b_<U7%&Dhd|5H?E)>UJOo-+Z7*?I=TYLaZac%(^&SjY
z*KhA}UFXr`x^DZ2)>R%KT32oV(7M#)L+jG*Jx3RM^c-Edoxywo2z!(qTL{A21=^N+
z2(&HTF3`5hL!fQd_7b;s9wlz;wliE`@4;|={q`RBbsjzL>$ZPrU*++kebx34?MppA
zv@hM>b9|vk&+&!Z84MSIut&*(g&@3Lpkb+pK*Q4Q0u8G?1R7RtFL7AsQR1*}JHy5G
z9t;=PZ|`wj=h5T1Zu^JERURK2S8e~$xYXlA<I?Rt2N!zu99+1a!FT}(dz2hn2*TS1
znwEM9G%ejO(6q`!plQ|i5~p<@B~I(MGhANp!Ekx~_8#YT9zD+Mwtr||<?*3;)%Fj~
TOFcd`FWugAc%etn;f31)R8hVG

diff --git a/models/ShellAmmo_Sixteen_d.3d b/models/ShellAmmo_Sixteen_d.3d
deleted file mode 100644
index d6959b43ddc952057e1e3c316da811217d3d5d60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9648
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
FJOJa=+S>pC

diff --git a/models/ShellAmmo_Twelve_a.3d b/models/ShellAmmo_Twelve_a.3d
deleted file mode 100644
index 06b6646795a5a3980ef2672712196e570576b16d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1060
zcmZQ%P+(y&-Laj)bcaXDk)0sCU7%&Jhd|5T?E)=L9s(^*+e=*9JW5>JwliF9_h7i%
zzP-n_&7;S)ZTpATCXWxTP1`@T?)CW4x_5ie(VZSWM|W;#Fy8^f9wo<ig79{Mw!Iz#
zZF{#1v^9AMv^8xnaclD^ackSoaJ}7w;d=Y_9``nn9{0BGAKIHdKD0M&|IohI<3s!2
z?LEhLdh{IMxt+mq2MBwV9M}oM+XWi-dI&V^-7e73<RQ?|w7tZk&7;JjZ9Buob`OS&
z?b~}C+dO(4+qQpbZ1VWf*tGpa<6e&sjeEEE9Ng*Ab8zQ&2ICzd>``)PCkSsBXxi%`
z(6o2EKvR>4KvUE95~ntg5~sH9442zI7%sPO?{RMP=y7h_{-L?a<3n@P_7BZ_Jw7z=
z-QII}r$^7>o!c2qSAeib$&r;Hyj`GWt%pF%+U)`@n>++sHf=9)+2&E=vTZxV)$JY(
zSGRBPaoy(8<GOA8ht^FVA6hqU|IoVD<3sD(?L9|Vdh{G!xt+m$1qgeT99s#(+XdRz
zdI+?w-7e6!$wQ!R)Aka#Z5}0V+qN@Y-|oS1ef#zv_iY|M?%TG1Xy4@Vp?%Z#5AAC`
zKD4jh-gA7VN6+z<+Zha3fUrl&ft4V<U7%sDhd{&H?E(#(JOmmxZ7*@y=27CXZ9Buo
z?H&vlw{P!p+~(2axNZA~#!Vg{8aHkK(74v)L*v@*JqK5M^c-Bdoxyko2z!(qS_#72
z1)A1+2sEwTF3_~eL!fEX_7bOU9wkoOwliGb?!j<*`}Q8^Z5}<&+qQpb-sJJ2dDHd}
z&1*eAG_T#>b9kjk&*7EZxu;Cx<DN3<V?oF?zJicxAOAd=&iCiZ^p7l$r}MEqp8jz{
z@HD;&!P7o|oji%}>*Prv|ER10VZMSbD?#`pcgb2l?vk}1S(I0RFyGhWwIKX)!seBH
z6E?5>$Y9#Box!xjqvS{@2yYi?>Gcq3>D?~SGRZ@rWzzN%muVg)F4ML%T%GR0aCQ3j
z9@l9eJ+9NXe`uZL@u79n_7APS9v@nJxAz?F^yoR-xt+nh1B5+Fj&*|Yc7e8D4}rGc
z?E-C+JOtV%Z7*?~=27A{Z9BvD=^hN%r*H3ZpXSlyK5hGl_DLQe+9z%Q(BA9up}lu|
z&+$%=p5vX{84No>*rVh?CkSsBXz2A2Xz1N8&@jnEpkdPX5{GFXB@WZJGhCeR!EkZ<
z_8!M+9zBlJwtr}x<nf_#()JIHy&fMLd$;!-?DXh4*twm-xC4YeN)B~`@OFWwUJrq$
z-t7WSlRN~PCT%Zqn&wgBG;KS><>?*_m#1&<ah~SU<2-HqhvrEhADSm^|Ipm)@u9hQ
Nd(YuckDkMw+W{ph8}I-C

diff --git a/models/ShellAmmo_Twelve_d.3d b/models/ShellAmmo_Twelve_d.3d
deleted file mode 100644
index 31e2a30d288d5dcd792cc937e5357bb29a469bab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7344
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
b7`B4lFD5L_19Ja1hV5YYiwTSIfZPuN;=GU`

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;