Skip to content

Commit

Permalink
Merge branch 'Development' into Development
Browse files Browse the repository at this point in the history
  • Loading branch information
@N7Huntsman
N7Huntsman authored Aug 4, 2024
2 parents 38d4f51 + 093e38d commit 2bd98a2
Show file tree
Hide file tree
Showing 19 changed files with 462 additions and 324 deletions.
413 changes: 207 additions & 206 deletions LoadFolders.xml
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions ModPatches/A Rimworld of Magic/Defs/A Rimworld of Magic/Defs_Projectiles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<!-- ==================== Wand Projectiles ==================== -->

<ThingDef Name="WandBoltProjectile" ParentName="Base6x24mmChargedBullet" Class="AbilityUser.ProjectileDef_Ability">
<ThingDef Name="WandBoltProjectile" ParentName="Base6x24mmChargedBullet" Class="AbilityUser.ProjectileDef_Ability" Abstract="true">
<graphicData>
<graphicClass>Graphic_Single</graphicClass>
<shaderType>TransparentPostLight</shaderType>
Expand All @@ -15,7 +15,7 @@
</ThingDef>

<ThingDef ParentName="WandBoltProjectile" Class="AbilityUser.ProjectileDef_Ability">
<defName>Projectile_IceWand</defName>
<defName>Projectile_CE_IceWand</defName>
<label>ice shard</label>
<graphicData>
<texPath>Spells/Icebolt</texPath>
Expand All @@ -29,7 +29,7 @@
</ThingDef>

<ThingDef ParentName="WandBoltProjectile" Class="AbilityUser.ProjectileDef_Ability">
<defName>Projectile_FireWand</defName>
<defName>Projectile_CE_FireWand</defName>
<label>fire blast</label>
<graphicData>
<texPath>Spells/seer_ring_fire</texPath>
Expand All @@ -46,7 +46,7 @@
</ThingDef>

<ThingDef ParentName="WandBoltProjectile" Class="AbilityUser.ProjectileDef_Ability">
<defName>Projectile_LightningWand</defName>
<defName>Projectile_CE_LightningWand</defName>
<label>lightning bolt</label>
<graphicData>
<texPath>Spells/LightningBolt</texPath>
Expand All @@ -64,7 +64,7 @@
</ThingDef>

<ThingDef ParentName="WandBoltProjectile" Class="AbilityUser.ProjectileDef_Ability">
<defName>Projectile_BlazingPower</defName>
<defName>Projectile_CE_BlazingPower</defName>
<label>blazing power</label>
<graphicData>
<texPath>Spells/blazingpower</texPath>
Expand Down
34 changes: 20 additions & 14 deletions ModPatches/A Rimworld of Magic/Patches/A Rimworld of Magic/Patch_Ranged.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</capacities>
<power>2</power>
<cooldownTime>0.5</cooldownTime>
<armorPenetrationBlunt>.2</armorPenetrationBlunt>
<armorPenetrationBlunt>0.2</armorPenetrationBlunt>
</li>
</tools>
</value>
Expand All @@ -50,7 +50,6 @@
<xpath>Defs/ThingDef[defName="Projectile_IceWand"]</xpath>
</Operation>


