Skip to content

Commit

Permalink
Merge pull request #864 from CombatExtended-Continued/PatchesUpdates
Browse files Browse the repository at this point in the history
Patches Updates 2: Electric Boogaloo
  • Loading branch information
N7Huntsman authored Jul 25, 2021
2 parents 4cb7d55 + eb9766c commit 76a65db
Show file tree
Hide file tree
Showing 32 changed files with 772 additions and 708 deletions.
2 changes: 1 addition & 1 deletion Patches/Kaiser Armory/105x155mmR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<Operation Class="PatchOperationFindMod">
<mods>
<li>Kaiser Armory [1.2]</li>
<li>Kaiser Armory [1.3]</li>
</mods>
<match Class="PatchOperationAdd">
<xpath>Defs</xpath>
Expand Down
2 changes: 1 addition & 1 deletion Patches/Kaiser Armory/77x230mmR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<Operation Class="PatchOperationFindMod">
<mods>
<li>Kaiser Armory [1.2]</li>
<li>Kaiser Armory [1.3]</li>
</mods>
<match Class="PatchOperationAdd">
<xpath>Defs</xpath>
Expand Down
2 changes: 1 addition & 1 deletion Patches/Kaiser Armory/KaiserArmory_GrenadeRecipe.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Patch>
<Operation Class="PatchOperationFindMod">
<mods>
<li>Kaiser Armory [1.2]</li>
<li>Kaiser Armory [1.3]</li>
</mods>
<match Class="PatchOperationSequence">
<operations>
Expand Down
2 changes: 1 addition & 1 deletion Patches/Kaiser Armory/KaiserArmory_Guns.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Patch>
<Operation Class="PatchOperationFindMod">
<mods>
<li>Kaiser Armory [1.2]</li>
<li>Kaiser Armory [1.3]</li>
</mods>
<match Class="PatchOperationSequence">
<operations>
Expand Down
2 changes: 1 addition & 1 deletion Patches/Kaiser Armory/KaiserArmory_Melee.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Patch>
<Operation Class="PatchOperationFindMod">
<mods>
<li>Kaiser Armory [1.2]</li>
<li>Kaiser Armory [1.3]</li>
</mods>
<match Class="PatchOperationSequence">
<operations>
Expand Down
2 changes: 1 addition & 1 deletion Patches/Kaiser Armory/KaiserArmory_Turrets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Patch>
<Operation Class="PatchOperationFindMod">
<mods>
<li>Kaiser Armory [1.2]</li>
<li>Kaiser Armory [1.3]</li>
</mods>
<match Class="PatchOperationSequence">
<operations>
Expand Down
5 changes: 5 additions & 0 deletions Patches/Orassans/PawnKinds_Orassans.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@
<xpath>
/Defs/PawnKindDef[
defName = "Orassan" or
defName = "HumanVillager" or
defName = "HybridVillager" or
defName = "OrassanVillager" or
defName = "OrassanSlave" or
defName = "HybridRefugee" or
defName = "OrassanRefugee" or
defName = "OrassanTownCouncilman" or
defName = "OrassanTrader" or
Expand All @@ -23,6 +26,8 @@
defName = "OrassanMercenaryGunner" or
defName = "OrassanGrenadier" or
defName = "OrassanSoldier" or
defName = "HybridSoldier" or
defName = "HumanSoldier" or
defName = "OrassanMercenarySoldier" or
defName = "OrassanPirate"
]
Expand Down
5 changes: 2 additions & 3 deletions Patches/Orassans/ThingDefs_Misc/Apparel_Hats.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,9 @@
<ArmorRating_Blunt>25</ArmorRating_Blunt>
</value>
</li>

</operations>
</match>
</Operation>

</Patch>

</Patch>
50 changes: 48 additions & 2 deletions Patches/Orassans/ThingDefs_Misc/Apparel_Various.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</mods>
<match Class="PatchOperationSequence">
<operations>

<!-- ========== Orassan Power Armor ========== -->
<li Class="PatchOperationAdd">
<xpath>/Defs/ThingDef[defName="Apparel_KittyArmor"]/statBases</xpath>
Expand Down Expand Up @@ -54,6 +54,52 @@
</value>
</li>

<!-- ========== Orassan Medium Powerarmor ======= -->
<li Class="PatchOperationAdd">
<xpath>/Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/statBases</xpath>
<value>
<Bulk>70</Bulk>
<WornBulk>5</WornBulk>
</value>
</li>

<li Class="PatchOperationAdd">
<xpath>/Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/equippedStatOffsets</xpath>
<value>
<CarryWeight>100</CarryWeight>
<CarryBulk>22.5</CarryBulk>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>/Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/statBases/Mass</xpath>
<value>
<Mass>25</Mass>
</value>
</li>

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

<li Class="PatchOperationReplace">
<xpath>/Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/statBases/ArmorRating_Blunt</xpath>
<value>
<ArmorRating_Blunt>50</ArmorRating_Blunt>
</value>
</li>

<li Class="PatchOperationAdd">
<xpath>/Defs/ThingDef[defName="Apparel_MediumKittyArmor"]/apparel/bodyPartGroups</xpath>
<value>
<li>Hands</li>
<li>Feet</li>
</value>
</li>

