Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Anty patch fixes and update #3617

Open
wants to merge 3 commits into
base: Development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions ModPatches/Anty the war Ant/Defs/Anty the war Ant/Ammo_Anty.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@
</ammoTypes>
</CombatExtended.AmmoSetDef>

<!--<CombatExtended.AmmoSetDef>
<defName>AmmoSet_Protyspawner</defName>
<label>Proty Induced Pheromone</label>
<ammoTypes>
<Ammo_AntyAcidRed>BulletProtyspawner_CE</Ammo_AntyAcidRed>
</ammoTypes>
</CombatExtended.AmmoSetDef>-->

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_AntyRedAcidLine</defName>
<label>Acid Line Blaster</label>
Expand Down Expand Up @@ -241,6 +249,32 @@
</comps>
</ThingDef>

<!--<ThingDef ParentName="Base25x40mmGrenadeBullet">
<defName>BulletProtyspawner_CE</defName>
<label>Proty Induced Pheromone</label>
<graphicData>
<texPath>Things/Weapons/Fan</texPath>
<graphicClass>Graphic_Single</graphicClass>
<shaderType>TransparentPostLight</shaderType>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<explosionRadius>0</explosionRadius>
<damageDef>AT_AcidBomb</damageDef>
<preExplosionSpawnThingDef>AT_Proty_spawner_Tunnel</preExplosionSpawnThingDef>
<preExplosionSpawnChance>1</preExplosionSpawnChance>
</projectile>
<comps>
<li Class="CombatExtended.CompProperties_ExplosiveCE">
<explosiveDamageType>AT_AcidBomb</explosiveDamageType>
<explosiveRadius>2.1</explosiveRadius>
<preExplosionSpawnThingDef>Filth_AntyAcid</preExplosionSpawnThingDef>
<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
</li>
<li Class="ExplosionFaction.CompProperties_FactionSetter"/>
</comps>
</ThingDef>-->

