Skip to content

Commit

Permalink
Merge pull request #3423 from ViralReaction/ProfanedPatch
Browse files Browse the repository at this point in the history 
Tweak Profaned
  • Loading branch information
@N7Huntsman
N7Huntsman authored Sep 16, 2024
2 parents 1c4a264 + 31f907b commit 935727c
Show file tree
Hide file tree
Showing 7 changed files with 97 additions and 194 deletions.
141 changes: 0 additions & 141 deletions ModPatches/Profaned/Defs/Profaned/Profaned_PawnKindDef.xml
View file

This file was deleted.

23 changes: 0 additions & 23 deletions ModPatches/Profaned/Patches/Profaned/FactionDef_AddRanged.xml
View file

This file was deleted.

59 changes: 40 additions & 19 deletions ModPatches/Profaned/Patches/Profaned/PawnKindDef/Profaned_PawnkindDef_Patch.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>

<Operation Class="PatchOperationRemove">
<xpath>Defs/PawnKindDef[defName="BotchJob_ProfanedDrudge"]/weaponTags/li[.="BotchJob_WeatheredShortbow"]</xpath>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/PawnKindDef[defName="BotchJob_ProfanedDrudge"]/weaponMoney</xpath>
<Operation Class="PatchOperationAddModExtension">
<xpath>Defs/PawnKindDef[defName="BotchJob_ProfanedDrudge"]</xpath>
<value>
<weaponMoney>100~300</weaponMoney>
<li Class="CombatExtended.LoadoutPropertiesExtension">
<primaryMagazineCount>
<min>15</min>
<max>30</max>
</primaryMagazineCount>
<minAmmoCount>15</minAmmoCount>
<sidearms>
<li>
<generateChance>0.25</generateChance>
<sidearmMoney>
<min>20</min>
<max>120</max>
</sidearmMoney>
<weaponTags>
<li>CE_Sidearm_Tribal</li>
</weaponTags>
</li>
</sidearms>
</li>
</value>
</Operation>

Expand All @@ -25,8 +39,8 @@
<li>
<generateChance>0.5</generateChance>
<sidearmMoney>
<min>20</min>
<max>120</max>
<min>150</min>
<max>350</max>
</sidearmMoney>
<weaponTags>
<li>CE_Sidearm_Melee</li>
Expand All @@ -36,16 +50,23 @@
</li>
</value>
</Operation>

<Operation Class="PatchOperationRemove">
<xpath>Defs/PawnKindDef[defName="BotchJob_ScourgeLord"]/weaponTags/li[.="BotchJob_SpectralGreatbow"]</xpath>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/PawnKindDef[defName="BotchJob_ScourgeLord"]/weaponMoney</xpath>
<value>
<weaponMoney>2000~5000</weaponMoney>
</value>

<Operation Class="PatchOperationConditional">
<xpath>Defs/PawnKindDef[defName="BotchJob_ProfanedDrudge"]/apparelRequired</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/PawnKindDef[defName="BotchJob_ProfanedDrudge"]</xpath>
<value>
<apparelRequired>
<li>CE_Apparel_TribalBackpack</li>
</apparelRequired>
</value>
</nomatch>
<match Class="PatchOperationAdd">
<xpath>Defs/PawnKindDef[defName="BotchJob_ProfanedDrudge"]/apparelRequired</xpath>
<value>
<li>CE_Apparel_TribalBackpack</li>
</value>
</match>
</Operation>

<Operation Class="PatchOperationConditional">
Expand Down
36 changes: 36 additions & 0 deletions ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Shields.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,42 @@
<StuffEffectMultiplierArmor>2.85</StuffEffectMultiplierArmor>
</value>
</li>

<li Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="BotchJob_ProfanedShield"]/apparel</xpath>
<value>
<renderNodeProperties>
<li>
<nodeClass>CombatExtended.PawnRenderNode_Apparel</nodeClass>
<workerClass>CombatExtended.PawnRenderNodeWorker_Drafted</workerClass>
<texPath>Things/Pawn/Humanlike/Apparel/Misc/ProfanedShield</texPath>
<shaderTypeDef>CutoutComplex</shaderTypeDef>
<parentTagDef>ApparelBody</parentTagDef>
<drawData>
<scale>0.65</scale>
<defaultData>
<layer>80</layer>
</defaultData>
<dataEast>
<layer>-5</layer>
<offset>(0, 0, -0.2)</offset>
<rotationOffset>30</rotationOffset>
</dataEast>
<dataWest>
<rotationOffset>-30</rotationOffset>
</dataWest>
<dataNorth>
<layer>-5</layer>
<offset>(0.2, 0, -0.2)</offset>
</dataNorth>
<dataSouth>
<offset>(0.2, 0, -0.2)</offset>
</dataSouth>
</drawData>
</li>
</renderNodeProperties>
</value>
</li>

</operations>
</match>
Expand Down
22 changes: 18 additions & 4 deletions ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_Projectiles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[
defName="BotchJob_BoneProjectile" or
defName="BotchJob_SoulShard"]/thingClass
defName="BotchJob_SoulShard" or
defName="BotchJob_SpectralGreatbowArrow"]/thingClass
</xpath>
<value>
<thingClass>CombatExtended.BulletCE</thingClass>
Expand Down Expand Up @@ -81,7 +82,7 @@
</projectile>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_BloodflameStaffBolt"]/projectile</xpath>
<value>
Expand All @@ -97,7 +98,7 @@
</projectile>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_ProfanedStaffBolt"]/projectile</xpath>
<value>
Expand Down Expand Up @@ -143,6 +144,19 @@
<arcHeightFactor>1.2</arcHeightFactor>
</projectile>
</value>
</Operation>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_SpectralGreatbowArrow"]/projectile</xpath>
<value>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Arrow</damageDef>
<damageAmountBase>8</damageAmountBase>
<speed>26</speed>
<armorPenetrationBlunt>2.96</armorPenetrationBlunt>
<armorPenetrationSharp>3</armorPenetrationSharp>
</projectile>
</value>
</Operation>

</Patch>
2 changes: 1 addition & 1 deletion ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@
</equippedStatOffsets>
</value>
</Operation>

<!-- Blood Flame Staff -->
<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>BotchJob_BloodflameStaff</defName>
Expand Down
8 changes: 2 additions & 6 deletions ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Ranged.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,13 @@
<Properties>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Projectile_GreatArrow_Steel</defaultProjectile>
<defaultProjectile>BotchJob_SpectralGreatbowArrow</defaultProjectile>
<warmupTime>1.8</warmupTime>
<range>30</range>
<burstShotCount>3</burstShotCount>
<soundCast>Bow_Large</soundCast>
<recoilAmount>0</recoilAmount>
</Properties>
<AmmoUser>
<magazineSize>3</magazineSize>
<reloadTime>0</reloadTime>
<ammoSet>AmmoSet_ProfanedGreatbowArrow</ammoSet>
</AmmoUser>
<FireModes>
<aiUseBurstMode>TRUE</aiUseBurstMode>
<aiAimMode>AimedShot</aiAimMode>
Expand Down

0 comments on commit 935727c

Please sign in to comment.