From 28ea24937c4c6608fab7d25f1a72e85fc4ffe663 Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Fri, 20 Jun 2025 10:32:44 +0800
Subject: [PATCH] =?UTF-8?q?"=E9=87=8D=E6=9E=84=E6=AD=A6=E5=99=A8Bladelink?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=AE=9A=E4=B9=89=E5=B9=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=B1=9E=E6=80=A7=E9=85=8D=E7=BD=AE"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ThingDefs/DRM_WeaponBladelink_royal.xml   | 73 ++++++++++++++-----
 .../ThingDefs/DRM_WeaponBladelink_royal.xml   | 73 ++++++++++++++-----
 2 files changed, 112 insertions(+), 34 deletions(-)

diff --git a/1.5/Royal1.5/Defs/ThingDefs/DRM_WeaponBladelink_royal.xml b/1.5/Royal1.5/Defs/ThingDefs/DRM_WeaponBladelink_royal.xml
index 727d338..5ed94e7 100644
--- a/1.5/Royal1.5/Defs/ThingDefs/DRM_WeaponBladelink_royal.xml
+++ b/1.5/Royal1.5/Defs/ThingDefs/DRM_WeaponBladelink_royal.xml
@@ -1,7 +1,53 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-    <ThingDef ParentName="BaseWeapon_Bladelink">
+    <ThingDef Name="DRM_BaseWeapon_Bladelink" ParentName="BaseWeapon" Abstract="True">
+        <techLevel>Ultra</techLevel>
+        <tradeNeverStack>true</tradeNeverStack>
+        <relicChance>3</relicChance>
+        <weaponTags>
+            <li>Bladelink</li>
+        </weaponTags>
+        <tradeTags>
+            <li>WeaponMelee</li>
+        </tradeTags>
+        <weaponClasses>
+            <li>Ultratech</li>
+        </weaponClasses>
+        <comps>
+            <li>
+                <compClass>CompQuality</compClass>
+            </li>
+            <li Class="CompProperties_BladelinkWeapon">
+                <biocodeOnEquip>true</biocodeOnEquip>
+            </li>
+            <li Class="CompProperties_GeneratedName">
+                <nameMaker>NamerWeaponBladelink</nameMaker>
+            </li>
+        </comps>
+        <smeltable>true</smeltable>
+        <burnableByRecipe>true</burnableByRecipe>
+        <notifyMapRemoved>true</notifyMapRemoved>
+        <thingCategories>
+            <li>WeaponsMeleeBladelink</li>
+        </thingCategories>
+        <thingSetMakerTags>
+            <li>WeaponBladelink</li>
+        </thingSetMakerTags>
+        <recipeMaker>
+            <defaultIngredientFilter>
+                <categories>
+                    <li>Root</li>
+                </categories>
+                <disallowedThingDefs>
+                    <li>Silver</li>
+                    <li>Gold</li>
+                </disallowedThingDefs>
+            </defaultIngredientFilter>
+        </recipeMaker>
+    </ThingDef>
+
+    <ThingDef ParentName="DRM_BaseWeapon_Bladelink">
         <defName>DR_BattleHammerBladelink</defName>
         <label>persona battle hammer</label>
         <description>A warhammer with an embedded EMP capacitor.  Upon impact, it releases an electric pulse to disable mechanical systems and unleashes chain lightning on nearby enemies. Its connection to Intelligence enhances the weapon, temporarily boosting the wielder's capabilities with each strike.
@@ -74,16 +120,14 @@
                 <hitHediff>DRM_AwakenHeart</hitHediff>
                 <hitHediffSeverity>0.5</hitHediffSeverity>
             </li>
-            <li Class="CompProperties_Art">
-                <nameMaker>NamerArtWeaponMelee</nameMaker>
-                <descriptionMaker>ArtDescription_WeaponMelee</descriptionMaker>
-                <minQualityForArtistic>Excellent</minQualityForArtistic>
-            </li>
         </comps>
+        <costStuffCount>400</costStuffCount>
+        <stuffCategories>
+            <li>Metallic</li>
+        </stuffCategories>
         <costList>
             <AIPersonaCore>1</AIPersonaCore>
             <WoolDragonian>400</WoolDragonian>
-            <Steel>400</Steel>
             <ComponentSpacer>5</ComponentSpacer>
         </costList>
         <recipeMaker>
@@ -103,7 +147,7 @@
         </recipeMaker>
     </ThingDef>
 
-    <ThingDef ParentName="BaseWeapon_Bladelink">
+    <ThingDef ParentName="DRM_BaseWeapon_Bladelink">
         <defName>DR_BattleHammerBladelink_Ex</defName>
         <label>persona Explosive battle hammer</label>
         <description>A warhammer with an embedded EMP capacitor.  Upon impact, it releases explosive slime on nearby enemies. Its connection to Intelligence enhances the weapon, temporarily boosting the wielder's capabilities with each strike.
@@ -159,9 +203,6 @@
             </li>
         </tools>
         <comps>
-            <li>
-                <compClass>CompQuality</compClass>
-            </li>
             <li Class="DragonianMix.CompPropertiesScarletSickle_Data">
                 <sputteringRange>3</sputteringRange>
                 <sputteringNumber>5</sputteringNumber>
@@ -170,16 +211,14 @@
                 <hitHediff>DRM_AwakenHeart</hitHediff>
                 <hitHediffSeverity>0.5</hitHediffSeverity>
             </li>
-            <li Class="CompProperties_Art">
-                <nameMaker>NamerArtWeaponMelee</nameMaker>
-                <descriptionMaker>ArtDescription_WeaponMelee</descriptionMaker>
-                <minQualityForArtistic>Excellent</minQualityForArtistic>
-            </li>
         </comps>