<ThingDef ParentName="Base25x40mmGrenadeBullet">
<defName>Bullet_AntyRedAcidLauncher</defName>
<label>Red Burst Bullet</label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,28 +62,6 @@
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="AT_BulletTargetingLauncher"]</xpath>
<value>
<ThingDef ParentName="Base25x40mmGrenadeBullet">
<defName>AT_BulletTargetingLauncher</defName>
<label>Targeting Grenade</label>
<graphicData>
<texPath>Things/Weapons/lan</texPath>
<graphicClass>Graphic_Single</graphicClass>
<shaderType>TransparentPostLight</shaderType>
<color>(0.6, 0.2, 0.2)</color>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<speed>50</speed>
<damageDef>AT_TargetBomb</damageDef>
<explosionRadius>1.9</explosionRadius>
<explosionDelay>30</explosionDelay>
</projectile>
</ThingDef>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="AT_Apparel_CombatSmoke"]/verbs</xpath>
<value>
Expand Down Expand Up @@ -111,32 +89,4 @@
</verbs>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="AT_Apparel_pheromone_TP"]/verbs</xpath>
<value>
<verbs>
<li Class="CombatExtended.VerbPropertiesCE">
<label>launch Targeting pheromone</label>
<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<onlyManualCast>True</onlyManualCast>
<warmupTime>1.1</warmupTime>
<range>40</range>
<minRange>5</minRange>
<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
<soundCast>Shot_IncendiaryLauncher</soundCast>
<soundCastTail>GunTail_Medium</soundCastTail>
<muzzleFlashScale>14</muzzleFlashScale>
<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
<targetParams>
<canTargetLocations>true</canTargetLocations>
</targetParams>
<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
<defaultProjectile>AT_BulletTargetingLauncher</defaultProjectile>
<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
</li>
</verbs>
</value>
</Operation>
</Patch>
Original file line number Diff line number Diff line change
Expand Up @@ -562,10 +562,105 @@
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="AT_AP_Power_A"]/statBases/Mass</xpath>
<value>
<Mass>40</Mass>
<Bulk>40</Bulk>
<WornBulk>10</WornBulk>
</value>
</Operation>
<!--Mech Power Armor-->
<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="AT_AP_Power_E"]/statBases/ArmorRating_Sharp</xpath>
<value>
<ArmorRating_Sharp>20</ArmorRating_Sharp>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="AT_AP_Power_E"]/statBases/ArmorRating_Blunt</xpath>
<value>
<ArmorRating_Blunt>45</ArmorRating_Blunt>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="AT_AP_Power_E"]/equippedStatOffsets/MoveSpeed</xpath>
<value>
<CarryBulk>10</CarryBulk>
<ShootingAccuracyPawn>0.15</ShootingAccuracyPawn>
<CarryWeight>60</CarryWeight>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_E"]/statBases/ArmorRating_Sharp</xpath>
<value>
<ArmorRating_Sharp>18</ArmorRating_Sharp>
<Bulk>5</Bulk>
<WornBulk>2</WornBulk>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_E"]/statBases/ArmorRating_Blunt</xpath>
<value>
<ArmorRating_Blunt>40.5</ArmorRating_Blunt>
</value>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_E"]/apparel/immuneToToxGasExposure</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_E"]/apparel</xpath>
<value>
<immuneToToxGasExposure>true</immuneToToxGasExposure>
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="AT_AP_Power_Head_E"]/equippedStatOffsets</xpath>
<value>
<AimingAccuracy>0.15</AimingAccuracy>
<SmokeSensitivity>-1</SmokeSensitivity>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_E"]/statBases/Mass</xpath>
<value>
<Mass>10</Mass>
<Bulk>25</Bulk>
<WornBulk>5</WornBulk>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_E"]/statBases/ArmorRating_Sharp</xpath>
<value>
<ArmorRating_Sharp>20</ArmorRating_Sharp>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_E"]/statBases/ArmorRating_Blunt</xpath>
<value>
<ArmorRating_Blunt>45</ArmorRating_Blunt>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="AT_AP_AdditionalPower_E"]/equippedStatOffsets/MoveSpeed</xpath>
<value>
<CarryBulk>5</CarryBulk>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[
defName="AT_Apparel_CombatSmoke" or
defName="AT_Apparel_pheromone_TP" or
defName="AT_Apparel_CombatSmoke"or
defName="AT_Apparel_chunk" or
defName="AT_Apparel_barricade" or
defName="AT_Apparel_bunker"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,47 @@
</FireModes>
</Operation>

<!-- ========== Proty Induced Pheromone Launcher AT_Proty_spawner can't be CE patched via xml the comp don't work with CE ammo they do spawn but the FactionSetter is not working-->

<!--<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>AT_Proty_spawner</defName>
<statBases>
<SightsEfficiency>1</SightsEfficiency>
<ShotSpread>0.07</ShotSpread>
<SwayFactor>1.79</SwayFactor>
<Bulk>10.03</Bulk>
<RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
</statBases>

<Properties>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>BulletProtyspawner_CE</defaultProjectile>
<warmupTime>1.2</warmupTime>
<range>51</range>
<ammoConsumedPerShotCount>20</ammoConsumedPerShotCount>
<soundCast>ShotAnty_D</soundCast>
<soundCastTail>GunTail_Light</soundCastTail>
<muzzleFlashScale>8</muzzleFlashScale>
<targetParams>
<canTargetLocations>true</canTargetLocations>
</targetParams>
</Properties>

<AmmoUser>
<magazineSize>120</magazineSize>
<reloadTime>7.8</reloadTime>
<ammoSet>AmmoSet_Protyspawner</ammoSet>
</AmmoUser>
<FireModes>
</FireModes>
</Operation>-->


<Operation Class="PatchOperationRemove"> <!-- AT_Proty_spawner can't be CE patched via xml the comp break -->
<xpath>Defs/ThingDef[defName="AT_Proty_spawner"]/equippedStatOffsets/MoveSpeed </xpath>
</Operation>

<!-- ========== Line Rifle =========== -->

<Operation Class="PatchOperationReplace">
Expand Down Expand Up @@ -174,9 +215,10 @@

<!-- ========== Melee Attacks =========== -->

<Operation Class="PatchOperationReplace">
<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="AT_hydroheliumion_A" or
defName="AT_hydroheliumion_C"
defName="AT_hydroheliumion_C" or
defName="AT_Proty_spawner"
]/tools </xpath>
<value>
<tools>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[@Name="AT_PawnBase"]</xpath>
<value>
<comps>
</comps>
</value>

<Operation Class="PatchOperationConditional">
<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AT_PawnBase"]/comps</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AT_PawnBase"]</xpath>
<value>
<comps />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[@Name="AT_PawnBase"]/comps</xpath>
<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AT_PawnBase"]/comps</xpath>
<value>
<li>
<compClass>CombatExtended.CompPawnGizmo</compClass>
Expand All @@ -19,7 +22,7 @@
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[@Name="AT_PawnBase"]/comps</xpath>
<xpath>Defs/AlienRace.ThingDef_AlienRace[@Name="AT_PawnBase"]/comps</xpath>
<value>
<li Class="CombatExtended.CompProperties_Inventory"/>
</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Anty_prototype"]/statBases/ArmorRating_Blunt</xpath>
<xpath>Defs/ThingDef[@Name="ProtyBase"]/statBases/ArmorRating_Blunt</xpath>
<value>
<ArmorRating_Blunt>6</ArmorRating_Blunt>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Anty_prototype"]/statBases/ArmorRating_Sharp</xpath>
<xpath>Defs/ThingDef[@Name="ProtyBase"]/statBases/ArmorRating_Sharp</xpath>
<value>
<ArmorRating_Sharp>2</ArmorRating_Sharp>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Anty_prototype"]/tools</xpath>
<xpath>Defs/ThingDef[@Name="ProtyBase"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
Expand Down
Loading