From 76bfc6710134f4e3e965bfb94e8443e51b728ac4 Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Thu, 1 Sep 2022 00:16:06 +0900
Subject: [PATCH] =?UTF-8?q?ContDamPN=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.3/Assemblies/0_Assemblies_from.txt          |   3 +-
 1.3/Assemblies/ContDamPN.dll                  | Bin 0 -> 7168 bytes
 1.3/Defs/HediffDefs/Hediffs_ContDamPN.xml     | 110 +++++++
 .../ThingDef/ThingDef_Weapons_Industrial.xml  |   6 +-
 1.3/Defs/ThingDef/ThingDef_Weapons_Royal.xml  |   6 +-
 Royalty/Defs/Royal_Hediffs_ContDamPN.xml      | 302 ++++++++++++++++++
 Royalty/Defs/Royal_ThingDef_Weapon.xml        |  20 +-
 7 files changed, 430 insertions(+), 17 deletions(-)
 create mode 100644 1.3/Assemblies/ContDamPN.dll
 create mode 100644 1.3/Defs/HediffDefs/Hediffs_ContDamPN.xml
 create mode 100644 Royalty/Defs/Royal_Hediffs_ContDamPN.xml

diff --git a/1.3/Assemblies/0_Assemblies_from.txt b/1.3/Assemblies/0_Assemblies_from.txt
index e8349dc..637d085 100644
--- a/1.3/Assemblies/0_Assemblies_from.txt
+++ b/1.3/Assemblies/0_Assemblies_from.txt
@@ -19,4 +19,5 @@ AutomataWearSetting.dll
 
 [Roo] (Anty Race modder : https://steamcommunity.com/sharedfiles/filedetails/?id=2297729625)
 
-TorgueAnty.dll
\ No newline at end of file
+TorgueAnty.dll
+ContDamPN.dll
\ No newline at end of file
diff --git a/1.3/Assemblies/ContDamPN.dll b/1.3/Assemblies/ContDamPN.dll
new file mode 100644
index 0000000000000000000000000000000000000000..54b7dc07e82888f6ce92e43798da1b7cd9081dd9
GIT binary patch
literal 7168
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
X^f=V`*_6sHh3`EP*KdRPjbz|giE1j*

literal 0
HcmV?d00001

diff --git a/1.3/Defs/HediffDefs/Hediffs_ContDamPN.xml b/1.3/Defs/HediffDefs/Hediffs_ContDamPN.xml
new file mode 100644
index 0000000..37cf49c
--- /dev/null
+++ b/1.3/Defs/HediffDefs/Hediffs_ContDamPN.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <ManeuverDef>
+    <defName>PN_ChainCutManeuver</defName>
+    <requiredCapacity>PN_ChainCutTool</requiredCapacity>
+    <verb>
+      <verbClass>Verb_MeleeAttackDamage</verbClass>
+      <meleeDamageDef>PN_ChainCutDamage</meleeDamageDef>
+    </verb>
+    <logEntryDef>MeleeAttack</logEntryDef>
+    <combatLogRulesHit>Maneuver_Slash_MeleeHit</combatLogRulesHit>
+    <combatLogRulesDeflect>Maneuver_Slash_MeleeDeflect</combatLogRulesDeflect>
+    <combatLogRulesMiss>Maneuver_Slash_MeleeMiss</combatLogRulesMiss>
+    <combatLogRulesDodge>Maneuver_Slash_MeleeDodge</combatLogRulesDodge>
+  </ManeuverDef>
+
+  <ToolCapacityDef>
+    <defName>PN_ChainCutTool</defName>
+    <label>chainsword cut</label>
+  </ToolCapacityDef>
+
+  <DamageDef ParentName="CutBase">
+    <defName>PN_ChainCutDamage</defName>
+    <hediff>PN_ChainCutHediff</hediff>
+    <hediffSkin>PN_ChainCutHediff</hediffSkin>
+    <hediffSolid>PN_ChainCrackHediff</hediffSolid>
+    <cutCleaveBonus>1.4</cutCleaveBonus>
+    <workerClass>DamageWorker_AddInjury</workerClass>
+    <armorCategory>Sharp</armorCategory>
+    <impactSoundType>Slice</impactSoundType>
+  </DamageDef>
+
+  <HediffDef ParentName="InjuryBase">
+    <defName>PN_ChainCutHediff</defName>
+    <label>cut</label>
+    <labelNoun>a cut</labelNoun>
+    <description>a cut.</description>
+    <comps>
+      <li Class="HediffCompProperties_TendDuration">
+        <labelTendedWell>bandaged</labelTendedWell>
+        <labelTendedWellInner>sutured</labelTendedWellInner>
+        <labelSolidTendedWell>set</labelSolidTendedWell>
+      </li>
+      <li Class="HediffCompProperties_Infecter">
+        <infectionChance>0.15</infectionChance>
+      </li>
+      <li Class="HediffCompProperties_GetsPermanent">
+        <permanentLabel>cut scar</permanentLabel>
+      </li>
+      <li Class="ContDamYuran.HediffCompProperties_ContinuousDamage">
+        <damageDef>PN_ChainCutDamage_Con</damageDef>
+        <ticksPerDamage>6</ticksPerDamage>
+        <damageAmount>2</damageAmount>
+        <endTicks>18</endTicks>
+      </li>
+    </comps>
+    <injuryProps>
+      <painPerSeverity>0.0125</painPerSeverity>
+      <averagePainPerSeverityPermanent>0.00625</averagePainPerSeverityPermanent>
+      <bleedRate>0.06</bleedRate>
+      <canMerge>false</canMerge>
+      <destroyedLabel>Cut off</destroyedLabel>
+      <destroyedOutLabel>Cut off</destroyedOutLabel>
+    </injuryProps>
+  </HediffDef>
+
+  <DamageDef ParentName="CutBase">
+    <defName>PN_ChainCutDamage_Con</defName>
+    <cutCleaveBonus>1.4</cutCleaveBonus>
+    <workerClass>DamageWorker_AddInjury</workerClass>
+    <armorCategory>Sharp</armorCategory>
+    <impactSoundType>Slice</impactSoundType>
+  </DamageDef>
+
+  <HediffDef ParentName="InjuryBase">
+    <defName>PN_ChainCrackHediff</defName>
+    <label>crack</label>
+    <labelNoun>a crack wound</labelNoun>
+    <description>A crack.</description>
+    <comps>
+      <li Class="HediffCompProperties_TendDuration">
+        <labelTendedWell>set</labelTendedWell>
+        <labelTendedWellInner>set</labelTendedWellInner>
+        <labelSolidTendedWell>set</labelSolidTendedWell>
+      </li>
+      <li Class="HediffCompProperties_GetsPermanent">
+        <permanentLabel>permanent crack</permanentLabel>
+      </li>
+      <li Class="ContDamYuran.HediffCompProperties_ContinuousDamage">
+        <damageDef>PN_ChainCrackDamage_Con</damageDef>
+        <ticksPerDamage>6</ticksPerDamage>
+        <damageAmount>1</damageAmount>
+        <endTicks>12</endTicks>
+      </li>
+    </comps>
+    <injuryProps>
+      <painPerSeverity>0.01</painPerSeverity>
+      <averagePainPerSeverityPermanent>0.00625</averagePainPerSeverityPermanent>
+      <destroyedLabel>Shattered</destroyedLabel>
+    </injuryProps>
+  </HediffDef>
+
+  <DamageDef ParentName="CutBase">
+    <defName>PN_ChainCrackDamage_Con</defName>
+    <cutCleaveBonus>1.4</cutCleaveBonus>
+    <workerClass>DamageWorker_AddInjury</workerClass>
+    <armorCategory>Sharp</armorCategory>
+    <impactSoundType>Slice</impactSoundType>
+  </DamageDef>
+</Defs>
\ No newline at end of file
diff --git a/1.3/Defs/ThingDef/ThingDef_Weapons_Industrial.xml b/1.3/Defs/ThingDef/ThingDef_Weapons_Industrial.xml
index e7716fb..ce5db80 100644
--- a/1.3/Defs/ThingDef/ThingDef_Weapons_Industrial.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Weapons_Industrial.xml
@@ -286,15 +286,15 @@
         <capacities>
           <li>Stab</li>
         </capacities>
-        <power>18</power>
+        <power>16</power>
         <cooldownTime>2</cooldownTime>
       </li>
       <li>
         <label>edge</label>
         <capacities>
-          <li>Cut</li>
+          <li>PN_ChainCutTool</li>
         </capacities>
-        <power>18</power>
+        <power>16</power>
         <cooldownTime>2</cooldownTime>
       </li>
     </tools>
diff --git a/1.3/Defs/ThingDef/ThingDef_Weapons_Royal.xml b/1.3/Defs/ThingDef/ThingDef_Weapons_Royal.xml
index 38ec298..45c5bb7 100644
--- a/1.3/Defs/ThingDef/ThingDef_Weapons_Royal.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Weapons_Royal.xml
@@ -42,15 +42,15 @@
         <capacities>
           <li>Stab</li>
         </capacities>
-        <power>24</power>
+        <power>23</power>
         <cooldownTime>2.4</cooldownTime>
       </li>
       <li>
         <label>edge</label>
         <capacities>
-          <li>Cut</li>
+          <li>PN_ChainCutTool</li>
         </capacities>
-        <power>24</power>
+        <power>23</power>
         <cooldownTime>2.4</cooldownTime>
       </li>
     </tools>
diff --git a/Royalty/Defs/Royal_Hediffs_ContDamPN.xml b/Royalty/Defs/Royal_Hediffs_ContDamPN.xml
new file mode 100644
index 0000000..b714460
--- /dev/null
+++ b/Royalty/Defs/Royal_Hediffs_ContDamPN.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+  <!--blooded chain sword-->
+  <ManeuverDef>
+    <defName>PN_ChainCutManeuverMono</defName>
+    <requiredCapacity>PN_ChainCutToolMono</requiredCapacity>
+    <verb>
+      <verbClass>Verb_MeleeAttackDamage</verbClass>
+      <meleeDamageDef>PN_ChainCutDamageMono</meleeDamageDef>
+    </verb>
+    <logEntryDef>MeleeAttack</logEntryDef>
+    <combatLogRulesHit>Maneuver_Slash_MeleeHit</combatLogRulesHit>
+    <combatLogRulesDeflect>Maneuver_Slash_MeleeDeflect</combatLogRulesDeflect>
+    <combatLogRulesMiss>Maneuver_Slash_MeleeMiss</combatLogRulesMiss>
+    <combatLogRulesDodge>Maneuver_Slash_MeleeDodge</combatLogRulesDodge>
+  </ManeuverDef>
+
+  <ToolCapacityDef>
+    <defName>PN_ChainCutToolMono</defName>
+    <label>chainsword cut</label>
+  </ToolCapacityDef>
+
+  <DamageDef ParentName="CutBase">
+    <defName>PN_ChainCutDamageMono</defName>
+    <hediff>PN_ChainCutHediffMono</hediff>
+    <hediffSkin>PN_ChainCutHediffMono</hediffSkin>
+    <hediffSolid>PN_ChainCrackHediffMono</hediffSolid>
+    <cutCleaveBonus>1.4</cutCleaveBonus>
+    <workerClass>DamageWorker_AddInjury</workerClass>
+    <armorCategory>Sharp</armorCategory>
+    <impactSoundType>Slice</impactSoundType>
+  </DamageDef>
+
+  <HediffDef ParentName="InjuryBase">
+    <defName>PN_ChainCutHediffMono</defName>
+    <label>cut</label>
+    <labelNoun>a cut</labelNoun>
+    <description>a cut.</description>
+    <comps>
+      <li Class="HediffCompProperties_TendDuration">
+        <labelTendedWell>bandaged</labelTendedWell>
+        <labelTendedWellInner>sutured</labelTendedWellInner>
+        <labelSolidTendedWell>set</labelSolidTendedWell>
+      </li>
+      <li Class="HediffCompProperties_Infecter">
+        <infectionChance>0.15</infectionChance>
+      </li>
+      <li Class="HediffCompProperties_GetsPermanent">
+        <permanentLabel>cut scar</permanentLabel>
+      </li>
+      <li Class="ContDamYuran.HediffCompProperties_ContinuousDamage">
+        <damageDef>PN_ChainCutDamage_ConMono</damageDef>
+        <ticksPerDamage>6</ticksPerDamage>
+        <damageAmount>4</damageAmount>
+        <endTicks>18</endTicks>
+      </li>
+    </comps>
+    <injuryProps>
+      <painPerSeverity>0.0125</painPerSeverity>
+      <averagePainPerSeverityPermanent>0.00625</averagePainPerSeverityPermanent>
+      <bleedRate>0.06</bleedRate>
+      <canMerge>false</canMerge>
+      <destroyedLabel>Cut off</destroyedLabel>
+      <destroyedOutLabel>Cut off</destroyedOutLabel>
+    </injuryProps>
+  </HediffDef>
+
+  <DamageDef ParentName="CutBase">
+    <defName>PN_ChainCutDamage_ConMono</defName>
+    <cutCleaveBonus>1.4</cutCleaveBonus>
+    <workerClass>DamageWorker_AddInjury</workerClass>
+    <armorCategory>Sharp</armorCategory>
+    <impactSoundType>Slice</impactSoundType>
+  </DamageDef>
+
+  <HediffDef ParentName="InjuryBase">
+    <defName>PN_ChainCrackHediffMono</defName>
+    <label>crack</label>
+    <labelNoun>a crack wound</labelNoun>
+    <description>A crack.</description>
+    <comps>
+      <li Class="HediffCompProperties_TendDuration">
+        <labelTendedWell>set</labelTendedWell>
+        <labelTendedWellInner>set</labelTendedWellInner>
+        <labelSolidTendedWell>set</labelSolidTendedWell>
+      </li>
+      <li Class="HediffCompProperties_GetsPermanent">
+        <permanentLabel>permanent crack</permanentLabel>
+      </li>
+      <li Class="ContDamYuran.HediffCompProperties_ContinuousDamage">
+        <damageDef>PN_ChainCrackDamage_ConMono</damageDef>
+        <ticksPerDamage>6</ticksPerDamage>
+        <damageAmount>2</damageAmount>
+        <endTicks>12</endTicks>
+      </li>
+    </comps>
+    <injuryProps>
+      <painPerSeverity>0.01</painPerSeverity>
+      <averagePainPerSeverityPermanent>0.00625</averagePainPerSeverityPermanent>
+      <destroyedLabel>Shattered</destroyedLabel>
+    </injuryProps>
+  </HediffDef>
+
+  <DamageDef ParentName="CutBase">
+    <defName>PN_ChainCrackDamage_ConMono</defName>
+    <cutCleaveBonus>1.4</cutCleaveBonus>
+    <workerClass>DamageWorker_AddInjury</workerClass>
+    <armorCategory>Sharp</armorCategory>
+    <impactSoundType>Slice</impactSoundType>
+  </DamageDef>
+
+  <!--electrical blunt-->
+
+  <ManeuverDef>
+    <defName>PN_ElectricalBluntManeuver</defName>
+    <requiredCapacity>PN_ElectricalBluntTool</requiredCapacity>
+    <verb>
+      <verbClass>Verb_MeleeAttackDamage</verbClass>
+      <meleeDamageDef>PN_ElectricalBluntDamage</meleeDamageDef>
+    </verb>
+    <logEntryDef>MeleeAttack</logEntryDef>
+    <combatLogRulesHit>Maneuver_Smash_MeleeHit</combatLogRulesHit>
+    <combatLogRulesDeflect>Maneuver_Smash_MeleeDeflect</combatLogRulesDeflect>
+    <combatLogRulesMiss>Maneuver_Smash_MeleeMiss</combatLogRulesMiss>
+    <combatLogRulesDodge>Maneuver_Smash_MeleeDodge</combatLogRulesDodge>
+  </ManeuverDef>
+
+  <ToolCapacityDef>
+    <defName>PN_ElectricalBluntTool</defName>
+    <label>electrical blunt</label>
+  </ToolCapacityDef>
+
+  <DamageDef ParentName="BluntBase">
+    <defName>PN_ElectricalBluntDamage</defName>
+    <hediff>PN_ElectricalCrushHediff</hediff>
+    <hediffSkin>PN_ElectricalBruiseHediff</hediffSkin>
+    <hediffSolid>Crack</hediffSolid>
+  </DamageDef>
+
+  <HediffDef ParentName="InjuryBase">
+    <defName>PN_ElectricalCrushHediff</defName>
+    <label>crush</label>
+    <labelNoun>a crush wound</labelNoun>
+    <description>A crushing wound.</description>
+    <comps>
+      <li Class="HediffCompProperties_TendDuration">
+        <labelTendedWell>bandaged</labelTendedWell>
+        <labelTendedWellInner>sutured</labelTendedWellInner>
+        <labelSolidTendedWell>set</labelSolidTendedWell>
+      </li>
+      <li Class="HediffCompProperties_Infecter">
+        <infectionChance>0.15</infectionChance>
+      </li>
+      <li Class="HediffCompProperties_GetsPermanent">
+        <permanentLabel>mangled scar</permanentLabel>
+      </li>
+      <li Class="ContDamYuran.HediffCompProperties_ContinuousDamage">
+        <damageDef>PN_ElectricalBurnDamage_Con</damageDef>
+        <ticksPerDamage>6</ticksPerDamage>
+        <damageAmount>4</damageAmount>
+        <endTicks>18</endTicks>
+      </li>
+    </comps>
+    <injuryProps>
+      <painPerSeverity>0.0125</painPerSeverity>
+      <averagePainPerSeverityPermanent>0.00625</averagePainPerSeverityPermanent>
+      <bleedRate>0.01</bleedRate>
+      <canMerge>true</canMerge>
+      <destroyedLabel>Crushed</destroyedLabel>
+    </injuryProps>
+  </HediffDef>
+
+  <HediffDef ParentName="InjuryBase">
+    <defName>PN_ElectricalBruiseHediff</defName>
+    <label>bruise</label>
+    <labelNoun>a bruise</labelNoun>
+    <description>A bruise.</description>
+    <comps>
+      <li Class="HediffCompProperties_TendDuration">
+        <labelTendedWell>bandaged</labelTendedWell>
+        <labelTendedWellInner>tended</labelTendedWellInner>
+        <labelSolidTendedWell>set</labelSolidTendedWell>
+      </li>
+      <li Class="ContDamYuran.HediffCompProperties_ContinuousDamage">
+        <damageDef>PN_ElectricalBurnDamage_Con</damageDef>
+        <ticksPerDamage>6</ticksPerDamage>
+        <damageAmount>4</damageAmount>
+        <endTicks>18</endTicks>
+      </li>
+    </comps>
+    <injuryProps>
+      <painPerSeverity>0.0125</painPerSeverity>
+      <averagePainPerSeverityPermanent>0.00625</averagePainPerSeverityPermanent>
+      <canMerge>false</canMerge>
+      <destroyedLabel>Destroyed</destroyedLabel>
+    </injuryProps>
+  </HediffDef>
+
+  <DamageDef ParentName="Flame">
+    <defName>PN_ElectricalBurnDamage_Con</defName>
+    <label>electrical burn</label>
+    <workerClass>DamageWorker_AddInjury</workerClass>
+    <hediff>PN_ElectricalBurn</hediff>
+  </DamageDef>
+
+  <HediffDef ParentName="InjuryBase">
+    <defName>PN_ElectricalBurn</defName>
+    <label>electrical burn</label>
+    <labelNoun>a electrical burn</labelNoun>
+    <description>A electrical burn.</description>
+    <comps>
+      <li Class="HediffCompProperties_TendDuration">
+        <labelTendedWell>bandaged</labelTendedWell>
+        <labelTendedWellInner>tended</labelTendedWellInner>
+        <labelSolidTendedWell>tended</labelSolidTendedWell>
+      </li>
+      <li Class="HediffCompProperties_Infecter">
+        <infectionChance>0.30</infectionChance>
+      </li>
+      <li Class="HediffCompProperties_GetsPermanent">
+        <permanentLabel>burn scar</permanentLabel>
+      </li>
+    </comps>
+    <injuryProps>
+      <painPerSeverity>0.01875</painPerSeverity>
+      <averagePainPerSeverityPermanent>0.00625</averagePainPerSeverityPermanent>
+      <canMerge>false</canMerge>
+      <destroyedLabel>Burned off</destroyedLabel>
+      <destroyedOutLabel>Burned out</destroyedOutLabel>
+    </injuryProps>
+  </HediffDef>
+
+  <!--electrical Stab-->
+
+  <ManeuverDef>
+    <defName>PN_ElectricalStabManeuver</defName>
+    <requiredCapacity>PN_ElectricalStabTool</requiredCapacity>
+    <verb>
+      <verbClass>Verb_MeleeAttackDamage</verbClass>
+      <meleeDamageDef>PN_ElectricalStabDamage</meleeDamageDef>
+    </verb>
+    <logEntryDef>MeleeAttack</logEntryDef>
+    <combatLogRulesHit>Maneuver_Slash_MeleeHit</combatLogRulesHit>
+    <combatLogRulesDeflect>Maneuver_Slash_MeleeDeflect</combatLogRulesDeflect>
+    <combatLogRulesMiss>Maneuver_Slash_MeleeMiss</combatLogRulesMiss>
+    <combatLogRulesDodge>Maneuver_Slash_MeleeDodge</combatLogRulesDodge>
+  </ManeuverDef>
+
+  <ToolCapacityDef>
+    <defName>PN_ElectricalStabTool</defName>
+    <label>electrical stab</label>
+  </ToolCapacityDef>
+
+  <DamageDef>
+    <defName>PN_ElectricalStabDamage</defName>
+    <label>stab</label>
+    <workerClass>DamageWorker_Stab</workerClass>
+    <externalViolence>true</externalViolence>
+    <deathMessage>{0} has been stabbed to death.</deathMessage>
+    <hediff>PN_ElectricalStabHediff</hediff>
+    <hediffSolid>Crack</hediffSolid>
+    <impactSoundType>Slice</impactSoundType>
+    <armorCategory>Sharp</armorCategory>
+    <stabChanceOfForcedInternal>0.6</stabChanceOfForcedInternal>
+    <overkillPctToDestroyPart>0.4~1.0</overkillPctToDestroyPart>
+  </DamageDef>
+
+  <HediffDef ParentName="InjuryBase">
+    <defName>PN_ElectricalStabHediff</defName>
+    <label>stab</label>
+    <labelNoun>a stab wound</labelNoun>
+    <description>A stab wound.</description>
+    <comps>
+      <li Class="HediffCompProperties_TendDuration">
+        <labelTendedWell>bandaged</labelTendedWell>
+        <labelTendedWellInner>sutured</labelTendedWellInner>
+        <labelSolidTendedWell>set</labelSolidTendedWell>
+      </li>
+      <li Class="HediffCompProperties_Infecter">
+        <infectionChance>0.15</infectionChance>
+      </li>
+      <li Class="HediffCompProperties_GetsPermanent">
+        <permanentLabel>stab scar</permanentLabel>
+      </li>
+      <li Class="ContDamYuran.HediffCompProperties_ContinuousDamage">
+        <damageDef>PN_ElectricalBurnDamage_Con</damageDef>
+        <ticksPerDamage>6</ticksPerDamage>
+        <damageAmount>4</damageAmount>
+        <endTicks>12</endTicks>
+      </li>
+    </comps>
+    <injuryProps>
+      <painPerSeverity>0.0125</painPerSeverity>
+      <averagePainPerSeverityPermanent>0.00625</averagePainPerSeverityPermanent>
+      <bleedRate>0.06</bleedRate>
+      <canMerge>false</canMerge>
+      <destroyedLabel>Cut off</destroyedLabel>
+      <destroyedOutLabel>Cut out</destroyedOutLabel>
+    </injuryProps>
+  </HediffDef>
+</Defs>
\ No newline at end of file
diff --git a/Royalty/Defs/Royal_ThingDef_Weapon.xml b/Royalty/Defs/Royal_ThingDef_Weapon.xml
index 0e33ada..9295e48 100644
--- a/Royalty/Defs/Royal_ThingDef_Weapon.xml
+++ b/Royalty/Defs/Royal_ThingDef_Weapon.xml
@@ -191,16 +191,16 @@
         <capacities>
           <li>Stab</li>
         </capacities>
-        <power>28</power>
+        <power>27</power>
         <cooldownTime>1.6</cooldownTime>
         <armorPenetration>0.9</armorPenetration>
       </li>
       <li>
         <label>edge</label>
         <capacities>
-          <li>Cut</li>
+          <li>PN_ChainCutToolMono</li>
         </capacities>
-        <power>28</power>
+        <power>27</power>
         <cooldownTime>1.6</cooldownTime>
         <armorPenetration>0.9</armorPenetration>
       </li>
@@ -216,7 +216,7 @@
 
   <ThingDef ParentName="PN_BaseWeapon_Bladelink">
     <defName>PN_RoyalHammer_Bladelink</defName>
-    <label>PnL royal Hammer</label>
+    <label>PnL storm Hammer</label>
     <description>...</description>
     <statBases>
       <MarketValue>3000</MarketValue>
@@ -270,9 +270,9 @@
         <label>head</label>
         <labelUsedInLogging>false</labelUsedInLogging>
         <capacities>
-          <li>Blunt</li>
+          <li>PN_ElectricalBluntTool</li>
         </capacities>
-        <power>32</power>
+        <power>31</power>
         <cooldownTime>2.2</cooldownTime>
         <extraMeleeDamages>
           <li>
@@ -343,9 +343,9 @@
         <label>side</label>
         <labelUsedInLogging>false</labelUsedInLogging>
         <capacities>
-          <li>Blunt</li>
+          <li>PN_ElectricalBluntTool</li>
         </capacities>
-        <power>32</power>
+        <power>31</power>
         <cooldownTime>2.2</cooldownTime>
         <armorPenetration>0.9</armorPenetration>
         <extraMeleeDamages>
@@ -358,9 +358,9 @@
       <li>
         <label>point</label>
         <capacities>
-          <li>Stab</li>
+          <li>PN_ElectricalStabTool</li>
         </capacities>
-        <power>32</power>
+        <power>31</power>
         <cooldownTime>2.2</cooldownTime>
         <armorPenetration>0.9</armorPenetration>
         <extraMeleeDamages>