Skip to content

Commit

Permalink
More streamlining and tweaks.
Browse files Browse the repository at this point in the history
  • Loading branch information
@N7Huntsman
N7Huntsman committed Nov 30, 2024
1 parent 1a0da4f commit 312580b
Show file tree
Hide file tree
Showing 5 changed files with 164 additions and 220 deletions.
2 changes: 1 addition & 1 deletion Defs/Ammo/Advanced/70mmMechanoidGrenade.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_70mmMechanoidGrenade</defName>
<label>70mmMechanoid Grenades</label>
<label>70mm Mechanoid Grenades</label>
<ammoTypes>
<Ammo_70mmMechanoidGrenade_HE>Bullet_70mmMechanoidGrenade_HE</Ammo_70mmMechanoidGrenade_HE>
<Ammo_70mmMechanoidGrenade_EMP>Bullet_70mmMechanoidGrenade_EMP</Ammo_70mmMechanoidGrenade_EMP>
Expand Down
52 changes: 7 additions & 45 deletions ... War Procedure/Patches/Diverce Mechanoid War Procedure/ThingDefs_Misc/RangedMechanoid.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[
defName="Gun_ToxCannon" or
defName="Gun_EMPCannon" or
defName="Gun_MechanoidAutocannon"
]/tools</xpath>
<value>
Expand Down Expand Up @@ -197,50 +196,6 @@
</weaponTags>
</Operation>

<!-- EMP Cannon -->

<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>Gun_EMPCannon</defName>
<statBases>
<Mass>75.00</Mass>
<RangedWeapon_Cooldown>2.2</RangedWeapon_Cooldown>
<SightsEfficiency>1</SightsEfficiency>
<ShotSpread>0.01</ShotSpread>
<SwayFactor>0.21</SwayFactor>
<Bulk>20.00</Bulk>
</statBases>
<Properties>
<recoilAmount>0.1</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Bullet_70mmMechanoidGrenade_EMP</defaultProjectile>
<warmupTime>2</warmupTime>
<range>42</range>
<burstShotCount>1</burstShotCount>
<soundCast>ThumpCannon_Fire</soundCast>
<targetParams>
<canTargetLocations>true</canTargetLocations>
</targetParams>
<soundCastTail>GunTail_Heavy</soundCastTail>
<muzzleFlashScale>14</muzzleFlashScale>
<ai_AvoidFriendlyFireRadius>3</ai_AvoidFriendlyFireRadius>
<minRange>4</minRange>
</Properties>
<AmmoUser>
<magazineSize>1</magazineSize>
<AmmoGenPerMagOverride>2</AmmoGenPerMagOverride>
<reloadTime>9.8</reloadTime>
<ammoSet>AmmoSet_70mmMechanoidGrenade</ammoSet>
</AmmoUser>
<FireModes>
<aiAimMode>AimedShot</aiAimMode>
</FireModes>
<weaponTags>
<li>CE_AI_Launcher</li>
<li>NoSwitch</li>
</weaponTags>
</Operation>

<!-- Tox Cannon -->

<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
Expand Down Expand Up @@ -285,6 +240,12 @@
</weaponTags>
</Operation>

<!-- EMP Cannon - Just force the ToxCannon to spawn with EMP ammo instead. -->

<Operation Class="PatchOperationRemove">
<xpath>Defs/ThingDef[defName="Gun_EMPCannon"]</xpath>
</Operation>

<!-- Mech Autocannon -->

<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
Expand Down Expand Up @@ -316,6 +277,7 @@
<ammoSet>AmmoSet_20x82mmMauser</ammoSet>
</AmmoUser>
<FireModes>
<AmmoGenPerMagOverride>4</AmmoGenPerMagOverride>
<aiUseBurstMode>true</aiUseBurstMode>
<aimedBurstShotCount>2</aimedBurstShotCount>
<aiAimMode>AimedShot</aiAimMode>
Expand Down
152 changes: 152 additions & 0 deletions ...rocedure/Patches/Diverce Mechanoid War Procedure/ThingDefs_Races/PawnKinds_Mechanoids.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>

<!-- ========== Combat power adjustment ========== -->

<Operation Class="PatchOperationReplace">
<xpath>Defs/PawnKindDef[defName="Mech_Pikeman_Defender"]/combatPower</xpath>
<value>
<combatPower>250</combatPower>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/PawnKindDef[defName="Mech_Knight"]/combatPower</xpath>
<value>
<combatPower>250</combatPower>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/PawnKindDef[defName="Mech_Militor_Scout"]/combatPower</xpath>
<value>
<combatPower>60</combatPower>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/PawnKindDef[defName="Mech_Militor_Sniper"]/combatPower</xpath>
<value>
<combatPower>60</combatPower>
</value>
</Operation>

