secondary damage changes reverted

being split into another PR/branch
CombatExtended-Continued · Aug 30, 2024 · 53b0309 · 53b0309
1 parent cb5a519
commit 53b0309
Show file tree

Hide file tree

Showing 58 changed files with 106 additions and 106 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>27</amount>
+					<amount>12</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -211,7 +211,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>40</amount>
+					<amount>19</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/Grenade/25x59mmGrenade.xml b/Defs/Ammo/Grenade/25x59mmGrenade.xml
@@ -175,7 +175,7 @@
 		<thingClass>CombatExtended.BulletCE</thingClass>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Bullet</damageDef>
-			<damageAmountBase>29</damageAmountBase>
+			<damageAmountBase>30</damageAmountBase>
 			<armorPenetrationSharp>50</armorPenetrationSharp>
 			<armorPenetrationBlunt>4.818</armorPenetrationBlunt>
 		</projectile>

diff --git a/Defs/Ammo/Grenade/30x29mmGrenade.xml b/Defs/Ammo/Grenade/30x29mmGrenade.xml
@@ -175,7 +175,7 @@
 		<label>30x29mm grenade (HEDP)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Bullet</damageDef>
-			<damageAmountBase>37</damageAmountBase>
+			<damageAmountBase>35</damageAmountBase>
 			<armorPenetrationSharp>45</armorPenetrationSharp>
 			<armorPenetrationBlunt>5.569</armorPenetrationBlunt>
 		</projectile>

diff --git a/Defs/Ammo/Grenade/35x32mmSRGrenade.xml b/Defs/Ammo/Grenade/35x32mmSRGrenade.xml
@@ -137,7 +137,7 @@
 		<label>35x32mmSR grenade (HEDP)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Bullet</damageDef>
-			<damageAmountBase>30</damageAmountBase>
+			<damageAmountBase>31</damageAmountBase>
 			<armorPenetrationSharp>55</armorPenetrationSharp>
 			<armorPenetrationBlunt>4.961</armorPenetrationBlunt>
 		</projectile>

diff --git a/Defs/Ammo/Grenade/40x46mmGrenade.xml b/Defs/Ammo/Grenade/40x46mmGrenade.xml
@@ -192,7 +192,7 @@
 		<label>40x46mm grenade (HEDP)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Bullet</damageDef>
-			<damageAmountBase>36</damageAmountBase>
+			<damageAmountBase>35</damageAmountBase>
 			<armorPenetrationSharp>63</armorPenetrationSharp>
 			<armorPenetrationBlunt>5.543</armorPenetrationBlunt>
 		</projectile>

diff --git a/Defs/Ammo/Grenade/40x53mmGrenade.xml b/Defs/Ammo/Grenade/40x53mmGrenade.xml
@@ -177,7 +177,7 @@
 		<label>40x53mm grenade (HEDP)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Bullet</damageDef>
-			<damageAmountBase>39</damageAmountBase>
+			<damageAmountBase>36</damageAmountBase>
 			<armorPenetrationSharp>76</armorPenetrationSharp>
 			<armorPenetrationBlunt>5.768</armorPenetrationBlunt>
 		</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>18</amount>
+					<amount>16</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -174,7 +174,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>27</amount>
+					<amount>23</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>19</amount>
+					<amount>16</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -173,7 +173,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>28</amount>
+					<amount>24</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml b/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml
@@ -174,7 +174,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>31</amount>
+					<amount>32</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>38</amount>
+					<amount>22</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -174,7 +174,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>57</amount>
+					<amount>34</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>25</amount>
+					<amount>27</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>38</amount>
+					<amount>42</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/20x110mmHispano.xml b/Defs/Ammo/HighCaliber/20x110mmHispano.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>28</amount>
+					<amount>26</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>42</amount>
+					<amount>39</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>28</amount>
+					<amount>30</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>42</amount>
+					<amount>45</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>28</amount>
+					<amount>27</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>42</amount>
+					<amount>41</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>28</amount>
+					<amount>30</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>42</amount>
+					<amount>46</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>27</amount>
+					<amount>22</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>40</amount>
+					<amount>34</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/20x99mmShVAK.xml b/Defs/Ammo/HighCaliber/20x99mmShVAK.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>25</amount>
+					<amount>22</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>38</amount>
+					<amount>33</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>35</amount>
+					<amount>39</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>52</amount>
+					<amount>59</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml b/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml
@@ -173,7 +173,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>13</amount>
+					<amount>14</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>42</amount>
+					<amount>37</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>63</amount>
+					<amount>57</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>50</amount>
+					<amount>46</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>75</amount>
+					<amount>71</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/30x173mmNATO.xml b/Defs/Ammo/HighCaliber/30x173mmNATO.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>49</amount>
+					<amount>50</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>73</amount>
+					<amount>76</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>11</amount>
+					<amount>10</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -173,7 +173,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>16</amount>
+					<amount>15</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>12</amount>
+					<amount>10</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -173,7 +173,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>17</amount>
+					<amount>15</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>12</amount>
+					<amount>13</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -173,7 +173,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>18</amount>
+					<amount>14</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>