Merge pull request #3549 from CombatExtended-Continued/Patch-Fixes

Some patch fixes/tweaks
CombatExtended-Continued · Nov 14, 2024 · bf9106f · bf9106f
2 parents 313abf0 + e8484e9
commit bf9106f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/ModPatches/Big and Small Genes/Defs/Big and Small Genes/Weapons/ThingDef_Ammo.xml b/ModPatches/Big and Small Genes/Defs/Big and Small Genes/Weapons/ThingDef_Ammo.xml
@@ -37,7 +37,7 @@
 		<effectWorking>Smelt</effectWorking>
 		<unfinishedThingDef>UnfinishedAmmo</unfinishedThingDef>
 		<workAmount>18000</workAmount>
-		<jobString>Making pila.</jobString>
+		<jobString>Making a giant javelin.</jobString>
 		<ingredients>
 			<li>
 				<filter>

diff --git a/...ches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml b/...ches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml
@@ -24,6 +24,9 @@
 			<techLevel>Medieval</techLevel>
 			<tradeNeverStack>true</tradeNeverStack>
 			<burnableByRecipe>true</burnableByRecipe>
+			<thingCategories>
+				<li>WeaponsRanged</li>
+			</thingCategories>
 		</value>
 	</Operation>
 

diff --git a/...ded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml b/...ded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml
@@ -23,6 +23,9 @@
 		<xpath>Defs/ThingDef[defName="VFEC_Javelin"]</xpath>
 		<value>
 			<techLevel>Neolithic</techLevel>
+			<thingCategories>
+				<li>WeaponsRanged</li>
+			</thingCategories>			
 		</value>
 	</Operation>
 

diff --git a/...xpanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml b/...xpanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml
@@ -28,6 +28,9 @@
 		<xpath>Defs/ThingDef[defName="VFET_Throwspikes"]</xpath>
 		<value>
 			<techLevel>Neolithic</techLevel>
+			<thingCategories>
+				<li>WeaponsRanged</li>
+			</thingCategories>			
 		</value>
 	</Operation>
 

diff --git a/...pons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml b/...pons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml
@@ -215,19 +215,19 @@
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>VWEFT_Gun_RollingBlockRifle</defName>
 		<statBases>
-			<Mass>7.30</Mass>
-			<RangedWeapon_Cooldown>0.85</RangedWeapon_Cooldown>
+			<Mass>4.20</Mass>
+			<RangedWeapon_Cooldown>0.88</RangedWeapon_Cooldown>
 			<SightsEfficiency>2.15</SightsEfficiency>
 			<ShotSpread>0.01</ShotSpread>
 			<SwayFactor>1.73</SwayFactor>
 			<Bulk>12.80</Bulk>
 		</statBases>
 		<Properties>
-			<recoilAmount>2.0</recoilAmount>
+			<recoilAmount>2.3</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<defaultProjectile>Bullet_4570GovHR_FMJ</defaultProjectile>
-			<warmupTime>1.3</warmupTime>
+			<warmupTime>1.1</warmupTime>
 			<range>64</range>
 			<soundCast>Shot_SniperRifle</soundCast>
 			<soundCastTail>GunTail_Heavy</soundCastTail>