<!-- ========== Orassan Light Powarmor ========== -->
<li Class="PatchOperationAdd">
<xpath>/Defs/ThingDef[defName="Apparel_LightKittyArmor"]/statBases</xpath>
Expand All @@ -74,7 +120,7 @@
<li Class="PatchOperationReplace">
<xpath>/Defs/ThingDef[defName="Apparel_LightKittyArmor"]/statBases/Mass</xpath>
<value>
<Mass>25</Mass>
<Mass>3</Mass>
</value>
</li>

Expand Down
6 changes: 2 additions & 4 deletions Patches/Orassans/ThingDefs_Races/Desiri.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
</li>
</value>
</li>


<li Class="PatchOperationReplace">
<xpath>/Defs/ThingDef[@Name="ThingBaseDesiri"]/tools</xpath>
Expand All @@ -28,7 +27,7 @@
<li>Scratch</li>
</capacities>
<power>4</power>
<cooldownTime>0.91</cooldownTime>
<cooldownTime>0.91</cooldownTime>
<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
<surpriseAttack>
<extraMeleeDamages>
Expand Down Expand Up @@ -93,7 +92,7 @@
</tools>
</value>
</li>

<li Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="Animal_Desiri"]/statBases</xpath>
<value>
Expand All @@ -108,4 +107,3 @@
</Operation>

</Patch>

8 changes: 3 additions & 5 deletions Patches/Orassans/ThingDefs_Races/Gryphon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@
</li>
</value>
</li>

<!-- Copied Big Cat Stats, changed bite to use beak, and paws to claws -->

<!-- Copied Big Cat Stats, changed bite to use beak, and paws to claws -->
<li Class="PatchOperationReplace">
<xpath>/Defs/ThingDef[defName="Gryphon"]/tools</xpath>
<value>
Expand Down Expand Up @@ -93,7 +92,7 @@
</tools>
</value>
</li>

<li Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="Gryphon"]/statBases</xpath>
<value>
Expand All @@ -107,5 +106,4 @@
</match>
</Operation>

</Patch>

</Patch>
2 changes: 1 addition & 1 deletion Patches/Orassans/ThingDefs_Races/Hybrid_Race.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
</tools>
</value>
</li>

</operations>
</match>
</Operation>
Expand Down
2 changes: 1 addition & 1 deletion Patches/Orassans/ThingDefs_Races/Orassan_Race.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
</tools>
</value>
</li>

</operations>
</match>
</Operation>
Expand Down
5 changes: 2 additions & 3 deletions Patches/Orassans/ThingDefs_Races/Ori.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</tools>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Ori"]/statBases/MoveSpeed</xpath>
<value>
Expand All @@ -80,5 +80,4 @@
</match>
</Operation>

</Patch>

</Patch>
10 changes: 4 additions & 6 deletions Patches/Orassans/ThingDefs_Weapons/Weapons.xml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@
<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
<warmupTime>0.55</warmupTime>
<range>10</range>
<burstShotCount>2</burstShotCount>
<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
<soundCast>Opistol</soundCast>
<soundCastTail>GunTail_Light</soundCastTail>
Expand All @@ -143,7 +142,6 @@
<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
</AmmoUser>
<FireModes>
<aimedBurstShotCount>2</aimedBurstShotCount>
<aiAimMode>AimedShot</aiAimMode>
</FireModes>
<weaponTags>
Expand Down Expand Up @@ -322,7 +320,7 @@
<recoilAmount>1.16</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
<warmupTime>1.2</warmupTime>
<range>62</range>
<ticksBetweenBurstShots>5</ticksBetweenBurstShots>
Expand All @@ -338,7 +336,7 @@
<AmmoUser>
<magazineSize>90</magazineSize>
<reloadTime>5</reloadTime>
<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
</AmmoUser>
<FireModes>
<aiUseBurstMode>FALSE</aiUseBurstMode>
Expand Down Expand Up @@ -398,7 +396,7 @@
<recoilAmount>1.60</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Bullet_6x24mmCharged</defaultProjectile>
<defaultProjectile>Bullet_8x35mmCharged</defaultProjectile>
<warmupTime>1</warmupTime>
<range>64</range>
<soundCast>OTFalcon</soundCast>
Expand All @@ -407,7 +405,7 @@
<AmmoUser>
<magazineSize>10</magazineSize>
<reloadTime>4</reloadTime>
<ammoSet>AmmoSet_6x24mmCharged</ammoSet>
<ammoSet>AmmoSet_8x35mmCharged</ammoSet>
</AmmoUser>
<FireModes>
<aiAimMode>AimedShot</aiAimMode>
Expand Down
2 changes: 1 addition & 1 deletion Patches/Silkiera Race/Ammo/Ammo_Silkiera.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<operations>
<li Class="PatchOperationFindMod">

<mods><li>[1.2]Silkiera Race</li></mods>
<mods><li>[1.3]Silkiera Race</li></mods>

<match Class="PatchOperationSequence">
<operations>
Expand Down
2 changes: 1 addition & 1 deletion Patches/Silkiera Race/Bodies/Bodies_Mech.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Operation Class="PatchOperationFindMod">
<mods>
<li>[1.2]Silkiera Race</li>
<li>[1.3]Silkiera Race</li>
</mods>

<match Class="PatchOperationSequence">
Expand Down
2 changes: 1 addition & 1 deletion Patches/Silkiera Race/Bodies/Silkiera_Bodytype.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<li Class="PatchOperationFindMod">
<mods>
<li>[1.2]Silkiera Race</li>
<li>[1.3]Silkiera Race</li>
</mods>
<match Class="PatchOperationSequence">
<operations>
Expand Down
Loading

0 comments on commit 76a65db

Please sign in to comment.