<Operation Class="PatchOperationRemove">
<xpath>Defs/ThingDef[defName="Projectile_FireWand"]</xpath>
</Operation>
Expand All @@ -67,13 +66,13 @@
<SwayFactor>1.01</SwayFactor>
<Bulk>1</Bulk>
<Mass>1</Mass>
<RangedWeapon_Cooldown>.6</RangedWeapon_Cooldown>
<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
</statBases>
<Properties>
<recoilAmount>1.53</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Projectile_IceWand</defaultProjectile>
<defaultProjectile>Projectile_CE_IceWand</defaultProjectile>
<warmupTime>0.5</warmupTime>
<range>40</range>
<soundCast>TM_Woosh</soundCast>
Expand All @@ -93,12 +92,12 @@
<SwayFactor>0.10</SwayFactor>
<Bulk>0.5</Bulk>
<Mass>1</Mass>
<RangedWeapon_Cooldown>.3</RangedWeapon_Cooldown>
<RangedWeapon_Cooldown>0.3</RangedWeapon_Cooldown>
</statBases>
<Properties>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Projectile_IceWand</defaultProjectile>
<defaultProjectile>Projectile_CE_IceWand</defaultProjectile>
<warmupTime>0.25</warmupTime>
<range>40</range>
<soundCast>Shot_ChargeRifle</soundCast>
Expand All @@ -124,7 +123,7 @@
<recoilAmount>1.53</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Projectile_LightningWand</defaultProjectile>
<defaultProjectile>Projectile_CE_LightningWand</defaultProjectile>
<warmupTime>2.8</warmupTime>
<range>32</range>
<soundCast>TM_Thunder_OnMap</soundCast>
Expand All @@ -144,12 +143,12 @@
<SwayFactor>0.10</SwayFactor>
<Bulk>0.5</Bulk>
<Mass>1</Mass>
<RangedWeapon_Cooldown>.8</RangedWeapon_Cooldown>
<RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
</statBases>
<Properties>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Projectile_LightningWand</defaultProjectile>
<defaultProjectile>Projectile_CE_LightningWand</defaultProjectile>
<warmupTime>1.4</warmupTime>
<range>32</range>
<soundCast>TM_Thunder_OnMap</soundCast>
Expand All @@ -175,7 +174,7 @@
<recoilAmount>1.53</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Projectile_FireWand</defaultProjectile>
<defaultProjectile>Projectile_CE_FireWand</defaultProjectile>
<warmupTime>1.5</warmupTime>
<range>32</range>
<burstShotCount>3</burstShotCount>
Expand All @@ -197,12 +196,12 @@
<SwayFactor>0.10</SwayFactor>
<Bulk>0.5</Bulk>
<Mass>1</Mass>
<RangedWeapon_Cooldown>.95</RangedWeapon_Cooldown>
<RangedWeapon_Cooldown>0.95</RangedWeapon_Cooldown>
</statBases>
<Properties>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Projectile_FireWand</defaultProjectile>
<defaultProjectile>Projectile_CE_FireWand</defaultProjectile>
<warmupTime>0.75</warmupTime>
<range>32</range>
<burstShotCount>3</burstShotCount>
Expand All @@ -224,6 +223,13 @@
<xpath>Defs/ThingDef[defName="TM_DefenderStaff" or defName="TM_BlazingPowerStaff"]/verbs/li[verbClass="TorannMagic.Weapon.Verb_BlazingPower"]</xpath>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName= "TM_Ruunbled" or defName="TM_BlazingPowerStaff" or defName="TM_DefenderStaff"]/comps/li[@Class="CompDeflector.CompProperties_Deflector"]/DeflectVerb/defaultProjectile</xpath>
<value>
<defaultProjectile>Projectile_CE_BlazingPower</defaultProjectile>
</value>
</Operation>

<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>TM_DefenderStaff</defName>
<statBases>
Expand All @@ -238,7 +244,7 @@
<recoilAmount>1.53</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Projectile_BlazingPower</defaultProjectile>
<defaultProjectile>Projectile_CE_BlazingPower</defaultProjectile>
<warmupTime>0.5</warmupTime>
<range>40</range>
<soundCast>TM_Woosh</soundCast>
Expand Down Expand Up @@ -267,7 +273,7 @@
<recoilAmount>1.53</recoilAmount>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Projectile_BlazingPower</defaultProjectile>
<defaultProjectile>Projectile_CE_BlazingPower</defaultProjectile>
<warmupTime>1</warmupTime>
<range>40</range>
<soundCast>TM_Woosh</soundCast>
Expand Down
63 changes: 63 additions & 0 deletions ...ech Expansion - Insectoid/Patches/Biotech Expansion - Insectoid/BEI_AbilityDefs_Patch.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>

<Operation Class="PatchOperationReplace">
<xpath>Defs/AbilityDef[defName="BTEIst_VolatileStingLauncher" or defName="BTEIst_ToxicStingLauncher"]/verbProperties/range</xpath>
<value>
<range>28</range>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BTEIst_ToxicSting"]/projectile</xpath>
<value>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>BTEIst_ToxicStab</damageDef>
<speed>120</speed>
<damageAmountBase>5</damageAmountBase>
<armorPenetrationSharp>6</armorPenetrationSharp>
<armorPenetrationBlunt>9</armorPenetrationBlunt>
</projectile>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BTEIst_ToxicStingBuffed"]/projectile</xpath>
<value>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>BTEIst_ToxicStab</damageDef>
<speed>120</speed>
<damageAmountBase>10</damageAmountBase>
<armorPenetrationSharp>9</armorPenetrationSharp>
<armorPenetrationBlunt>12</armorPenetrationBlunt>
</projectile>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BTEIst_VolatileSting"]/projectile</xpath>
<value>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>BTEIst_VolatileStab</damageDef>
<speed>120</speed>
<damageAmountBase>1</damageAmountBase>
<armorPenetrationSharp>12</armorPenetrationSharp>
<armorPenetrationBlunt>18</armorPenetrationBlunt>
</projectile>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="BTEIst_ToxicStingBuffed"]/projectile</xpath>
<value>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>BTEIst_ToxicStab</damageDef>
<speed>120</speed>
<damageAmountBase>2</damageAmountBase>
<armorPenetrationSharp>12</armorPenetrationSharp>
<armorPenetrationBlunt>18</armorPenetrationBlunt>
</projectile>
</value>
</Operation>

</Patch>
45 changes: 45 additions & 0 deletions ...ech Expansion - Insectoid/Patches/Biotech Expansion - Insectoid/BEI_Hediffs_BodyParts.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>