<!-- ========== Loadouts ========== -->

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/PawnKindDef[defName="Mech_Lancer_Assault"]</xpath>
<value>
<li Class="CombatExtended.LoadoutPropertiesExtension">
<primaryMagazineCount>
<min>4</min>
<max>5</max>
</primaryMagazineCount>
</li>
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/PawnKindDef[defName="Mech_Pikeman_Defender"]</xpath>
<value>
<li Class="CombatExtended.LoadoutPropertiesExtension">
<primaryMagazineCount>
<min>3</min>
<max>4</max>
</primaryMagazineCount>
</li>
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/PawnKindDef[defName="Mech_Pikeman_Commander"]</xpath>
<value>
<li Class="CombatExtended.LoadoutPropertiesExtension">
<primaryMagazineCount>
<min>4</min>
<max>6</max>
</primaryMagazineCount>
</li>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/PawnKindDef[defName="Mech_Termite_Shocker"]/weaponTags/li[.="MechanoidGunEMP"]</xpath>
<value>
<li>MechanoidGunTox</li>
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/PawnKindDef[defName="Mech_Termite_Shocker"]</xpath>
<value>
<li Class="CombatExtended.LoadoutPropertiesExtension">
<primaryMagazineCount>
<min>4</min>
<max>5</max>
</primaryMagazineCount>
<forcedAmmoCategory>GrenadeEMP</forcedAmmoCategory>
</li>
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/PawnKindDef[defName="Mech_Termite_Toxer"]</xpath>
<value>
<li Class="CombatExtended.LoadoutPropertiesExtension">
<primaryMagazineCount>
<min>4</min>
<max>5</max>
</primaryMagazineCount>
<forcedAmmoCategory>Toxic</forcedAmmoCategory>
</li>
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/PawnKindDef[defName="Mech_Praetorian"]</xpath>
<value>
<li Class="CombatExtended.LoadoutPropertiesExtension">
<primaryMagazineCount>
<min>3</min>
<max>5</max>
</primaryMagazineCount>
</li>
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/PawnKindDef[defName="Mech_Militor_Scout"]</xpath>
<value>
<li Class="CombatExtended.LoadoutPropertiesExtension">
<primaryMagazineCount>
<min>4</min>
<max>5</max>
</primaryMagazineCount>
</li>
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/PawnKindDef[defName="Mech_Militor_Sniper"]</xpath>
<value>
<li Class="CombatExtended.LoadoutPropertiesExtension">
<primaryMagazineCount>
<min>4</min>
<max>5</max>
</primaryMagazineCount>
</li>
</value>
</Operation>

<!-- ========== Praetorian bolt projector ========== -->

<Operation Class="PatchOperationReplace">
<xpath>Defs/PawnKindDef[defName="Mech_Praetorian"]/weaponTags</xpath>
<value>
<weaponTags>
<li>MechanoidGunIndirect</li>
</weaponTags>
</value>
</Operation>

</Patch>
67 changes: 2 additions & 65 deletions ...cedure/Patches/Diverce Mechanoid War Procedure/ThingDefs_Races/Races_Mechanoids_Light.xml
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>

<Operation Class="PatchOperationReplace">
<xpath>Defs/PawnKindDef[defName="Mech_Militor_Scout"]/combatPower</xpath>
<value>
<combatPower>60</combatPower>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/PawnKindDef[defName="Mech_Militor_Sniper"]/combatPower</xpath>
<value>
<combatPower>60</combatPower>
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/PawnKindDef[defName="Mech_Militor_Scout"]</xpath>
<value>
<li Class="CombatExtended.LoadoutPropertiesExtension">
<primaryMagazineCount>
<min>4</min>
<max>5</max>
</primaryMagazineCount>
</li>
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/PawnKindDef[defName="Mech_Militor_Sniper"]</xpath>
<value>
<li Class="CombatExtended.LoadoutPropertiesExtension">
<primaryMagazineCount>
<min>4</min>
<max>5</max>
</primaryMagazineCount>
</li>
</value>
</Operation>

<!-- ========== Light Mechanoid ========== -->


<Operation Class="PatchOperationConditional">
<xpath>Defs/ThingDef[defName="Mech_Militor_Scout"]/comps</xpath>
<nomatch Class="PatchOperationAdd">
Expand Down Expand Up @@ -87,7 +48,7 @@
<!-- ========== Militor ========== -->

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/ThingDef[defName="Mech_Militor_Sniper"]</xpath>
<xpath>Defs/ThingDef[defName="Mech_Militor_Sniper" or defName="Mech_Militor_Scout"]</xpath>
<value>
<li Class="CombatExtended.RacePropertiesExtensionCE">
<bodyShape>Humanoid</bodyShape>
Expand All @@ -96,7 +57,7 @@
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="Mech_Militor_Sniper"]/statBases</xpath>
<xpath>Defs/ThingDef[defName="Mech_Militor_Sniper" or defName="Mech_Militor_Scout"]/statBases</xpath>
<value>
<ArmorRating_Blunt>4</ArmorRating_Blunt>
<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
Expand All @@ -109,29 +70,5 @@
<NightVisionEfficiency>0.4</NightVisionEfficiency>
</value>
</Operation>

<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/ThingDef[defName="Mech_Militor_Scout"]</xpath>
<value>
<li Class="CombatExtended.RacePropertiesExtensionCE">
<bodyShape>Humanoid</bodyShape>
</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="Mech_Militor_Scout"]/statBases</xpath>
<value>
<ArmorRating_Blunt>4</ArmorRating_Blunt>
<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
<AimingAccuracy>0.6</AimingAccuracy>
<ShootingAccuracyPawn>0.769</ShootingAccuracyPawn> <!-- Equivalent to a Level 5 Shooter -->
<MeleeDodgeChance>0.13</MeleeDodgeChance>
<MeleeCritChance>0.05</MeleeCritChance>
<MeleeParryChance>0.05</MeleeParryChance>
<MaxHitPoints>150</MaxHitPoints>
<NightVisionEfficiency>0.4</NightVisionEfficiency>
</value>
</Operation>

</Patch>
Loading

0 comments on commit 312580b

Please sign in to comment.