+        <costStuffCount>400</costStuffCount>
+        <stuffCategories>
+            <li>Metallic</li>
+        </stuffCategories>
         <costList>
             <AIPersonaCore>1</AIPersonaCore>
             <WoolDragonian>400</WoolDragonian>
-            <Steel>400</Steel>
             <ComponentSpacer>5</ComponentSpacer>
         </costList>
         <recipeMaker>
diff --git a/1.6/Royal1.6/Defs/ThingDefs/DRM_WeaponBladelink_royal.xml b/1.6/Royal1.6/Defs/ThingDefs/DRM_WeaponBladelink_royal.xml
index 727d338..5ed94e7 100644
--- a/1.6/Royal1.6/Defs/ThingDefs/DRM_WeaponBladelink_royal.xml
+++ b/1.6/Royal1.6/Defs/ThingDefs/DRM_WeaponBladelink_royal.xml
@@ -1,7 +1,53 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-    <ThingDef ParentName="BaseWeapon_Bladelink">
+    <ThingDef Name="DRM_BaseWeapon_Bladelink" ParentName="BaseWeapon" Abstract="True">
+        <techLevel>Ultra</techLevel>
+        <tradeNeverStack>true</tradeNeverStack>
+        <relicChance>3</relicChance>
+        <weaponTags>
+            <li>Bladelink</li>
+        </weaponTags>
+        <tradeTags>
+            <li>WeaponMelee</li>
+        </tradeTags>
+        <weaponClasses>
+            <li>Ultratech</li>
+        </weaponClasses>
+        <comps>
+            <li>
+                <compClass>CompQuality</compClass>
+            </li>
+            <li Class="CompProperties_BladelinkWeapon">
+                <biocodeOnEquip>true</biocodeOnEquip>
+            </li>
+            <li Class="CompProperties_GeneratedName">
+                <nameMaker>NamerWeaponBladelink</nameMaker>
+            </li>
+        </comps>
+        <smeltable>true</smeltable>
+        <burnableByRecipe>true</burnableByRecipe>
+        <notifyMapRemoved>true</notifyMapRemoved>
+        <thingCategories>
+            <li>WeaponsMeleeBladelink</li>
+        </thingCategories>
+        <thingSetMakerTags>
+            <li>WeaponBladelink</li>
+        </thingSetMakerTags>
+        <recipeMaker>
+            <defaultIngredientFilter>
+                <categories>
+                    <li>Root</li>
+                </categories>
+                <disallowedThingDefs>
+                    <li>Silver</li>
+                    <li>Gold</li>
+                </disallowedThingDefs>
+            </defaultIngredientFilter>
+        </recipeMaker>
+    </ThingDef>
+
+    <ThingDef ParentName="DRM_BaseWeapon_Bladelink">
         <defName>DR_BattleHammerBladelink</defName>
         <label>persona battle hammer</label>
         <description>A warhammer with an embedded EMP capacitor.  Upon impact, it releases an electric pulse to disable mechanical systems and unleashes chain lightning on nearby enemies. Its connection to Intelligence enhances the weapon, temporarily boosting the wielder's capabilities with each strike.
@@ -74,16 +120,14 @@
                 <hitHediff>DRM_AwakenHeart</hitHediff>
                 <hitHediffSeverity>0.5</hitHediffSeverity>
             </li>
-            <li Class="CompProperties_Art">
-                <nameMaker>NamerArtWeaponMelee</nameMaker>
-                <descriptionMaker>ArtDescription_WeaponMelee</descriptionMaker>
-                <minQualityForArtistic>Excellent</minQualityForArtistic>
-            </li>
         </comps>
+        <costStuffCount>400</costStuffCount>
+        <stuffCategories>
+            <li>Metallic</li>
+        </stuffCategories>
         <costList>
             <AIPersonaCore>1</AIPersonaCore>
             <WoolDragonian>400</WoolDragonian>
-            <Steel>400</Steel>
             <ComponentSpacer>5</ComponentSpacer>
         </costList>
         <recipeMaker>
@@ -103,7 +147,7 @@
         </recipeMaker>
     </ThingDef>
 
-    <ThingDef ParentName="BaseWeapon_Bladelink">
+    <ThingDef ParentName="DRM_BaseWeapon_Bladelink">
         <defName>DR_BattleHammerBladelink_Ex</defName>
         <label>persona Explosive battle hammer</label>
         <description>A warhammer with an embedded EMP capacitor.  Upon impact, it releases explosive slime on nearby enemies. Its connection to Intelligence enhances the weapon, temporarily boosting the wielder's capabilities with each strike.
@@ -159,9 +203,6 @@
             </li>
         </tools>
         <comps>
-            <li>
-                <compClass>CompQuality</compClass>
-            </li>
             <li Class="DragonianMix.CompPropertiesScarletSickle_Data">
                 <sputteringRange>3</sputteringRange>
                 <sputteringNumber>5</sputteringNumber>
@@ -170,16 +211,14 @@
                 <hitHediff>DRM_AwakenHeart</hitHediff>
                 <hitHediffSeverity>0.5</hitHediffSeverity>
             </li>
-            <li Class="CompProperties_Art">
-                <nameMaker>NamerArtWeaponMelee</nameMaker>
-                <descriptionMaker>ArtDescription_WeaponMelee</descriptionMaker>
-                <minQualityForArtistic>Excellent</minQualityForArtistic>
-            </li>
         </comps>
+        <costStuffCount>400</costStuffCount>
+        <stuffCategories>
+            <li>Metallic</li>
+        </stuffCategories>
         <costList>
             <AIPersonaCore>1</AIPersonaCore>
             <WoolDragonian>400</WoolDragonian>
-            <Steel>400</Steel>
             <ComponentSpacer>5</ComponentSpacer>
         </costList>
         <recipeMaker>