Skip to content

Commit

Permalink
Merge pull request #3298 from SamaelGray/SaamelGray-PossessedWeaponsFix
Browse files Browse the repository at this point in the history 
Possessed Weapons patch fix
  • Loading branch information
@N7Huntsman
N7Huntsman authored Jul 23, 2024
2 parents 946f3ae + 4f96185 commit 7708ff7
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 100 deletions.
6 changes: 3 additions & 3 deletions LoadFolders.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
<li IfModActive="Vanya.Polarisbloc.CoreLab">ModPatches/Polarisbloc Core Lab</li>
<li IfModActive="Vanya.Polarisbloc.SecurityForce">ModPatches/Polarisbloc Security Force</li>
<li IfModActive="milk.poleepkwaupdate, GHOST.Poleepkwa">ModPatches/Poleepkwa Race</li>
<li IfModActive="BotchJob.PossessedWeapons">ModPatches/Possesed Weapons</li>
<li IfModActive="BotchJob.PossessedWeapons">ModPatches/Possessed Weapons</li>
<li IfModActive="JangoDsoul.T45b.PowerArmor">ModPatches/PowerArmour T-45b</li>
<li IfModActive="pphhyy.DemigryphsMod">ModPatches/pphhyy Demigryph</li>
<li IfModActive="pphhyy.ExpandedMechsScyther">ModPatches/pphhyy Expanded Scythers</li>
Expand Down Expand Up @@ -597,10 +597,10 @@
<li IfModActive="Mlie.XennRace">ModPatches/Xenn</li>
<li IfModActive="Neronix17.OuterRim.DroidDepot">ModPatches/Outer Rim - Droid Depot</li>
<li IfModActive="VAMV.MaruRaceMod">ModPatches/Maru Race</li>
<li IfModActive="det.boglegs">ModPatches/Det's Xenotypes - Boglegs</li>
<li IfModActive="det.boglegs">ModPatches/Det's Xenotypes - Boglegs</li>
<li IfModActive="Nemonian.MY2.Beta">ModPatches/Moyo 2</li>
<li IfModActive="polonium.RorenRaceMod">ModPatches/Roren Race</li>
<li IfModActive="Pal5k.DeployableTurret">ModPatches/Deployable Turret</li>
<li IfModActive="Pal5k.DeployableTurret">ModPatches/Deployable Turret</li>
<li IfModActive="pphhyy.LightlessEmpyrean">ModPatches/pphhyy's Lightless Empyrean</li>
<li IfModActive="det.vanillaarsenal">ModPatches/Vanilla Arsenal</li>
</v1.5>
Expand Down
32 changes: 0 additions & 32 deletions ...ossesed Weapons/PossessedWeapons_Ammo.xml → ...ed Weapons/Defs/PossessedWeapons_Ammo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@
</projectile>
</ThingDef>


<!-- Ammo for Ghostly Flintlock -->

<!-- Ghostly Flintlock -->
Expand Down Expand Up @@ -150,35 +149,4 @@
</projectile>
</ThingDef>


<!-- Ammo for Ghostly Flintlock -->

<!-- Ghostly Flintlock -->
<CombatExtended.AmmoSetDef>
<defName>AmmoSet_GhostFlintlock_MusketBall</defName>
<label>musket ball</label>
<ammoTypes>
<Ammo_MusketBall>Projectile_GhostFlintlock_MusketBall</Ammo_MusketBall>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<ThingDef ParentName="BaseStreamlinedArrowProjectile">
<defName>Projectile_GhostFlintlock_MusketBall</defName>
<label>musket ball</label>
<graphicData>
<texPath>Things/Projectile/BotchJob_GhostBullet</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>BotchJob_GhostBlast</damageDef>
<speed>30</speed>
<damageAmountBase>6</damageAmountBase>
<pelletCount>6</pelletCount>
<armorPenetrationSharp>3.5</armorPenetrationSharp>
<armorPenetrationBlunt>3.14</armorPenetrationBlunt>
<spreadMult>5</spreadMult>
<explosionRadius>1</explosionRadius>
</projectile>
</ThingDef>

</Defs>
2 changes: 0 additions & 2 deletions ...Possesed Weapons/Projectiles_Possesed.xml → ...sed Weapons/Defs/Projectiles_Possesed.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>



<ThingDef ParentName="BaseStreamlinedArrowProjectile">
<defName>Projectile_EarthenGauntlet_RockBlast</defName>
<label>rock blast</label>
Expand Down
0 ...d Weapons/PossessedWeapons_MeleePatch.xml → ...s/Patches/PossessedWeapons_MeleePatch.xml
View file
File renamed without changes.
126 changes: 63 additions & 63 deletions ... Weapons/PossessedWeapons_RangedPatch.xml → .../Patches/PossessedWeapons_RangedPatch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<AmmoUser>
<ammoSet>AmmoSet_DragonFireArrow</ammoSet>
</AmmoUser>
<FireModes/>
<FireModes />
<weaponTags>
<li>BotchJob_PossessedDragonfireGreatbow</li>
</weaponTags>
Expand Down Expand Up @@ -123,7 +123,7 @@
</tools>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_PossessedLightningJavelin"]/description</xpath>
<value>
Expand Down Expand Up @@ -291,7 +291,7 @@
<AmmoUser>
<ammoSet>AmmoSet_VerdantArrow</ammoSet>
</AmmoUser>
<FireModes/>
<FireModes />
<weaponTags>
<li>BotchJob_PossessedVerdantBow</li>
</weaponTags>
Expand Down Expand Up @@ -489,66 +489,66 @@
<match Class="PatchOperationSequence">
<operations>

<!--=============================== Possessed Acolyte Staff ================================-->
<li Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/statBases</xpath>
<value>
<Bulk>10.00</Bulk>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/statBases/RangedWeapon_Cooldown</xpath>
<value>
<RangedWeapon_Cooldown>1.53</RangedWeapon_Cooldown>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/warmupTime</xpath>
<value>
<warmupTime>2.7</warmupTime>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/range</xpath>
<value>
<range>30</range>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/burstShotCount</xpath>
<value>
<burstShotCount>14</burstShotCount>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/ticksBetweenBurstShots</xpath>
<value>
<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
<label>limb</label>
<capacities>
<li>Blunt</li>
<li>Poke</li>
</capacities>
<power>6</power>
<cooldownTime>1.2</cooldownTime>
<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
</li>
</tools>
</value>
</li>
<!--=============================== Possessed Acolyte Staff ================================-->
<li Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/statBases</xpath>
<value>
<Bulk>10.00</Bulk>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/statBases/RangedWeapon_Cooldown</xpath>
<value>
<RangedWeapon_Cooldown>1.53</RangedWeapon_Cooldown>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/warmupTime</xpath>
<value>
<warmupTime>2.7</warmupTime>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/range</xpath>
<value>
<range>30</range>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/burstShotCount</xpath>
<value>
<burstShotCount>14</burstShotCount>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/verbs/li/ticksBetweenBurstShots</xpath>
<value>
<ticksBetweenBurstShots>10</ticksBetweenBurstShots>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BotchJob_PossessedAcolyteStaff"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
<label>limb</label>
<capacities>
<li>Blunt</li>
<li>Poke</li>
</capacities>
<power>6</power>
<cooldownTime>1.2</cooldownTime>
<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
</li>
</tools>
</value>
</li>

</operations>
</match>
Expand Down

0 comments on commit 7708ff7

Please sign in to comment.