Merge pull request #2780 from CombatExtended-Continued/SamaelGray-Sig…

…htEfficiencyTweaks Sight efficiency tweaks
CombatExtended-Continued · Sep 26, 2023 · 683b539 · 683b539
2 parents f57152e + b10c627
commit 683b539
Show file tree

Hide file tree

Showing 85 changed files with 187 additions and 187 deletions.
diff --git a/Biotech/Patches/ThingDefs_Misc/Weapons/RangedIndustrial_Biotech.xml b/Biotech/Patches/ThingDefs_Misc/Weapons/RangedIndustrial_Biotech.xml
@@ -155,7 +155,7 @@
 			<Bulk>1.05</Bulk>
 			<MarketValue>10.15</MarketValue>
 			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-			<SightsEfficiency>0.65</SightsEfficiency>
+			<SightsEfficiency>1.0</SightsEfficiency>
 		</statBases>
 		<Properties>
 			<label>throw tox grenade</label>

diff --git a/Defs/ThingDefs_Misc/Weapons_Grenades.xml b/Defs/ThingDefs_Misc/Weapons_Grenades.xml
@@ -111,7 +111,7 @@
 			<Mass>0.436</Mass>
 			<Bulk>1.55</Bulk>
 			<MarketValue>12.4</MarketValue>
-			<SightsEfficiency>0.65</SightsEfficiency>
+			<SightsEfficiency>1.0</SightsEfficiency>
 			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
 		</statBases>
 		<generateCommonality>2.0</generateCommonality>
@@ -195,7 +195,7 @@
 			<Mass>0.236</Mass>
 			<Bulk>0.61</Bulk>
 			<MarketValue>8.33</MarketValue>
-			<SightsEfficiency>0.65</SightsEfficiency>
+			<SightsEfficiency>1.0</SightsEfficiency>
 			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
 		</statBases>
 		<weaponTags>
@@ -272,7 +272,7 @@
 			<Mass>1.5</Mass>
 			<Bulk>4.72</Bulk>
 			<MarketValue>20.51</MarketValue>
-			<SightsEfficiency>0.65</SightsEfficiency>
+			<SightsEfficiency>1.0</SightsEfficiency>
 			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
 		</statBases>
 		<weaponTags>
@@ -344,7 +344,7 @@
 			<Mass>0.539</Mass>
 			<Bulk>1.05</Bulk>
 			<MarketValue>10.15</MarketValue>
-			<SightsEfficiency>0.65</SightsEfficiency>
+			<SightsEfficiency>1.0</SightsEfficiency>
 			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
 		</statBases>
 		<weaponTags>
@@ -422,7 +422,7 @@
 			<Mass>0.5</Mass>
 			<Bulk>1.05</Bulk>
 			<MarketValue>11.52</MarketValue>
-			<SightsEfficiency>0.65</SightsEfficiency>
+			<SightsEfficiency>1.0</SightsEfficiency>
 			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
 		</statBases>
 		<weaponTags>

diff --git a/Defs/ThingDefs_Misc/Weapons_RangedNeolithic.xml b/Defs/ThingDefs_Misc/Weapons_RangedNeolithic.xml
@@ -50,7 +50,7 @@
 		<soundInteract>Interact_BeatFire</soundInteract>
 		<statBases>
 			<MarketValue>7.0</MarketValue>
-			<SightsEfficiency>0.45</SightsEfficiency>
+			<SightsEfficiency>1.0</SightsEfficiency>
 			<ShotSpread>1.5</ShotSpread>
 			<SwayFactor>2.5</SwayFactor>
 			<Bulk>4.25</Bulk>

diff --git a/Patches/A Rimworld of Magic/Patch_Ranged.xml b/Patches/A Rimworld of Magic/Patch_Ranged.xml
@@ -172,7 +172,7 @@
 				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
 					<defName>Seer_IceRing</defName>
 					<statBases>
-						<SightsEfficiency>0.35</SightsEfficiency>
+						<SightsEfficiency>1.0</SightsEfficiency>
 						<ShotSpread>0.14</ShotSpread>
 						<SwayFactor>0.10</SwayFactor>
 						<Bulk>0.5</Bulk>
@@ -223,7 +223,7 @@
 				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
 					<defName>Seer_LightningRing</defName>
 					<statBases>
-						<SightsEfficiency>0.35</SightsEfficiency>
+						<SightsEfficiency>1.0</SightsEfficiency>
 						<ShotSpread>0.14</ShotSpread>
 						<SwayFactor>0.10</SwayFactor>
 						<Bulk>0.5</Bulk>
@@ -276,7 +276,7 @@
 				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
 					<defName>Seer_FireRing</defName>
 					<statBases>