<Operation Class="PatchOperationReplace">
<xpath>Defs/HediffDef[defName="BTEIst_InsectoidClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
<label>claws</label>
<capacities>
<li>Cut</li>
</capacities>
<power>15</power>
<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
<armorPenetrationSharp>0.22</armorPenetrationSharp>
<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
<cooldownTime>1.4</cooldownTime>
<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
</li>
</tools>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/GeneDef[defName="BTEIst_HardenedChitin"]/statOffsets</xpath>
<value>
<statOffsets>
<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
<ArmorRating_Blunt>3.375</ArmorRating_Blunt>
</statOffsets>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/HediffDef[defName="BTEIst_Exogelatin"]/stages/li/statOffsets</xpath>
<value>
<statOffsets>
<ArmorRating_Sharp>2.25</ArmorRating_Sharp>
<ArmorRating_Blunt>3.375</ArmorRating_Blunt>
</statOffsets>
</value>
</Operation>

</Patch>
48 changes: 24 additions & 24 deletions ... Forked Royalty DLC expansion/Patches/EPOE Forked Royalty DLC expansion/Bionics_Patch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<li>Stab</li>
</capacities>
<power>8</power>
<cooldownTime>1.88</cooldownTime>
<armorPenetrationSharp>0.04</armorPenetrationSharp>
<armorPenetrationBlunt>0.32</armorPenetrationBlunt>
<cooldownTime>1.25</cooldownTime>
<armorPenetrationSharp>0.15</armorPenetrationSharp>
<armorPenetrationBlunt>0.72</armorPenetrationBlunt>
<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
<soundMeleeHit>MeleeHit_DrillArm</soundMeleeHit>
<soundMeleeMiss>MeleeMiss_DrillArm</soundMeleeMiss>
Expand Down Expand Up @@ -52,10 +52,10 @@
<capacities>
<li>Scratch</li>
</capacities>
<power>8</power>
<cooldownTime>0.99</cooldownTime>
<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
<armorPenetrationSharp>0.58</armorPenetrationSharp>
<power>9</power>
<cooldownTime>0.74</cooldownTime>
<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
<armorPenetrationSharp>0.34</armorPenetrationSharp>
<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
Expand All @@ -82,10 +82,10 @@
<capacities>
<li>Cut</li>
</capacities>
<power>12</power>
<cooldownTime>1.0</cooldownTime>
<armorPenetrationBlunt>0.4</armorPenetrationBlunt>
<armorPenetrationSharp>0.3</armorPenetrationSharp>
<power>11</power>
<cooldownTime>0.8</cooldownTime>
<armorPenetrationBlunt>0.45</armorPenetrationBlunt>
<armorPenetrationSharp>0.4</armorPenetrationSharp>
<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
Expand All @@ -104,10 +104,10 @@
<capacities>
<li>Stab</li>
</capacities>
<power>15</power>
<power>13</power>
<cooldownTime>1.0</cooldownTime>
<armorPenetrationBlunt>0.75</armorPenetrationBlunt>
<armorPenetrationSharp>1.0</armorPenetrationSharp>
<armorPenetrationBlunt>1.125</armorPenetrationBlunt>
<armorPenetrationSharp>1.13</armorPenetrationSharp>
<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
Expand All @@ -127,9 +127,9 @@
<li>Scratch</li>
</capacities>
<power>9</power>
<cooldownTime>1.05</cooldownTime>
<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
<armorPenetrationSharp>0.36</armorPenetrationSharp>
<cooldownTime>0.74</cooldownTime>
<armorPenetrationBlunt>0.338</armorPenetrationBlunt>
<armorPenetrationSharp>0.68</armorPenetrationSharp>
<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
<soundMeleeMiss>MeleeMiss_BionicSlash</soundMeleeMiss>
Expand All @@ -156,10 +156,10 @@
<capacities>
<li>Cut</li>
</capacities>
<power>10</power>
<cooldownTime>1.1</cooldownTime>
<armorPenetrationBlunt>0.3</armorPenetrationBlunt>
<armorPenetrationSharp>0.25</armorPenetrationSharp>
<power>12</power>
<cooldownTime>0.84</cooldownTime>
<armorPenetrationBlunt>0.563</armorPenetrationBlunt>
<armorPenetrationSharp>0.81</armorPenetrationSharp>
<linkedBodyPartsGroup>Blade</linkedBodyPartsGroup>
<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
Expand All @@ -179,9 +179,9 @@
<li>Stab</li>
</capacities>
<power>15</power>
<cooldownTime>1.1</cooldownTime>
<armorPenetrationBlunt>0.65</armorPenetrationBlunt>
<armorPenetrationSharp>0.75</armorPenetrationSharp>
<cooldownTime>1.05</cooldownTime>
<armorPenetrationBlunt>1.35</armorPenetrationBlunt>
<armorPenetrationSharp>1.93</armorPenetrationSharp>
<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
<soundMeleeHit>MeleeHit_BionicSlash</soundMeleeHit>
Expand Down
Loading

0 comments on commit 2bd98a2

Please sign in to comment.