Merge pull request #3387 from SamaelGray/SamaelGray-SecondaryDamageTh…

…ings Projectile secondary damage decoupling
CombatExtended-Continued · Sep 9, 2024 · 4738d82 · 4738d82
2 parents 171a42f + 2ba0aaa
commit 4738d82
Show file tree

Hide file tree

Showing 62 changed files with 119 additions and 119 deletions.
diff --git a/Defs/Ammo/Grenade/20x42mmGrenade.xml b/Defs/Ammo/Grenade/20x42mmGrenade.xml
@@ -195,7 +195,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>12</amount>
+					<amount>24</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -211,7 +211,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>19</amount>
+					<amount>33</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml b/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml
@@ -158,7 +158,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>16</amount>
+					<amount>15</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -174,7 +174,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>23</amount>
+					<amount>20</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml b/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml
@@ -157,7 +157,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>16</amount>
+					<amount>15</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -173,7 +173,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>24</amount>
+					<amount>21</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml b/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml
@@ -158,7 +158,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>21</amount>
+					<amount>17</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -174,7 +174,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>32</amount>
+					<amount>24</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/2-Bore.xml b/Defs/Ammo/HighCaliber/2-Bore.xml
@@ -158,7 +158,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>22</amount>
+					<amount>37</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -174,7 +174,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>34</amount>
+					<amount>51</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/20x102mmNATO.xml b/Defs/Ammo/HighCaliber/20x102mmNATO.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>27</amount>
+					<amount>22</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>42</amount>
+					<amount>31</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/20x110mmHispano.xml b/Defs/Ammo/HighCaliber/20x110mmHispano.xml
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>39</amount>
+					<amount>35</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml b/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>30</amount>
+					<amount>25</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>45</amount>
+					<amount>35</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/20x138mmB.xml b/Defs/Ammo/HighCaliber/20x138mmB.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>27</amount>
+					<amount>26</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>41</amount>
+					<amount>35</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/20x139mm.xml b/Defs/Ammo/HighCaliber/20x139mm.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>30</amount>
+					<amount>26</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>46</amount>
+					<amount>35</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/20x82mmMauser.xml b/Defs/Ammo/HighCaliber/20x82mmMauser.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>22</amount>
+					<amount>24</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>34</amount>
+					<amount>33</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/20x99mmShVAK.xml b/Defs/Ammo/HighCaliber/20x99mmShVAK.xml
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>33</amount>
+					<amount>31</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/23x152mmB.xml b/Defs/Ammo/HighCaliber/23x152mmB.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>35</amount>
+					<amount>34</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>53</amount>
+					<amount>46</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/25x137mmNATO.xml b/Defs/Ammo/HighCaliber/25x137mmNATO.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>39</amount>
+					<amount>33</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>59</amount>
+					<amount>45</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml b/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml
@@ -157,7 +157,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>9</amount>
+					<amount>6</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -173,7 +173,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>14</amount>
+					<amount>8</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/30x113mmB.xml b/Defs/Ammo/HighCaliber/30x113mmB.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>37</amount>
+					<amount>42</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>57</amount>
+					<amount>58</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/30x165mm.xml b/Defs/Ammo/HighCaliber/30x165mm.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>46</amount>
+					<amount>52</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/30x173mmNATO.xml b/Defs/Ammo/HighCaliber/30x173mmNATO.xml
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>76</amount>
+					<amount>69</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/338LapuaMagnum.xml b/Defs/Ammo/HighCaliber/338LapuaMagnum.xml
@@ -157,7 +157,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>10</amount>
+					<amount>8</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -173,7 +173,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>15</amount>
+					<amount>11</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/338NormaMagnum.xml b/Defs/Ammo/HighCaliber/338NormaMagnum.xml
@@ -157,7 +157,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>10</amount>
+					<amount>9</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -173,7 +173,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>15</amount>
+					<amount>12</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/408CheyenneTactical.xml b/Defs/Ammo/HighCaliber/408CheyenneTactical.xml
@@ -157,7 +157,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>13</amount>
+					<amount>9</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -173,7 +173,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>14</amount>
+					<amount>12</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/40x311mmR.xml b/Defs/Ammo/HighCaliber/40x311mmR.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>66</amount>
+					<amount>86</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>101</amount>
+					<amount>117</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/470NitroExpress.xml b/Defs/Ammo/HighCaliber/470NitroExpress.xml
@@ -173,7 +173,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>18</amount>
+					<amount>16</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/50BMG.xml b/Defs/Ammo/HighCaliber/50BMG.xml
@@ -158,7 +158,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>16</amount>
+					<amount>14</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -174,7 +174,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>24</amount>
+					<amount>20</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>