-						<SightsEfficiency>0.35</SightsEfficiency>
+						<SightsEfficiency>1.0</SightsEfficiency>
 						<ShotSpread>0.14</ShotSpread>
 						<SwayFactor>0.10</SwayFactor>
 						<Bulk>0.5</Bulk>

diff --git a/Patches/AOC The Cleanup Devil/Grenades.xml b/Patches/AOC The Cleanup Devil/Grenades.xml
@@ -88,7 +88,7 @@
 						<Bulk>1</Bulk>
 						<MarketValue>10.95</MarketValue>
 						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.65</SightsEfficiency>
+						<SightsEfficiency>1.0</SightsEfficiency>
 					</statBases>
 					<Properties>
 						<label>throw EMP grenade</label>
@@ -133,7 +133,7 @@
 						<Mass>1</Mass>
 						<Bulk>4</Bulk>
 						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.65</SightsEfficiency>
+						<SightsEfficiency>1.0</SightsEfficiency>
 					</statBases>
 					<Properties>
 						<label>throw trash bag</label>

diff --git a/Patches/AOC The Cleanup Devil/RangedWeapons.xml b/Patches/AOC The Cleanup Devil/RangedWeapons.xml
@@ -72,7 +72,7 @@
 					<xpath>Defs/ThingDef[defName="AOC_Monojavelin"]/statBases</xpath>
 					<value>
 						<statBases>
-							<SightsEfficiency>0.65</SightsEfficiency>
+							<SightsEfficiency>1.0</SightsEfficiency>
 							<ShotSpread>1.5</ShotSpread>
 							<SwayFactor>2.5</SwayFactor>
 							<Bulk>2.5</Bulk>

diff --git a/Patches/Advanced Mechanoid Warfare/Patches/Patch_Ranged.xml b/Patches/Advanced Mechanoid Warfare/Patches/Patch_Ranged.xml
@@ -769,7 +769,7 @@
 				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
 					<defName>AMW_Gun_SNomadRifle</defName>
 					<statBases>
-						<SightsEfficiency>0.9</SightsEfficiency>
+						<SightsEfficiency>1.0</SightsEfficiency>
 						<ShotSpread>0.14</ShotSpread>
 						<SwayFactor>1.56</SwayFactor>
 						<Bulk>7.5</Bulk>

diff --git a/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Weapons.xml b/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Misc/Weapons.xml
@@ -468,7 +468,7 @@
 						<statBases>
 							<Mass>20</Mass>
 							<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-							<SightsEfficiency>0.8</SightsEfficiency>
+							<SightsEfficiency>1.0</SightsEfficiency>
 							<ShotSpread>4.0</ShotSpread>
 							<SwayFactor>1.33</SwayFactor>
 						</statBases>

diff --git a/Patches/Alpha Mechs/ThingDefs_Misc/AlphaMechs_RangedMechanoid.xml b/Patches/Alpha Mechs/ThingDefs_Misc/AlphaMechs_RangedMechanoid.xml
@@ -65,7 +65,7 @@
 					<statBases>
 						<Mass>20</Mass>
 						<RangedWeapon_Cooldown>0.39</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
+						<SightsEfficiency>1.0</SightsEfficiency>
 						<ShotSpread>4.0</ShotSpread>
 						<SwayFactor>1.33</SwayFactor>
 					</statBases>
@@ -204,7 +204,7 @@
 					<statBases>
 						<Mass>20</Mass>
 						<RangedWeapon_Cooldown>1.0</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.8</SightsEfficiency>
+						<SightsEfficiency>1.0</SightsEfficiency>
 						<ShotSpread>1.0</ShotSpread>
 						<SwayFactor>1.33</SwayFactor>
 						<Bulk>1.00</Bulk>

diff --git a/Patches/Arrow Please/ArrowPlease_Throwable.xml b/Patches/Arrow Please/ArrowPlease_Throwable.xml
@@ -57,7 +57,7 @@
 					<statBases>
 						<Mass>1.2</Mass>
 						<Bulk>3.3</Bulk>
-						<SightsEfficiency>0.45</SightsEfficiency>
+						<SightsEfficiency>1.0</SightsEfficiency>
 						<ShotSpread>1.5</ShotSpread>
 						<SwayFactor>2.5</SwayFactor>
 						<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>
@@ -220,7 +220,7 @@
 				<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
 					<defName>Ranged_Torch</defName>
 					<statBases>
-						<SightsEfficiency>0.45</SightsEfficiency>
+						<SightsEfficiency>1.0</SightsEfficiency>
 						<ShotSpread>1.5</ShotSpread>
 						<SwayFactor>2.5</SwayFactor>
 						<RangedWeapon_Cooldown>0.75</RangedWeapon_Cooldown>

