Some fixes

CombatExtended-Continued · Aug 25, 2024 · b7881f7 · b7881f7
1 parent 1ecc399
commit b7881f7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml
@@ -127,8 +127,6 @@
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Smoke</damageDef>
 			<soundExplode>Explosion_OpticBurst</soundExplode>
-			<damageAmountBase>0</damageAmountBase>
-			<explosionRadius>0.9</explosionRadius>
 			<speed>0</speed>
 			<flyOverhead>true</flyOverhead>
 			<dropsCasings>false</dropsCasings>
@@ -433,7 +431,7 @@
 	<!-- ==========  Crucible Carbine Projectile =========== -->
 
 	<ThingDef ParentName="BaseOpticBoltCE">
-		<defName>Bullet_CrucibleCarbine</defName>
+		<defName>Bullet_CrucibleCarbine_CE</defName>
 		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Mlaser</texPath>
@@ -443,4 +441,5 @@
 			<damageAmountBase>10</damageAmountBase>
 		</projectile>
 	</ThingDef>
+
 </Defs>
diff --git a/...atches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml b/...atches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_MechWeapons.xml
@@ -66,10 +66,6 @@
 		<FireModes>
 			<aimedBurstShotCount>5</aimedBurstShotCount>
 			<aiAimMode>AimedShot</aiAimMode>
-		</FireModes>
-		<AmmoUser>
-			<magazineSize>52</magazineSize>
-			<reloadTime>9.2</reloadTime>
-		</AmmoUser>		
+		</FireModes>	
 	</Operation>
 </Patch>
diff --git a/...ches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml b/...ches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml
@@ -544,7 +544,7 @@
 			<recoilAmount>0.69</recoilAmount>
 			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
-			<defaultProjectile>Bullet_CrucibleCarbine</defaultProjectile>
+			<defaultProjectile>Bullet_CrucibleCarbine_CE</defaultProjectile>
 			<warmupTime>1.07</warmupTime>
 			<burstShotCount>5</burstShotCount>
 			<ticksBetweenBurstShots>22</ticksBetweenBurstShots>