diff --git a/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml b/Patches/Big and Small/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml
@@ -45,7 +45,7 @@
 					<defName>BS_JotunJavelin</defName>
 					<statBases>
 						<MarketValue>50</MarketValue>
-						<SightsEfficiency>0.45</SightsEfficiency>
+						<SightsEfficiency>1.0</SightsEfficiency>
 						<Bulk>5</Bulk>
 						<Mass>5</Mass>
 						<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
@@ -125,7 +125,7 @@
 							<relicChance>0</relicChance>
 							<statBases>
 								<MarketValue>50</MarketValue>
-								<SightsEfficiency>0.45</SightsEfficiency>
+								<SightsEfficiency>1.0</SightsEfficiency>
 								<ShotSpread>1.5</ShotSpread>
 								<SwayFactor>2.5</SwayFactor>
 								<Bulk>5</Bulk>

diff --git a/Patches/Biomes Caverns/Weapons/CE_Boomshroom.xml b/Patches/Biomes Caverns/Weapons/CE_Boomshroom.xml
@@ -56,7 +56,7 @@
 						<Bulk>1.8</Bulk>
 						<MarketValue>3</MarketValue>
 						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.65</SightsEfficiency>
+						<SightsEfficiency>1.0</SightsEfficiency>
 					</statBases>
 					<Properties>
 						<label>throw firebomb</label>

diff --git a/Patches/British Weapons Set/British_weapon_set.xml b/Patches/British Weapons Set/British_weapon_set.xml
@@ -15,7 +15,7 @@
 					<statBases>
 						<Mass>11</Mass>
 						<RangedWeapon_Cooldown>0.56</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.7</SightsEfficiency>
+						<SightsEfficiency>1.0</SightsEfficiency>
 						<ShotSpread>0.05</ShotSpread>
 						<SwayFactor>1.53</SwayFactor>
 						<Bulk>12</Bulk>

diff --git a/Patches/Call of Duty - Zombies Pack/Weapons/Wonder.xml b/Patches/Call of Duty - Zombies Pack/Weapons/Wonder.xml
@@ -349,7 +349,7 @@
 					<statBases>
 						<Mass>2</Mass>
 						<RangedWeapon_Cooldown>10</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.5</SightsEfficiency>
+						<SightsEfficiency>0.7</SightsEfficiency>
 						<ShotSpread>0.2</ShotSpread>
 						<SwayFactor>0.83</SwayFactor>
 						<Bulk>0.5</Bulk>
@@ -376,7 +376,7 @@
 					<statBases>
 						<Mass>1.36</Mass>
 						<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.5</SightsEfficiency>
+						<SightsEfficiency>0.7</SightsEfficiency>
 						<ShotSpread>0.16</ShotSpread>
 						<SwayFactor>1.67</SwayFactor>
 						<Bulk>3</Bulk>
@@ -441,7 +441,7 @@
 					<statBases>
 						<Mass>1.36</Mass>
 						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.5</SightsEfficiency>
+						<SightsEfficiency>0.7</SightsEfficiency>
 						<ShotSpread>0.14</ShotSpread>
 						<SwayFactor>2.33</SwayFactor>
 						<Bulk>3</Bulk>
@@ -472,7 +472,7 @@
 					<statBases>
 						<Mass>2.67</Mass>
 						<RangedWeapon_Cooldown>0.96</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.5</SightsEfficiency>
+						<SightsEfficiency>0.7</SightsEfficiency>
 						<ShotSpread>0.2</ShotSpread>
 						<SwayFactor>2.22</SwayFactor>
 						<Bulk>4</Bulk>
@@ -783,7 +783,7 @@
 					<statBases>
 						<Mass>2.63</Mass>
 						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.5</SightsEfficiency>
+						<SightsEfficiency>0.7</SightsEfficiency>
 						<ShotSpread>0.2</ShotSpread>
 						<SwayFactor>1.88</SwayFactor>
 						<Bulk>3</Bulk>
@@ -814,7 +814,7 @@
 					<statBases>
 						<Mass>2.63</Mass>
 						<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.5</SightsEfficiency>
+						<SightsEfficiency>0.7</SightsEfficiency>
 						<ShotSpread>0.2</ShotSpread>
 						<SwayFactor>1.88</SwayFactor>
 						<Bulk>3</Bulk>

diff --git a/Patches/Censored Armory/Weapons_Guns.xml b/Patches/Censored Armory/Weapons_Guns.xml
@@ -1281,7 +1281,7 @@
 						<Bulk>0.36</Bulk>
 						<MarketValue>12.22</MarketValue>
 						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.65</SightsEfficiency>
+						<SightsEfficiency>1.0</SightsEfficiency>
 					</statBases>
 					<Properties>
 						<label>throw concussion grenade</label>

diff --git a/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml b/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml
@@ -194,7 +194,7 @@
 			<Bulk>0.87</Bulk>
 			<MarketValue>11.22</MarketValue>
 			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-			<SightsEfficiency>0.65</SightsEfficiency>
+			<SightsEfficiency>1.0</SightsEfficiency>
 		</statBases>
 		<Properties>
 			<label>throw frag grenade</label>
@@ -315,7 +315,7 @@
 			<Bulk>1.96</Bulk>
 			<MarketValue>7.05</MarketValue>
 			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-			<SightsEfficiency>0.65</SightsEfficiency>
+			<SightsEfficiency>1.0</SightsEfficiency>
 		</statBases>
 		<Properties>
 			<label>throw molotov</label>
@@ -442,7 +442,7 @@
 			<Bulk>0.87</Bulk>
 			<MarketValue>21.09</MarketValue>
 			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-			<SightsEfficiency>0.65</SightsEfficiency>
+			<SightsEfficiency>1.0</SightsEfficiency>
 		</statBases>
 		<Properties>
 			<label>throw EMP grenade</label>

diff --git a/Patches/Core/ThingDefs_Misc/Weapons_RangedNeolithic.xml b/Patches/Core/ThingDefs_Misc/Weapons_RangedNeolithic.xml
@@ -22,7 +22,7 @@
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>Bow_Short</defName>
 		<statBases>
-			<SightsEfficiency>0.6</SightsEfficiency>
+			<SightsEfficiency>0.8</SightsEfficiency>
 			<ShotSpread>1</ShotSpread>
 			<SwayFactor>2</SwayFactor>
 			<Bulk>3.00</Bulk>
@@ -70,7 +70,7 @@
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>Bow_Recurve</defName>
 		<statBases>
-			<SightsEfficiency>0.6</SightsEfficiency>
+			<SightsEfficiency>0.8</SightsEfficiency>
 			<ShotSpread>1</ShotSpread>
 			<SwayFactor>2</SwayFactor>
 			<Bulk>4.00</Bulk>
@@ -119,7 +119,7 @@
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>Bow_Great</defName>
 		<statBases>
-			<SightsEfficiency>0.6</SightsEfficiency>
+			<SightsEfficiency>0.8</SightsEfficiency>
 			<ShotSpread>1</ShotSpread>
 			<SwayFactor>2</SwayFactor>
 			<Bulk>5.00</Bulk>

diff --git a/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Ranged_Spacer.xml b/Patches/Cybernetic Warfare and Special Weapons/CyberneticWarfare_Ranged_Spacer.xml
@@ -244,7 +244,7 @@
 					<defName>CW_DualEraser</defName>
 					<statBases>
 						<Bulk>4.5</Bulk>
-						<SightsEfficiency>0.5</SightsEfficiency>
+						<SightsEfficiency>0.7</SightsEfficiency>
 						<ShotSpread>0.75</ShotSpread>
 						<SwayFactor>0.95</SwayFactor>
 						<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>

diff --git a/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Grenades.xml b/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Grenades.xml
@@ -92,7 +92,7 @@
 						<Bulk>1.8</Bulk>
 						<MarketValue>3</MarketValue>
 						<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.65</SightsEfficiency>
+						<SightsEfficiency>1.0</SightsEfficiency>
 					</statBases>
 					<Properties>
 						<label>throw cleansing bomb</label>

diff --git a/Patches/Filthy Orc Invasion/FilthyOrcInvasion_Orc_Weapons.xml b/Patches/Filthy Orc Invasion/FilthyOrcInvasion_Orc_Weapons.xml
@@ -91,7 +91,7 @@
 							<soundInteract>Interact_BeatFire</soundInteract>
 							<statBases>
 								<MarketValue>7.26</MarketValue>
-								<SightsEfficiency>0.45</SightsEfficiency>
+								<SightsEfficiency>1.0</SightsEfficiency>
 								<ShotSpread>1.5</ShotSpread>
 								<SwayFactor>2.5</SwayFactor>
 								<Bulk>3.5</Bulk>
@@ -150,7 +150,7 @@
 					<statBases>
 						<Mass>0.5</Mass>
 						<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
-						<SightsEfficiency>0.5</SightsEfficiency>
+						<SightsEfficiency>0.8</SightsEfficiency>
 						<ShotSpread>0.1</ShotSpread>
 						<SwayFactor>1</SwayFactor>
 						<Bulk>2</Bulk>