From 2c3f3527f6a104b7bf23e4ee965b24d9e69e47d0 Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Sun, 15 Jun 2025 13:26:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=96=87=E4=BB=B6=E5=92=8Cdl?=
 =?UTF-8?q?c=E7=9A=84=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.5/1.5/Defs/AbilityDefs/DRM_Abilities.xml    | 339 ++++++++++++++++++
 .../Defs/ThingDefs/DRM_Apparel_Packs_ano.xml  | 126 -------
 .../Defs/AbilityDefs/DRM_Abilities_bio.xml    | 217 +----------
 .../Defs/HediffDefs/DRM_Hediffs_bio.xml       |  70 ----
 .../Defs/AbilityDefs/DRM_Abilities_ideo.xml   |  34 --
 .../Defs/AbilityDefs/DRM_Abilities_royal.xml  |  67 ----
 1.6/1.6/Defs/AbilityDefs/DRM_Abilities.xml    | 339 ++++++++++++++++++
 .../Defs/ThingDefs/DRM_Apparel_Packs_ano.xml  | 126 -------
 .../Defs/AbilityDefs/DRM_Abilities_bio.xml    | 217 +----------
 .../Defs/HediffDefs/DRM_Hediffs_bio.xml       |  70 ----
 .../Defs/AbilityDefs/DRM_Abilities_ideo.xml   |  34 --
 .../Defs/AbilityDefs/DRM_Abilities_royal.xml  |  67 ----
 12 files changed, 688 insertions(+), 1018 deletions(-)
 create mode 100644 1.5/1.5/Defs/AbilityDefs/DRM_Abilities.xml
 delete mode 100644 1.5/Ano1.5/Defs/ThingDefs/DRM_Apparel_Packs_ano.xml
 delete mode 100644 1.5/Ideo1.5/Defs/AbilityDefs/DRM_Abilities_ideo.xml
 delete mode 100644 1.5/Royal1.5/Defs/AbilityDefs/DRM_Abilities_royal.xml
 create mode 100644 1.6/1.6/Defs/AbilityDefs/DRM_Abilities.xml
 delete mode 100644 1.6/Ano1.6/Defs/ThingDefs/DRM_Apparel_Packs_ano.xml
 delete mode 100644 1.6/Ideo1.6/Defs/AbilityDefs/DRM_Abilities_ideo.xml
 delete mode 100644 1.6/Royal1.6/Defs/AbilityDefs/DRM_Abilities_royal.xml

diff --git a/1.5/1.5/Defs/AbilityDefs/DRM_Abilities.xml b/1.5/1.5/Defs/AbilityDefs/DRM_Abilities.xml
new file mode 100644
index 0000000..a96ea61
--- /dev/null
+++ b/1.5/1.5/Defs/AbilityDefs/DRM_Abilities.xml
@@ -0,0 +1,339 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+  <AbilityDef Abstract="True" Name="DRM_RoleAuraBuffBase">
+    <jobDef>CastAbilityOnThing</jobDef>
+    <targetRequired>False</targetRequired>
+    <canUseAoeToGetTargets>False</canUseAoeToGetTargets>
+    <stunTargetWhileCasting>True</stunTargetWhileCasting>
+    <showPsycastEffects>False</showPsycastEffects>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <displayGizmoWhileUndrafted>True</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>False</disableGizmoWhileUndrafted>
+    <hotKey>Misc12</hotKey>
+    <warmupStartSound>CombatCommand_Warmup</warmupStartSound>
+    <statBases>
+      <Ability_Duration>1000</Ability_Duration>
+      <Ability_EffectRadius>9.9</Ability_EffectRadius>
+    </statBases>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <warmupTime>0.5</warmupTime>
+      <range>9.9</range>
+      <drawAimPie>False</drawAimPie>
+      <requireLineOfSight>False</requireLineOfSight>
+      <targetParams>
+        <canTargetSelf>true</canTargetSelf>
+        <canTargetPawns>false</canTargetPawns>
+        <canTargetBuildings>false</canTargetBuildings>
+        <canTargetAnimals>false</canTargetAnimals>
+        <canTargetHumans>false</canTargetHumans>
+        <canTargetMechs>false</canTargetMechs>
+      </targetParams>
+    </verbProperties>
+  </AbilityDef>
+
+  <AbilityDef>
+    <defName>DRM_Skip</defName>
+    <label>skip</label>
+    <description>Teleport the target to a desired position not too far from its starting point. Objects which are too large cannot be teleported.</description>
+    <iconPath>UI/Abilities/Skip</iconPath>
+    <showPsycastEffects>False</showPsycastEffects>
+    <cooldownTicksRange>1800</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <label>skip</label>
+      <warmupTime>0.25</warmupTime>
+      <range>30</range>
+      <targetParams>
+        <canTargetSelf>True</canTargetSelf>
+        <canTargetAnimals>True</canTargetAnimals>
+        <canTargetItems>True</canTargetItems>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="CompProperties_AbilityTeleport">
+        <compClass>CompAbilityEffect_Teleport</compClass>
+        <destination>Selected</destination>
+        <requiresLineOfSight>True</requiresLineOfSight>
+        <range>30</range>
+        <clamorType>Ability</clamorType>
+        <clamorRadius>10</clamorRadius>
+        <destClamorType>Ability</destClamorType>
+        <destClamorRadius>10</destClamorRadius>
+        <stunTicks>18~60</stunTicks>
+        <goodwillImpact>-15</goodwillImpact>
+        <applyGoodwillImpactToLodgers>False</applyGoodwillImpactToLodgers>
+      </li>
+    </comps>
+  </AbilityDef>
+
+  <AbilityDef>
+    <defName>DRM_Farskip</defName>
+    <label>farskip</label>
+    <description>Skip the caster, to an ally at a distant location. This can send people far across the planet, but only works if there is a willing ally on the other side to use as a navigation beacon. The skipped people will always appear near a random ally on the target map.</description>
+    <iconPath>UI/Abilities/Farskip</iconPath>
+    <targetWorldCell>True</targetWorldCell>
+    <showGizmoOnWorldView>True</showGizmoOnWorldView>
+    <hostile>false</hostile>
+    <cooldownTicksRange>60000</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <label>farskip</label>
+      <warmupTime>5</warmupTime>
+      <range>0</range>
+      <drawAimPie>False</drawAimPie>
+      <requireLineOfSight>False</requireLineOfSight>
+    </verbProperties>
+    <comps>
+      <li Class="CompProperties_AbilityFarskip">
+        <stunTicks>18~60</stunTicks>
+        <clamorType>Ability</clamorType>
+        <clamorRadius>10</clamorRadius>
+      </li>
+    </comps>
+  </AbilityDef>
+
+  <AbilityDef>
+    <defName>DR_FireBurst</defName>
+    <label>fire burst</label>
+    <description>Overdrive orbs cause explosion and set fire on ground.</description>
+    <jobDef>CastAbilityOnThing</jobDef>
+    <iconPath>UI/Abilities/FireBurst</iconPath>
+    <cooldownTicksRange>60000</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <aiCanUse>true</aiCanUse>
+    <ai_SearchAOEForTargets>true</ai_SearchAOEForTargets>
+    <targetRequired>false</targetRequired>
+    <showCastingProgressBar>true</showCastingProgressBar>
+
+    <displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>true</disableGizmoWhileUndrafted>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <warmupEffecter>Fire_Burst_Warmup</warmupEffecter>
+      <warmupTime>1.5</warmupTime>
+      <requireLineOfSight>false</requireLineOfSight>
+      <range>12</range>
+      <drawAimPie>false</drawAimPie>
+      <targetParams>
+        <canTargetSelf>true</canTargetSelf>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="DragonianMix.CompProperties_AbilityDRM_FireBurst">
+        <radius>12</radius>
+        <damageDef>DRM_Flame</damageDef>
+        <damageAmount>80</damageAmount>
+        <armorPenetration>0</armorPenetration>
+      </li>
+    </comps>
+  </AbilityDef>
+
+  <AbilityDef>
+    <defName>DRM_Feargaspop</defName>
+    <label>FearGas Pop</label>
+    <description>Release a cloud of Feargas.</description>
+    <iconPath>UI/Abilities/Smokepop</iconPath>
+    <cooldownTicksRange>60000</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <aiCanUse>true</aiCanUse>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <label>release Feargas</label>
+      <drawAimPie>true</drawAimPie>
+      <warmupTime>1</warmupTime>
+      <range>24.9</range>
+      <targetParams>
+        <canTargetPawns>False</canTargetPawns>
+        <canTargetLocations>True</canTargetLocations>
+      </targetParams>
+
+    </verbProperties>
+    <comps>
+      <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
+        <damageDef>DRM_Feargas</damageDef>
+        <smokeRadius>9</smokeRadius>
+        <clamorType>Ability</clamorType>
+        <clamorRadius>20</clamorRadius>
+        <postExplosionSpawnThingDef>DRM_FearGasCloud</postExplosionSpawnThingDef>        <!-- ARL_ToxicGasCloud -->
+        <postExplosionSpawnChance>1</postExplosionSpawnChance>
+        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+      </li>
+    </comps>
+  </AbilityDef>
+
+  <AbilityDef>
+    <defName>DRM_LightingStrike</defName>
+    <label>LightingStrike</label>
+    <description>Summon a LightingStrike.</description>
+    <iconPath>UI/Abilities/Flashstorm</iconPath>
+    <cooldownTicksRange>1800</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <aiCanUse>true</aiCanUse>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <label>Summon LightingStrike</label>
+      <drawAimPie>true</drawAimPie>
+      <warmupTime>1</warmupTime>
+      <range>24.9</range>
+      <targetParams>
+        <canTargetPawns>False</canTargetPawns>
+        <canTargetLocations>True</canTargetLocations>
+      </targetParams>
+
+    </verbProperties>
+    <comps>
+      <li Class="DragonianMix.CompProperties_AbilityDRM_LightingStrike">
+        <explosionRadius>4.0</explosionRadius>
+        <damageDef>DRM_Arc</damageDef>
+        <damageAmount>45</damageAmount>
+        <armorPenetration>1.0</armorPenetration>
+      </li>
+    </comps>
+  </AbilityDef>
+
+  <AbilityDef>
+    <defName>DRM_LightningBombardment</defName>
+    <label>LightningStorm</label>
+    <description>Summon a LightningStorm.</description>
+    <iconPath>UI/Abilities/Flashstorm</iconPath>
+    <cooldownTicksRange>60000</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <aiCanUse>true</aiCanUse>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <label>Summon LightningStorm</label>
+      <drawAimPie>true</drawAimPie>
+      <warmupTime>1</warmupTime>
+      <range>29.9</range>
+      <targetParams>
+        <canTargetPawns>False</canTargetPawns>
+        <canTargetLocations>True</canTargetLocations>
+      </targetParams>
+
+    </verbProperties>
+    <comps>
+      <li Class="DragonianMix.CompProperties_AbilityDRM_LightningBombardment">
+        <impactAreaRadius>12</impactAreaRadius>
+        <explosionRadiusRange>3~4</explosionRadiusRange>
+        <bombIntervalTicks>30</bombIntervalTicks>
+        <explosionCount>20</explosionCount>
+
+        <damageDef>DRM_Arc</damageDef>
+        <damageAmount>45</damageAmount>
+        <armorPenetration>1.0</armorPenetration>
+      </li>
+    </comps>
+  </AbilityDef>
+
+  <AbilityDef>
+    <defName>DRM_Acidgaspop</defName>
+    <label>AcidGas Pop</label>
+    <description>Release a cloud of Acidgas.</description>
+    <iconPath>UI/Abilities/Smokepop</iconPath>
+    <cooldownTicksRange>60000</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <aiCanUse>true</aiCanUse>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <label>release Acidgas</label>
+      <drawAimPie>true</drawAimPie>
+      <warmupTime>1</warmupTime>
+      <range>24.9</range>
+      <targetParams>
+        <canTargetPawns>False</canTargetPawns>
+        <canTargetLocations>True</canTargetLocations>
+      </targetParams>
+
+    </verbProperties>
+    <comps>
+      <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
+        <damageDef>DRM_AcidCover</damageDef>
+        <damageAmount>25</damageAmount>
+        <armorPenetration>0.5</armorPenetration>
+        <smokeRadius>9</smokeRadius>
+        <clamorType>Ability</clamorType>
+        <clamorRadius>20</clamorRadius>
+        <postExplosionSpawnThingDef>DRM_AcidGasCloud</postExplosionSpawnThingDef>        <!-- ARL_ToxicGasCloud -->
+        <postExplosionSpawnChance>1</postExplosionSpawnChance>
+        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+      </li>
+    </comps>
+  </AbilityDef>
+
+
+
+  <AbilityDef>
+    <defName>DRM_Frostcloudpop</defName>
+    <label>FrostCloud Pop</label>
+    <description>Release a cloud of Frozen ice.</description>
+    <iconPath>UI/Abilities/Smokepop</iconPath>
+    <cooldownTicksRange>60000</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <aiCanUse>true</aiCanUse>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <label>release FrostCloud</label>
+      <drawAimPie>true</drawAimPie>
+      <warmupTime>1</warmupTime>
+      <range>24.9</range>
+      <targetParams>
+        <canTargetPawns>False</canTargetPawns>
+        <canTargetLocations>True</canTargetLocations>
+      </targetParams>
+
+    </verbProperties>
+    <comps>
+      <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
+        <damageDef>DRM_Damage_FrostCoverd</damageDef>
+        <damageAmount>20</damageAmount>
+        <armorPenetration>0.5</armorPenetration>
+        <smokeRadius>6</smokeRadius>
+        <clamorType>Ability</clamorType>
+        <clamorRadius>20</clamorRadius>
+        <postExplosionSpawnThingDef>DRM_FrostGasCloud_Ex</postExplosionSpawnThingDef>        <!-- ARL_ToxicGasCloud -->
+        <postExplosionSpawnChance>1</postExplosionSpawnChance>
+        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+      </li>
+    </comps>
+  </AbilityDef>
+
+  <AbilityDef ParentName="DRM_RoleAuraBuffBase">
+    <defName>DRM_HealBreakOut</defName>
+    <label>Heal BreakOut</label>
+    <description>Overdrive orbs.Heal wound in insane speed.</description>
+    <iconPath>UI/Abilities/ImmunityDrive</iconPath>
+    <warmupMoteSocialSymbol>UI/Abilities/ImmunityDrive</warmupMoteSocialSymbol>
+    <cooldownTicksRange>60000</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <aiCanUse>false</aiCanUse>
+    <showCastingProgressBar>true</showCastingProgressBar>
+
+    <displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>true</disableGizmoWhileUndrafted>
+    <statBases>
+      <Ability_Duration>150</Ability_Duration>
+      <Ability_EffectRadius>0</Ability_EffectRadius>
+    </statBases>
+    <verbProperties>
+      <range>0</range>
+    </verbProperties>
+    <comps>
+      <li Class="CompProperties_AbilityGiveHediff">
+        <compClass>CompAbilityEffect_GiveHediff</compClass>
+        <hediffDef>DRM_HealBreakOut</hediffDef>
+        <onlyApplyToSelf>True</onlyApplyToSelf>
+        <replaceExisting>true</replaceExisting>
+      </li>
+    </comps>
+  </AbilityDef>
+
+</Defs>
\ No newline at end of file
diff --git a/1.5/Ano1.5/Defs/ThingDefs/DRM_Apparel_Packs_ano.xml b/1.5/Ano1.5/Defs/ThingDefs/DRM_Apparel_Packs_ano.xml
deleted file mode 100644
index d7dbc96..0000000
--- a/1.5/Ano1.5/Defs/ThingDefs/DRM_Apparel_Packs_ano.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-<!--<ThingDef ParentName="ApparelNoQualityBase">
-    <defName>DR_Apparel_PackNecro</defName>
-    <label>Necro pack</label>
-    <description>A reusable backpack containing canisters of reagents and a mechanism that uses them to generate deadlifedust.</description>
-    <graphicData>
-      <texPath>Things/Pawn/Humanlike/Apparel/ToxPack/ToxPack</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>(0.7,0.7)</drawSize>
-    </graphicData>
-    <tickerType>Normal</tickerType>
-    <techLevel>Industrial</techLevel>
-    <statBases>
-      <Mass>3</Mass>
-      <Flammability>0.6</Flammability>
-      <EquipDelay>2</EquipDelay>
-      <WorkToMake>3600</WorkToMake>
-    </statBases>
-    <thingCategories>
-      <li>ApparelUtility</li>
-    </thingCategories>
-    <costList>
-      <Bioferrite>75</Bioferrite>
-      <ComponentIndustrial>1</ComponentIndustrial>
-    </costList>
-    <recipeMaker>
-      <unfinishedThingDef>UnfinishedPack</unfinishedThingDef>
-      <researchPrerequisite>DeadlifeDust</researchPrerequisite>
-      <recipeUsers Inherit="false">
-        <li>BioferriteShaper</li>
-      </recipeUsers>
-      <useIngredientsForColor>false</useIngredientsForColor>
-      <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-      <workSkill>Crafting</workSkill>
-      <effectWorking>Smith</effectWorking>
-      <soundWorking>Recipe_Smith</soundWorking>
-      <skillRequirements>
-        <Crafting>4</Crafting>
-      </skillRequirements>
-      <displayPriority>350</displayPriority>
-    </recipeMaker>
-    <apparel>
-      <countsAsClothingForNudity>false</countsAsClothingForNudity>
-      <scoreOffset>4</scoreOffset>
-      <careIfWornByCorpse>false</careIfWornByCorpse>
-      <careIfDamaged>false</careIfDamaged>
-      <wearPerDay>0</wearPerDay>
-      <tags>
-        <li>BeltDefenseNecro</li>
-      </tags>
-      <bodyPartGroups>
-        <li>Waist</li>
-      </bodyPartGroups>
-      <layers>
-        <li>Belt</li>
-      </layers>
-      <wornGraphicPath>Things/Pawn/Humanlike/Apparel/ToxPack/ToxPack</wornGraphicPath>
-      <wornGraphicData>
-        <renderUtilityAsPack>true</renderUtilityAsPack>
-        <north>
-          <offset>(0,-0.15)</offset>
-        </north>
-        <south>
-          <offset>(0,-0.15)</offset>
-        </south>
-        <east>
-          <offset>(-0.35,-0.1)</offset>
-          <thin><offset>(0.05,0)</offset></thin>
-          <hulk><offset>(-0.15,0)</offset></hulk>
-          <fat> <offset>(-0.20,0)</offset></fat>
-        </east>
-        <west>
-          <offset>(0.35,-0.1)</offset>
-          <thin><offset>(-0.05,0)</offset></thin>
-          <hulk><offset>(0.15,0)</offset></hulk>
-          <fat> <offset>(0.20,0)</offset></fat>
-        </west>
-
-        <male>  <scale>(0.6,0.6)</scale></male>
-        <female><scale>(0.6,0.6)</scale></female>
-        <thin>  <scale>(0.6,0.6)</scale></thin>
-        <hulk>  <scale>(0.75,0.75)</scale></hulk>
-        <fat>   <scale>(0.75,0.75)</scale></fat>
-      </wornGraphicData>
-    </apparel>
-    <comps>
-      <li Class="CompProperties_ApparelReloadable">
-        <maxCharges>1</maxCharges>
-        <soundReload>Standard_Reload</soundReload>
-        <chargeNoun>necro pack</chargeNoun>
-        <displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
-        <ammoDef>Bioferrite</ammoDef>
-        <ammoCountToRefill>35</ammoCountToRefill>
-        <baseReloadTicks>60</baseReloadTicks>
-        <hotKey>Misc4</hotKey>
-      </li>
-      <li Class="CompProperties_ReleaseGas">
-        <gasType>DeadlifeDust</gasType>
-        <cellsToFill>55</cellsToFill>
-        <durationSeconds>12.75</durationSeconds>
-        <effecterReleasing>ToxGasReleasing</effecterReleasing>
-      </li>
-      <li Class="CompProperties_AIUSablePack">
-        <compClass>CompToxPack</compClass>
-        <checkInterval>60</checkInterval>
-      </li>
-    </comps>
-    <verbs>
-      <li>
-        <verbClass>Verb_DeployToxPack</verbClass>
-        <label>deploy necro pack</label>
-        <violent>false</violent>
-        <hasStandardCommand>true</hasStandardCommand>
-        <targetable>false</targetable>
-        <soundCast>GasPack_Deploy</soundCast>
-        <nonInterruptingSelfCast>true</nonInterruptingSelfCast>
-      </li>
-    </verbs>
-    <tradeTags>
-      <li>Clothing</li>
-    </tradeTags>
-  </ThingDef>-->
-
-</Defs>
\ No newline at end of file
diff --git a/1.5/Bio1.5/Defs/AbilityDefs/DRM_Abilities_bio.xml b/1.5/Bio1.5/Defs/AbilityDefs/DRM_Abilities_bio.xml
index c285537..6ac7cc6 100644
--- a/1.5/Bio1.5/Defs/AbilityDefs/DRM_Abilities_bio.xml
+++ b/1.5/Bio1.5/Defs/AbilityDefs/DRM_Abilities_bio.xml
@@ -1,47 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-  <AbilityDef>
-    <defName>DR_FireBurst</defName>
-    <label>fire burst</label>
-    <description>Overdrive orbs cause explosion and set fire on ground.</description>
-    <jobDef>CastAbilityOnThingWithoutWeapon</jobDef>
-    <iconPath>UI/Abilities/FireBurst</iconPath>
-    <cooldownTicksRange>60000</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <aiCanUse>true</aiCanUse>
-    <ai_SearchAOEForTargets>true</ai_SearchAOEForTargets>
-    <targetRequired>false</targetRequired>
-    <showCastingProgressBar>true</showCastingProgressBar>
-
-    <displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
-    <disableGizmoWhileUndrafted>true</disableGizmoWhileUndrafted>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <warmupEffecter>Fire_Burst_Warmup</warmupEffecter>
-      <warmupTime>1.5</warmupTime>
-      <requireLineOfSight>false</requireLineOfSight>
-      <range>12</range>
-      <drawAimPie>false</drawAimPie>
-      <targetParams>
-        <canTargetSelf>true</canTargetSelf>
-      </targetParams>
-    </verbProperties>
-    <comps>
-      <li Class="DragonianMix.CompProperties_AbilityDRM_FireBurst">
-        <radius>12</radius>
-        <damageDef>DRM_Flame</damageDef>
-        <damageAmount>80</damageAmount>
-        <armorPenetration>0</armorPenetration>
-      </li>
-    </comps>
-  </AbilityDef>
-
   <AbilityDef>
     <defName>DRM_Toxgaspop</defName>
     <label>ToxGas Pop</label>
     <description>Release a cloud of Toxgas.</description>
-    <iconPath>UI/Abilities/ReleaseDeadlifeDust</iconPath>
+    <iconPath>UI/Abilities/Smokepop</iconPath>
     <cooldownTicksRange>60000</cooldownTicksRange>
     <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
     <aiCanUse>true</aiCanUse>
@@ -56,7 +20,7 @@
         <canTargetPawns>False</canTargetPawns>
         <canTargetLocations>True</canTargetLocations>
       </targetParams>
-      <soundCast>DeadlifeRelease</soundCast>
+
     </verbProperties>
     <comps>
       <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
@@ -69,142 +33,6 @@
     </comps>
   </AbilityDef>
 
-  <AbilityDef>
-    <defName>DRM_Feargaspop</defName>
-    <label>FearGas Pop</label>
-    <description>Release a cloud of Feargas.</description>
-    <iconPath>UI/Abilities/ReleaseDeadlifeDust</iconPath>
-    <cooldownTicksRange>60000</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <aiCanUse>true</aiCanUse>
-    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <label>release Feargas</label>
-      <drawAimPie>true</drawAimPie>
-      <warmupTime>1</warmupTime>
-      <range>24.9</range>
-      <targetParams>
-        <canTargetPawns>False</canTargetPawns>
-        <canTargetLocations>True</canTargetLocations>
-      </targetParams>
-      <soundCast>DeadlifeRelease</soundCast>
-    </verbProperties>
-    <comps>
-      <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
-        <damageDef>DRM_Feargas</damageDef>
-        <smokeRadius>9</smokeRadius>
-        <clamorType>Ability</clamorType>
-        <clamorRadius>20</clamorRadius>
-        <postExplosionSpawnThingDef>DRM_FearGasCloud</postExplosionSpawnThingDef>        <!-- ARL_ToxicGasCloud -->
-        <postExplosionSpawnChance>1</postExplosionSpawnChance>
-        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-      </li>
-    </comps>
-  </AbilityDef>
-
-  <AbilityDef>
-    <defName>DRM_LightingStrike</defName>
-    <label>LightingStrike</label>
-    <description>Summon a LightingStrike.</description>
-    <iconPath>UI/Abilities/Flashstorm</iconPath>
-    <cooldownTicksRange>1800</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <aiCanUse>true</aiCanUse>
-    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <label>Summon LightingStrike</label>
-      <drawAimPie>true</drawAimPie>
-      <warmupTime>1</warmupTime>
-      <range>24.9</range>
-      <targetParams>
-        <canTargetPawns>False</canTargetPawns>
-        <canTargetLocations>True</canTargetLocations>
-      </targetParams>
-      <soundCast>DeadlifeRelease</soundCast>
-    </verbProperties>
-    <comps>
-      <li Class="DragonianMix.CompProperties_AbilityDRM_LightingStrike">
-        <explosionRadius>4.0</explosionRadius>
-        <damageDef>DRM_Arc</damageDef>
-        <damageAmount>45</damageAmount>
-        <armorPenetration>1.0</armorPenetration>
-      </li>
-    </comps>
-  </AbilityDef>
-
-  <AbilityDef>
-    <defName>DRM_LightningBombardment</defName>
-    <label>LightningStorm</label>
-    <description>Summon a LightningStorm.</description>
-    <iconPath>UI/Abilities/Flashstorm</iconPath>
-    <cooldownTicksRange>60000</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <aiCanUse>true</aiCanUse>
-    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <label>Summon LightningStorm</label>
-      <drawAimPie>true</drawAimPie>
-      <warmupTime>1</warmupTime>
-      <range>29.9</range>
-      <targetParams>
-        <canTargetPawns>False</canTargetPawns>
-        <canTargetLocations>True</canTargetLocations>
-      </targetParams>
-      <soundCast>DeadlifeRelease</soundCast>
-    </verbProperties>
-    <comps>
-       <li Class="DragonianMix.CompProperties_AbilityDRM_LightningBombardment">
-          <impactAreaRadius>12</impactAreaRadius>
-          <explosionRadiusRange>3~4</explosionRadiusRange>
-          <bombIntervalTicks>30</bombIntervalTicks>
-          <explosionCount>20</explosionCount>
-          
-          <damageDef>DRM_Arc</damageDef>
-          <damageAmount>45</damageAmount>
-          <armorPenetration>1.0</armorPenetration>
-      </li>
-    </comps>
-  </AbilityDef>
-
-  <AbilityDef>
-    <defName>DRM_Acidgaspop</defName>
-    <label>AcidGas Pop</label>
-    <description>Release a cloud of Acidgas.</description>
-    <iconPath>UI/Abilities/ReleaseDeadlifeDust</iconPath>
-    <cooldownTicksRange>60000</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <aiCanUse>true</aiCanUse>
-    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <label>release Acidgas</label>
-      <drawAimPie>true</drawAimPie>
-      <warmupTime>1</warmupTime>
-      <range>24.9</range>
-      <targetParams>
-        <canTargetPawns>False</canTargetPawns>
-        <canTargetLocations>True</canTargetLocations>
-      </targetParams>
-      <soundCast>DeadlifeRelease</soundCast>
-    </verbProperties>
-    <comps>
-      <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
-        <damageDef>DRM_AcidCover</damageDef>
-        <damageAmount>25</damageAmount>
-        <armorPenetration>0.5</armorPenetration>
-        <smokeRadius>9</smokeRadius>
-        <clamorType>Ability</clamorType>
-        <clamorRadius>20</clamorRadius>
-        <postExplosionSpawnThingDef>DRM_AcidGasCloud</postExplosionSpawnThingDef>        <!-- ARL_ToxicGasCloud -->
-        <postExplosionSpawnChance>1</postExplosionSpawnChance>
-        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-      </li>
-    </comps>
-  </AbilityDef>
-
   <AbilityDef>
     <defName>DRM_AcidSpray</defName>
     <label>acid spray</label>
@@ -227,14 +55,15 @@
     </verbProperties>
     <comps>
       <li Class="CompProperties_AbilitySprayLiquid">
-        <projectileDef>Proj_Acid</projectileDef>
+        <projectileDef>DRM_Proj_Acid</projectileDef>
         <numCellsToHit>25</numCellsToHit>
         <sprayEffecter>AcidSpray_Directional</sprayEffecter>
       </li>
     </comps>
   </AbilityDef>
+
   <ThingDef>
-    <defName>Proj_Acid</defName>
+    <defName>DRM_Proj_Acid</defName>
     <label>acid</label>
     <thingClass>Projectile_Liquid</thingClass>
     <category>Projectile</category>
@@ -261,40 +90,4 @@
     </projectile>
   </ThingDef>
 
-  <AbilityDef>
-    <defName>DRM_Frostcloudpop</defName>
-    <label>FrostCloud Pop</label>
-    <description>Release a cloud of Frozen ice.</description>
-    <iconPath>UI/Abilities/ReleaseDeadlifeDust</iconPath>
-    <cooldownTicksRange>60000</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <aiCanUse>true</aiCanUse>
-    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <label>release FrostCloud</label>
-      <drawAimPie>true</drawAimPie>
-      <warmupTime>1</warmupTime>
-      <range>24.9</range>
-      <targetParams>
-        <canTargetPawns>False</canTargetPawns>
-        <canTargetLocations>True</canTargetLocations>
-      </targetParams>
-      <soundCast>DeadlifeRelease</soundCast>
-    </verbProperties>
-    <comps>
-      <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
-        <damageDef>DRM_Damage_FrostCoverd</damageDef>
-        <damageAmount>20</damageAmount>
-        <armorPenetration>0.5</armorPenetration>
-        <smokeRadius>6</smokeRadius>
-        <clamorType>Ability</clamorType>
-        <clamorRadius>20</clamorRadius>
-        <postExplosionSpawnThingDef>DRM_FrostGasCloud_Ex</postExplosionSpawnThingDef>        <!-- ARL_ToxicGasCloud -->
-        <postExplosionSpawnChance>1</postExplosionSpawnChance>
-        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-      </li>
-    </comps>
-  </AbilityDef>
-
 </Defs>
\ No newline at end of file
diff --git a/1.5/Bio1.5/Defs/HediffDefs/DRM_Hediffs_bio.xml b/1.5/Bio1.5/Defs/HediffDefs/DRM_Hediffs_bio.xml
index d75e5ac..cc9475f 100644
--- a/1.5/Bio1.5/Defs/HediffDefs/DRM_Hediffs_bio.xml
+++ b/1.5/Bio1.5/Defs/HediffDefs/DRM_Hediffs_bio.xml
@@ -1,76 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-	<!--
-<HediffDef>
-    <defName>DRM_FearGasExposure</defName>
-    <label>Fear gas</label>
-    <description>Aftereffects of exposure to tox gas, a poisonous chemical gas. It burns the lungs and eyes, causing a temporary shortness of breath and reduction in sight. Continued exposure to tox gas results in toxic buildup and eventually death.</description>
-    <hediffClass>HediffWithComps</hediffClass>
-    <maxSeverity>3</maxSeverity>
-    <initialSeverity>1</initialSeverity>
-    <canApplyDodChanceForCapacityChanges>true</canApplyDodChanceForCapacityChanges>
-    <defaultLabelColor>(0.6, 0, 1)</defaultLabelColor>
-    <stages>
-      <li>
-        <label>mild</label>
-        <minSeverity>1</minSeverity>
-        <painOffset>0.1</painOffset>
-        <capMods>
-          <li>
-            <capacity>Sight</capacity>
-            <offset>-0.1</offset>
-          </li>
-          <li>
-            <capacity>Breathing</capacity>
-            <offset>-0.15</offset>
-          </li>
-        </capMods>
-      </li>
-      <li>
-        <label>moderate</label>
-        <minSeverity>2</minSeverity>
-        <painOffset>0.15</painOffset>
-        <capMods>
-          <li>
-            <capacity>Sight</capacity>
-            <offset>-0.25</offset>
-          </li>
-          <li>
-            <capacity>Breathing</capacity>
-            <offset>-0.30</offset>
-          </li>
-        </capMods>
-      </li>
-      <li>
-        <label>severe</label>
-        <minSeverity>3</minSeverity>
-        <painOffset>0.25</painOffset>
-        <capMods>
-          <li>
-            <capacity>Sight</capacity>
-            <offset>-0.40</offset>
-          </li>
-          <li>
-            <capacity>Breathing</capacity>
-            <offset>-0.60</offset>
-          </li>
-        </capMods>
-      </li>
-    </stages>
-    <comps>
-      <li Class="HediffCompProperties_SeverityFromGasDensityDirect">
-        <gasType>ToxGas</gasType>
-        <densityStages>
-          <li>0.2</li>
-          <li>0.5</li>
-          <li>1</li>
-        </densityStages>
-      </li>
-    </comps>
-  </HediffDef>
-  -->
-
 	<HediffDef ParentName="AddedBodyPartBase">
 		<defName>ToxicDragonianOrb</defName>
 		<label>Toxic DragonianOrb</label>
diff --git a/1.5/Ideo1.5/Defs/AbilityDefs/DRM_Abilities_ideo.xml b/1.5/Ideo1.5/Defs/AbilityDefs/DRM_Abilities_ideo.xml
deleted file mode 100644
index d2fd660..0000000
--- a/1.5/Ideo1.5/Defs/AbilityDefs/DRM_Abilities_ideo.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-  <AbilityDef ParentName="RoleAuraBuffBase">
-    <defName>DRM_HealBreakOut</defName>
-    <label>Heal BreakOut</label>
-    <description>Overdrive orbs.Heal wound in insane speed.</description>
-    <iconPath>UI/Abilities/ImmunityDrive</iconPath>
-    <warmupMoteSocialSymbol>UI/Abilities/ImmunityDrive</warmupMoteSocialSymbol>
-    <cooldownTicksRange>60000</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <aiCanUse>false</aiCanUse>
-    <showCastingProgressBar>true</showCastingProgressBar>
-
-    <displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
-    <disableGizmoWhileUndrafted>true</disableGizmoWhileUndrafted>
-    <statBases>
-      <Ability_Duration>150</Ability_Duration>
-      <Ability_EffectRadius>0</Ability_EffectRadius>
-    </statBases>
-    <verbProperties>
-      <range>0</range>
-    </verbProperties>
-    <comps>
-      <li Class="CompProperties_AbilityGiveHediff">
-        <compClass>CompAbilityEffect_GiveHediff</compClass>
-        <hediffDef>DRM_HealBreakOut</hediffDef>
-        <onlyApplyToSelf>True</onlyApplyToSelf>
-        <replaceExisting>true</replaceExisting>
-      </li>
-    </comps>
-  </AbilityDef>
-
-</Defs>
\ No newline at end of file
diff --git a/1.5/Royal1.5/Defs/AbilityDefs/DRM_Abilities_royal.xml b/1.5/Royal1.5/Defs/AbilityDefs/DRM_Abilities_royal.xml
deleted file mode 100644
index c8a756a..0000000
--- a/1.5/Royal1.5/Defs/AbilityDefs/DRM_Abilities_royal.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
- 
-  <AbilityDef>
-    <defName>DRM_Skip</defName>
-    <label>skip</label>
-    <description>Teleport the target to a desired position not too far from its starting point. Objects which are too large cannot be teleported.</description>
-    <iconPath>UI/Abilities/Skip</iconPath>
-    <showPsycastEffects>False</showPsycastEffects>
-    <cooldownTicksRange>1800</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <label>skip</label>
-      <warmupTime>0.25</warmupTime>
-      <range>30</range>
-      <targetParams>
-        <canTargetSelf>True</canTargetSelf>
-        <canTargetAnimals>True</canTargetAnimals>
-        <canTargetItems>True</canTargetItems>
-      </targetParams>
-    </verbProperties>
-    <comps>
-      <li Class="CompProperties_AbilityTeleport">
-        <compClass>CompAbilityEffect_Teleport</compClass>
-        <destination>Selected</destination>
-        <requiresLineOfSight>True</requiresLineOfSight>
-        <range>30</range>
-        <clamorType>Ability</clamorType>
-        <clamorRadius>10</clamorRadius>
-        <destClamorType>Ability</destClamorType>
-        <destClamorRadius>10</destClamorRadius>
-        <stunTicks>18~60</stunTicks>
-        <goodwillImpact>-15</goodwillImpact>
-        <applyGoodwillImpactToLodgers>False</applyGoodwillImpactToLodgers>
-      </li>
-    </comps>
-  </AbilityDef>
-
-  <AbilityDef>
-    <defName>DRM_Farskip</defName>
-    <label>farskip</label>
-    <description>Skip the caster, to an ally at a distant location. This can send people far across the planet, but only works if there is a willing ally on the other side to use as a navigation beacon. The skipped people will always appear near a random ally on the target map.</description>
-    <iconPath>UI/Abilities/Farskip</iconPath>
-    <targetWorldCell>True</targetWorldCell>
-    <showGizmoOnWorldView>True</showGizmoOnWorldView>
-    <hostile>false</hostile>
-    <cooldownTicksRange>60000</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <label>release deadlife dust</label>
-      <warmupTime>5</warmupTime>
-      <range>0</range>
-      <drawAimPie>False</drawAimPie>
-      <requireLineOfSight>False</requireLineOfSight>
-    </verbProperties>
-    <comps>
-      <li Class="CompProperties_AbilityFarskip">
-        <stunTicks>18~60</stunTicks>
-        <clamorType>Ability</clamorType>
-        <clamorRadius>10</clamorRadius>
-      </li>
-    </comps>
-  </AbilityDef>
-
-</Defs>
\ No newline at end of file
diff --git a/1.6/1.6/Defs/AbilityDefs/DRM_Abilities.xml b/1.6/1.6/Defs/AbilityDefs/DRM_Abilities.xml
new file mode 100644
index 0000000..a96ea61
--- /dev/null
+++ b/1.6/1.6/Defs/AbilityDefs/DRM_Abilities.xml
@@ -0,0 +1,339 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+  <AbilityDef Abstract="True" Name="DRM_RoleAuraBuffBase">
+    <jobDef>CastAbilityOnThing</jobDef>
+    <targetRequired>False</targetRequired>
+    <canUseAoeToGetTargets>False</canUseAoeToGetTargets>
+    <stunTargetWhileCasting>True</stunTargetWhileCasting>
+    <showPsycastEffects>False</showPsycastEffects>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <displayGizmoWhileUndrafted>True</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>False</disableGizmoWhileUndrafted>
+    <hotKey>Misc12</hotKey>
+    <warmupStartSound>CombatCommand_Warmup</warmupStartSound>
+    <statBases>
+      <Ability_Duration>1000</Ability_Duration>
+      <Ability_EffectRadius>9.9</Ability_EffectRadius>
+    </statBases>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <warmupTime>0.5</warmupTime>
+      <range>9.9</range>
+      <drawAimPie>False</drawAimPie>
+      <requireLineOfSight>False</requireLineOfSight>
+      <targetParams>
+        <canTargetSelf>true</canTargetSelf>
+        <canTargetPawns>false</canTargetPawns>
+        <canTargetBuildings>false</canTargetBuildings>
+        <canTargetAnimals>false</canTargetAnimals>
+        <canTargetHumans>false</canTargetHumans>
+        <canTargetMechs>false</canTargetMechs>
+      </targetParams>
+    </verbProperties>
+  </AbilityDef>
+
+  <AbilityDef>
+    <defName>DRM_Skip</defName>
+    <label>skip</label>
+    <description>Teleport the target to a desired position not too far from its starting point. Objects which are too large cannot be teleported.</description>
+    <iconPath>UI/Abilities/Skip</iconPath>
+    <showPsycastEffects>False</showPsycastEffects>
+    <cooldownTicksRange>1800</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <label>skip</label>
+      <warmupTime>0.25</warmupTime>
+      <range>30</range>
+      <targetParams>
+        <canTargetSelf>True</canTargetSelf>
+        <canTargetAnimals>True</canTargetAnimals>
+        <canTargetItems>True</canTargetItems>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="CompProperties_AbilityTeleport">
+        <compClass>CompAbilityEffect_Teleport</compClass>
+        <destination>Selected</destination>
+        <requiresLineOfSight>True</requiresLineOfSight>
+        <range>30</range>
+        <clamorType>Ability</clamorType>
+        <clamorRadius>10</clamorRadius>
+        <destClamorType>Ability</destClamorType>
+        <destClamorRadius>10</destClamorRadius>
+        <stunTicks>18~60</stunTicks>
+        <goodwillImpact>-15</goodwillImpact>
+        <applyGoodwillImpactToLodgers>False</applyGoodwillImpactToLodgers>
+      </li>
+    </comps>
+  </AbilityDef>
+
+  <AbilityDef>
+    <defName>DRM_Farskip</defName>
+    <label>farskip</label>
+    <description>Skip the caster, to an ally at a distant location. This can send people far across the planet, but only works if there is a willing ally on the other side to use as a navigation beacon. The skipped people will always appear near a random ally on the target map.</description>
+    <iconPath>UI/Abilities/Farskip</iconPath>
+    <targetWorldCell>True</targetWorldCell>
+    <showGizmoOnWorldView>True</showGizmoOnWorldView>
+    <hostile>false</hostile>
+    <cooldownTicksRange>60000</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <label>farskip</label>
+      <warmupTime>5</warmupTime>
+      <range>0</range>
+      <drawAimPie>False</drawAimPie>
+      <requireLineOfSight>False</requireLineOfSight>
+    </verbProperties>
+    <comps>
+      <li Class="CompProperties_AbilityFarskip">
+        <stunTicks>18~60</stunTicks>
+        <clamorType>Ability</clamorType>
+        <clamorRadius>10</clamorRadius>
+      </li>
+    </comps>
+  </AbilityDef>
+
+  <AbilityDef>
+    <defName>DR_FireBurst</defName>
+    <label>fire burst</label>
+    <description>Overdrive orbs cause explosion and set fire on ground.</description>
+    <jobDef>CastAbilityOnThing</jobDef>
+    <iconPath>UI/Abilities/FireBurst</iconPath>
+    <cooldownTicksRange>60000</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <aiCanUse>true</aiCanUse>
+    <ai_SearchAOEForTargets>true</ai_SearchAOEForTargets>
+    <targetRequired>false</targetRequired>
+    <showCastingProgressBar>true</showCastingProgressBar>
+
+    <displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>true</disableGizmoWhileUndrafted>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <warmupEffecter>Fire_Burst_Warmup</warmupEffecter>
+      <warmupTime>1.5</warmupTime>
+      <requireLineOfSight>false</requireLineOfSight>
+      <range>12</range>
+      <drawAimPie>false</drawAimPie>
+      <targetParams>
+        <canTargetSelf>true</canTargetSelf>
+      </targetParams>
+    </verbProperties>
+    <comps>
+      <li Class="DragonianMix.CompProperties_AbilityDRM_FireBurst">
+        <radius>12</radius>
+        <damageDef>DRM_Flame</damageDef>
+        <damageAmount>80</damageAmount>
+        <armorPenetration>0</armorPenetration>
+      </li>
+    </comps>
+  </AbilityDef>
+
+  <AbilityDef>
+    <defName>DRM_Feargaspop</defName>
+    <label>FearGas Pop</label>
+    <description>Release a cloud of Feargas.</description>
+    <iconPath>UI/Abilities/Smokepop</iconPath>
+    <cooldownTicksRange>60000</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <aiCanUse>true</aiCanUse>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <label>release Feargas</label>
+      <drawAimPie>true</drawAimPie>
+      <warmupTime>1</warmupTime>
+      <range>24.9</range>
+      <targetParams>
+        <canTargetPawns>False</canTargetPawns>
+        <canTargetLocations>True</canTargetLocations>
+      </targetParams>
+
+    </verbProperties>
+    <comps>
+      <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
+        <damageDef>DRM_Feargas</damageDef>
+        <smokeRadius>9</smokeRadius>
+        <clamorType>Ability</clamorType>
+        <clamorRadius>20</clamorRadius>
+        <postExplosionSpawnThingDef>DRM_FearGasCloud</postExplosionSpawnThingDef>        <!-- ARL_ToxicGasCloud -->
+        <postExplosionSpawnChance>1</postExplosionSpawnChance>
+        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+      </li>
+    </comps>
+  </AbilityDef>
+
+  <AbilityDef>
+    <defName>DRM_LightingStrike</defName>
+    <label>LightingStrike</label>
+    <description>Summon a LightingStrike.</description>
+    <iconPath>UI/Abilities/Flashstorm</iconPath>
+    <cooldownTicksRange>1800</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <aiCanUse>true</aiCanUse>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <label>Summon LightingStrike</label>
+      <drawAimPie>true</drawAimPie>
+      <warmupTime>1</warmupTime>
+      <range>24.9</range>
+      <targetParams>
+        <canTargetPawns>False</canTargetPawns>
+        <canTargetLocations>True</canTargetLocations>
+      </targetParams>
+
+    </verbProperties>
+    <comps>
+      <li Class="DragonianMix.CompProperties_AbilityDRM_LightingStrike">
+        <explosionRadius>4.0</explosionRadius>
+        <damageDef>DRM_Arc</damageDef>
+        <damageAmount>45</damageAmount>
+        <armorPenetration>1.0</armorPenetration>
+      </li>
+    </comps>
+  </AbilityDef>
+
+  <AbilityDef>
+    <defName>DRM_LightningBombardment</defName>
+    <label>LightningStorm</label>
+    <description>Summon a LightningStorm.</description>
+    <iconPath>UI/Abilities/Flashstorm</iconPath>
+    <cooldownTicksRange>60000</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <aiCanUse>true</aiCanUse>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <label>Summon LightningStorm</label>
+      <drawAimPie>true</drawAimPie>
+      <warmupTime>1</warmupTime>
+      <range>29.9</range>
+      <targetParams>
+        <canTargetPawns>False</canTargetPawns>
+        <canTargetLocations>True</canTargetLocations>
+      </targetParams>
+
+    </verbProperties>
+    <comps>
+      <li Class="DragonianMix.CompProperties_AbilityDRM_LightningBombardment">
+        <impactAreaRadius>12</impactAreaRadius>
+        <explosionRadiusRange>3~4</explosionRadiusRange>
+        <bombIntervalTicks>30</bombIntervalTicks>
+        <explosionCount>20</explosionCount>
+
+        <damageDef>DRM_Arc</damageDef>
+        <damageAmount>45</damageAmount>
+        <armorPenetration>1.0</armorPenetration>
+      </li>
+    </comps>
+  </AbilityDef>
+
+  <AbilityDef>
+    <defName>DRM_Acidgaspop</defName>
+    <label>AcidGas Pop</label>
+    <description>Release a cloud of Acidgas.</description>
+    <iconPath>UI/Abilities/Smokepop</iconPath>
+    <cooldownTicksRange>60000</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <aiCanUse>true</aiCanUse>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <label>release Acidgas</label>
+      <drawAimPie>true</drawAimPie>
+      <warmupTime>1</warmupTime>
+      <range>24.9</range>
+      <targetParams>
+        <canTargetPawns>False</canTargetPawns>
+        <canTargetLocations>True</canTargetLocations>
+      </targetParams>
+
+    </verbProperties>
+    <comps>
+      <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
+        <damageDef>DRM_AcidCover</damageDef>
+        <damageAmount>25</damageAmount>
+        <armorPenetration>0.5</armorPenetration>
+        <smokeRadius>9</smokeRadius>
+        <clamorType>Ability</clamorType>
+        <clamorRadius>20</clamorRadius>
+        <postExplosionSpawnThingDef>DRM_AcidGasCloud</postExplosionSpawnThingDef>        <!-- ARL_ToxicGasCloud -->
+        <postExplosionSpawnChance>1</postExplosionSpawnChance>
+        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+      </li>
+    </comps>
+  </AbilityDef>
+
+
+
+  <AbilityDef>
+    <defName>DRM_Frostcloudpop</defName>
+    <label>FrostCloud Pop</label>
+    <description>Release a cloud of Frozen ice.</description>
+    <iconPath>UI/Abilities/Smokepop</iconPath>
+    <cooldownTicksRange>60000</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <aiCanUse>true</aiCanUse>
+    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
+    <verbProperties>
+      <verbClass>Verb_CastAbility</verbClass>
+      <label>release FrostCloud</label>
+      <drawAimPie>true</drawAimPie>
+      <warmupTime>1</warmupTime>
+      <range>24.9</range>
+      <targetParams>
+        <canTargetPawns>False</canTargetPawns>
+        <canTargetLocations>True</canTargetLocations>
+      </targetParams>
+
+    </verbProperties>
+    <comps>
+      <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
+        <damageDef>DRM_Damage_FrostCoverd</damageDef>
+        <damageAmount>20</damageAmount>
+        <armorPenetration>0.5</armorPenetration>
+        <smokeRadius>6</smokeRadius>
+        <clamorType>Ability</clamorType>
+        <clamorRadius>20</clamorRadius>
+        <postExplosionSpawnThingDef>DRM_FrostGasCloud_Ex</postExplosionSpawnThingDef>        <!-- ARL_ToxicGasCloud -->
+        <postExplosionSpawnChance>1</postExplosionSpawnChance>
+        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+      </li>
+    </comps>
+  </AbilityDef>
+
+  <AbilityDef ParentName="DRM_RoleAuraBuffBase">
+    <defName>DRM_HealBreakOut</defName>
+    <label>Heal BreakOut</label>
+    <description>Overdrive orbs.Heal wound in insane speed.</description>
+    <iconPath>UI/Abilities/ImmunityDrive</iconPath>
+    <warmupMoteSocialSymbol>UI/Abilities/ImmunityDrive</warmupMoteSocialSymbol>
+    <cooldownTicksRange>60000</cooldownTicksRange>
+    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+    <aiCanUse>false</aiCanUse>
+    <showCastingProgressBar>true</showCastingProgressBar>
+
+    <displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
+    <disableGizmoWhileUndrafted>true</disableGizmoWhileUndrafted>
+    <statBases>
+      <Ability_Duration>150</Ability_Duration>
+      <Ability_EffectRadius>0</Ability_EffectRadius>
+    </statBases>
+    <verbProperties>
+      <range>0</range>
+    </verbProperties>
+    <comps>
+      <li Class="CompProperties_AbilityGiveHediff">
+        <compClass>CompAbilityEffect_GiveHediff</compClass>
+        <hediffDef>DRM_HealBreakOut</hediffDef>
+        <onlyApplyToSelf>True</onlyApplyToSelf>
+        <replaceExisting>true</replaceExisting>
+      </li>
+    </comps>
+  </AbilityDef>
+
+</Defs>
\ No newline at end of file
diff --git a/1.6/Ano1.6/Defs/ThingDefs/DRM_Apparel_Packs_ano.xml b/1.6/Ano1.6/Defs/ThingDefs/DRM_Apparel_Packs_ano.xml
deleted file mode 100644
index d7dbc96..0000000
--- a/1.6/Ano1.6/Defs/ThingDefs/DRM_Apparel_Packs_ano.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-<!--<ThingDef ParentName="ApparelNoQualityBase">
-    <defName>DR_Apparel_PackNecro</defName>
-    <label>Necro pack</label>
-    <description>A reusable backpack containing canisters of reagents and a mechanism that uses them to generate deadlifedust.</description>
-    <graphicData>
-      <texPath>Things/Pawn/Humanlike/Apparel/ToxPack/ToxPack</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-      <drawSize>(0.7,0.7)</drawSize>
-    </graphicData>
-    <tickerType>Normal</tickerType>
-    <techLevel>Industrial</techLevel>
-    <statBases>
-      <Mass>3</Mass>
-      <Flammability>0.6</Flammability>
-      <EquipDelay>2</EquipDelay>
-      <WorkToMake>3600</WorkToMake>
-    </statBases>
-    <thingCategories>
-      <li>ApparelUtility</li>
-    </thingCategories>
-    <costList>
-      <Bioferrite>75</Bioferrite>
-      <ComponentIndustrial>1</ComponentIndustrial>
-    </costList>
-    <recipeMaker>
-      <unfinishedThingDef>UnfinishedPack</unfinishedThingDef>
-      <researchPrerequisite>DeadlifeDust</researchPrerequisite>
-      <recipeUsers Inherit="false">
-        <li>BioferriteShaper</li>
-      </recipeUsers>
-      <useIngredientsForColor>false</useIngredientsForColor>
-      <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-      <workSkill>Crafting</workSkill>
-      <effectWorking>Smith</effectWorking>
-      <soundWorking>Recipe_Smith</soundWorking>
-      <skillRequirements>
-        <Crafting>4</Crafting>
-      </skillRequirements>
-      <displayPriority>350</displayPriority>
-    </recipeMaker>
-    <apparel>
-      <countsAsClothingForNudity>false</countsAsClothingForNudity>
-      <scoreOffset>4</scoreOffset>
-      <careIfWornByCorpse>false</careIfWornByCorpse>
-      <careIfDamaged>false</careIfDamaged>
-      <wearPerDay>0</wearPerDay>
-      <tags>
-        <li>BeltDefenseNecro</li>
-      </tags>
-      <bodyPartGroups>
-        <li>Waist</li>
-      </bodyPartGroups>
-      <layers>
-        <li>Belt</li>
-      </layers>
-      <wornGraphicPath>Things/Pawn/Humanlike/Apparel/ToxPack/ToxPack</wornGraphicPath>
-      <wornGraphicData>
-        <renderUtilityAsPack>true</renderUtilityAsPack>
-        <north>
-          <offset>(0,-0.15)</offset>
-        </north>
-        <south>
-          <offset>(0,-0.15)</offset>
-        </south>
-        <east>
-          <offset>(-0.35,-0.1)</offset>
-          <thin><offset>(0.05,0)</offset></thin>
-          <hulk><offset>(-0.15,0)</offset></hulk>
-          <fat> <offset>(-0.20,0)</offset></fat>
-        </east>
-        <west>
-          <offset>(0.35,-0.1)</offset>
-          <thin><offset>(-0.05,0)</offset></thin>
-          <hulk><offset>(0.15,0)</offset></hulk>
-          <fat> <offset>(0.20,0)</offset></fat>
-        </west>
-
-        <male>  <scale>(0.6,0.6)</scale></male>
-        <female><scale>(0.6,0.6)</scale></female>
-        <thin>  <scale>(0.6,0.6)</scale></thin>
-        <hulk>  <scale>(0.75,0.75)</scale></hulk>
-        <fat>   <scale>(0.75,0.75)</scale></fat>
-      </wornGraphicData>
-    </apparel>
-    <comps>
-      <li Class="CompProperties_ApparelReloadable">
-        <maxCharges>1</maxCharges>
-        <soundReload>Standard_Reload</soundReload>
-        <chargeNoun>necro pack</chargeNoun>
-        <displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
-        <ammoDef>Bioferrite</ammoDef>
-        <ammoCountToRefill>35</ammoCountToRefill>
-        <baseReloadTicks>60</baseReloadTicks>
-        <hotKey>Misc4</hotKey>
-      </li>
-      <li Class="CompProperties_ReleaseGas">
-        <gasType>DeadlifeDust</gasType>
-        <cellsToFill>55</cellsToFill>
-        <durationSeconds>12.75</durationSeconds>
-        <effecterReleasing>ToxGasReleasing</effecterReleasing>
-      </li>
-      <li Class="CompProperties_AIUSablePack">
-        <compClass>CompToxPack</compClass>
-        <checkInterval>60</checkInterval>
-      </li>
-    </comps>
-    <verbs>
-      <li>
-        <verbClass>Verb_DeployToxPack</verbClass>
-        <label>deploy necro pack</label>
-        <violent>false</violent>
-        <hasStandardCommand>true</hasStandardCommand>
-        <targetable>false</targetable>
-        <soundCast>GasPack_Deploy</soundCast>
-        <nonInterruptingSelfCast>true</nonInterruptingSelfCast>
-      </li>
-    </verbs>
-    <tradeTags>
-      <li>Clothing</li>
-    </tradeTags>
-  </ThingDef>-->
-
-</Defs>
\ No newline at end of file
diff --git a/1.6/Bio1.6/Defs/AbilityDefs/DRM_Abilities_bio.xml b/1.6/Bio1.6/Defs/AbilityDefs/DRM_Abilities_bio.xml
index c285537..6ac7cc6 100644
--- a/1.6/Bio1.6/Defs/AbilityDefs/DRM_Abilities_bio.xml
+++ b/1.6/Bio1.6/Defs/AbilityDefs/DRM_Abilities_bio.xml
@@ -1,47 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-  <AbilityDef>
-    <defName>DR_FireBurst</defName>
-    <label>fire burst</label>
-    <description>Overdrive orbs cause explosion and set fire on ground.</description>
-    <jobDef>CastAbilityOnThingWithoutWeapon</jobDef>
-    <iconPath>UI/Abilities/FireBurst</iconPath>
-    <cooldownTicksRange>60000</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <aiCanUse>true</aiCanUse>
-    <ai_SearchAOEForTargets>true</ai_SearchAOEForTargets>
-    <targetRequired>false</targetRequired>
-    <showCastingProgressBar>true</showCastingProgressBar>
-
-    <displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
-    <disableGizmoWhileUndrafted>true</disableGizmoWhileUndrafted>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <warmupEffecter>Fire_Burst_Warmup</warmupEffecter>
-      <warmupTime>1.5</warmupTime>
-      <requireLineOfSight>false</requireLineOfSight>
-      <range>12</range>
-      <drawAimPie>false</drawAimPie>
-      <targetParams>
-        <canTargetSelf>true</canTargetSelf>
-      </targetParams>
-    </verbProperties>
-    <comps>
-      <li Class="DragonianMix.CompProperties_AbilityDRM_FireBurst">
-        <radius>12</radius>
-        <damageDef>DRM_Flame</damageDef>
-        <damageAmount>80</damageAmount>
-        <armorPenetration>0</armorPenetration>
-      </li>
-    </comps>
-  </AbilityDef>
-
   <AbilityDef>
     <defName>DRM_Toxgaspop</defName>
     <label>ToxGas Pop</label>
     <description>Release a cloud of Toxgas.</description>
-    <iconPath>UI/Abilities/ReleaseDeadlifeDust</iconPath>
+    <iconPath>UI/Abilities/Smokepop</iconPath>
     <cooldownTicksRange>60000</cooldownTicksRange>
     <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
     <aiCanUse>true</aiCanUse>
@@ -56,7 +20,7 @@
         <canTargetPawns>False</canTargetPawns>
         <canTargetLocations>True</canTargetLocations>
       </targetParams>
-      <soundCast>DeadlifeRelease</soundCast>
+
     </verbProperties>
     <comps>
       <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
@@ -69,142 +33,6 @@
     </comps>
   </AbilityDef>
 
-  <AbilityDef>
-    <defName>DRM_Feargaspop</defName>
-    <label>FearGas Pop</label>
-    <description>Release a cloud of Feargas.</description>
-    <iconPath>UI/Abilities/ReleaseDeadlifeDust</iconPath>
-    <cooldownTicksRange>60000</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <aiCanUse>true</aiCanUse>
-    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <label>release Feargas</label>
-      <drawAimPie>true</drawAimPie>
-      <warmupTime>1</warmupTime>
-      <range>24.9</range>
-      <targetParams>
-        <canTargetPawns>False</canTargetPawns>
-        <canTargetLocations>True</canTargetLocations>
-      </targetParams>
-      <soundCast>DeadlifeRelease</soundCast>
-    </verbProperties>
-    <comps>
-      <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
-        <damageDef>DRM_Feargas</damageDef>
-        <smokeRadius>9</smokeRadius>
-        <clamorType>Ability</clamorType>
-        <clamorRadius>20</clamorRadius>
-        <postExplosionSpawnThingDef>DRM_FearGasCloud</postExplosionSpawnThingDef>        <!-- ARL_ToxicGasCloud -->
-        <postExplosionSpawnChance>1</postExplosionSpawnChance>
-        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-      </li>
-    </comps>
-  </AbilityDef>
-
-  <AbilityDef>
-    <defName>DRM_LightingStrike</defName>
-    <label>LightingStrike</label>
-    <description>Summon a LightingStrike.</description>
-    <iconPath>UI/Abilities/Flashstorm</iconPath>
-    <cooldownTicksRange>1800</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <aiCanUse>true</aiCanUse>
-    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <label>Summon LightingStrike</label>
-      <drawAimPie>true</drawAimPie>
-      <warmupTime>1</warmupTime>
-      <range>24.9</range>
-      <targetParams>
-        <canTargetPawns>False</canTargetPawns>
-        <canTargetLocations>True</canTargetLocations>
-      </targetParams>
-      <soundCast>DeadlifeRelease</soundCast>
-    </verbProperties>
-    <comps>
-      <li Class="DragonianMix.CompProperties_AbilityDRM_LightingStrike">
-        <explosionRadius>4.0</explosionRadius>
-        <damageDef>DRM_Arc</damageDef>
-        <damageAmount>45</damageAmount>
-        <armorPenetration>1.0</armorPenetration>
-      </li>
-    </comps>
-  </AbilityDef>
-
-  <AbilityDef>
-    <defName>DRM_LightningBombardment</defName>
-    <label>LightningStorm</label>
-    <description>Summon a LightningStorm.</description>
-    <iconPath>UI/Abilities/Flashstorm</iconPath>
-    <cooldownTicksRange>60000</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <aiCanUse>true</aiCanUse>
-    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <label>Summon LightningStorm</label>
-      <drawAimPie>true</drawAimPie>
-      <warmupTime>1</warmupTime>
-      <range>29.9</range>
-      <targetParams>
-        <canTargetPawns>False</canTargetPawns>
-        <canTargetLocations>True</canTargetLocations>
-      </targetParams>
-      <soundCast>DeadlifeRelease</soundCast>
-    </verbProperties>
-    <comps>
-       <li Class="DragonianMix.CompProperties_AbilityDRM_LightningBombardment">
-          <impactAreaRadius>12</impactAreaRadius>
-          <explosionRadiusRange>3~4</explosionRadiusRange>
-          <bombIntervalTicks>30</bombIntervalTicks>
-          <explosionCount>20</explosionCount>
-          
-          <damageDef>DRM_Arc</damageDef>
-          <damageAmount>45</damageAmount>
-          <armorPenetration>1.0</armorPenetration>
-      </li>
-    </comps>
-  </AbilityDef>
-
-  <AbilityDef>
-    <defName>DRM_Acidgaspop</defName>
-    <label>AcidGas Pop</label>
-    <description>Release a cloud of Acidgas.</description>
-    <iconPath>UI/Abilities/ReleaseDeadlifeDust</iconPath>
-    <cooldownTicksRange>60000</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <aiCanUse>true</aiCanUse>
-    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <label>release Acidgas</label>
-      <drawAimPie>true</drawAimPie>
-      <warmupTime>1</warmupTime>
-      <range>24.9</range>
-      <targetParams>
-        <canTargetPawns>False</canTargetPawns>
-        <canTargetLocations>True</canTargetLocations>
-      </targetParams>
-      <soundCast>DeadlifeRelease</soundCast>
-    </verbProperties>
-    <comps>
-      <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
-        <damageDef>DRM_AcidCover</damageDef>
-        <damageAmount>25</damageAmount>
-        <armorPenetration>0.5</armorPenetration>
-        <smokeRadius>9</smokeRadius>
-        <clamorType>Ability</clamorType>
-        <clamorRadius>20</clamorRadius>
-        <postExplosionSpawnThingDef>DRM_AcidGasCloud</postExplosionSpawnThingDef>        <!-- ARL_ToxicGasCloud -->
-        <postExplosionSpawnChance>1</postExplosionSpawnChance>
-        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-      </li>
-    </comps>
-  </AbilityDef>
-
   <AbilityDef>
     <defName>DRM_AcidSpray</defName>
     <label>acid spray</label>
@@ -227,14 +55,15 @@
     </verbProperties>
     <comps>
       <li Class="CompProperties_AbilitySprayLiquid">
-        <projectileDef>Proj_Acid</projectileDef>
+        <projectileDef>DRM_Proj_Acid</projectileDef>
         <numCellsToHit>25</numCellsToHit>
         <sprayEffecter>AcidSpray_Directional</sprayEffecter>
       </li>
     </comps>
   </AbilityDef>
+
   <ThingDef>
-    <defName>Proj_Acid</defName>
+    <defName>DRM_Proj_Acid</defName>
     <label>acid</label>
     <thingClass>Projectile_Liquid</thingClass>
     <category>Projectile</category>
@@ -261,40 +90,4 @@
     </projectile>
   </ThingDef>
 
-  <AbilityDef>
-    <defName>DRM_Frostcloudpop</defName>
-    <label>FrostCloud Pop</label>
-    <description>Release a cloud of Frozen ice.</description>
-    <iconPath>UI/Abilities/ReleaseDeadlifeDust</iconPath>
-    <cooldownTicksRange>60000</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <aiCanUse>true</aiCanUse>
-    <casterMustBeCapableOfViolence>false</casterMustBeCapableOfViolence>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <label>release FrostCloud</label>
-      <drawAimPie>true</drawAimPie>
-      <warmupTime>1</warmupTime>
-      <range>24.9</range>
-      <targetParams>
-        <canTargetPawns>False</canTargetPawns>
-        <canTargetLocations>True</canTargetLocations>
-      </targetParams>
-      <soundCast>DeadlifeRelease</soundCast>
-    </verbProperties>
-    <comps>
-      <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
-        <damageDef>DRM_Damage_FrostCoverd</damageDef>
-        <damageAmount>20</damageAmount>
-        <armorPenetration>0.5</armorPenetration>
-        <smokeRadius>6</smokeRadius>
-        <clamorType>Ability</clamorType>
-        <clamorRadius>20</clamorRadius>
-        <postExplosionSpawnThingDef>DRM_FrostGasCloud_Ex</postExplosionSpawnThingDef>        <!-- ARL_ToxicGasCloud -->
-        <postExplosionSpawnChance>1</postExplosionSpawnChance>
-        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-      </li>
-    </comps>
-  </AbilityDef>
-
 </Defs>
\ No newline at end of file
diff --git a/1.6/Bio1.6/Defs/HediffDefs/DRM_Hediffs_bio.xml b/1.6/Bio1.6/Defs/HediffDefs/DRM_Hediffs_bio.xml
index d75e5ac..cc9475f 100644
--- a/1.6/Bio1.6/Defs/HediffDefs/DRM_Hediffs_bio.xml
+++ b/1.6/Bio1.6/Defs/HediffDefs/DRM_Hediffs_bio.xml
@@ -1,76 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-	<!--
-<HediffDef>
-    <defName>DRM_FearGasExposure</defName>
-    <label>Fear gas</label>
-    <description>Aftereffects of exposure to tox gas, a poisonous chemical gas. It burns the lungs and eyes, causing a temporary shortness of breath and reduction in sight. Continued exposure to tox gas results in toxic buildup and eventually death.</description>
-    <hediffClass>HediffWithComps</hediffClass>
-    <maxSeverity>3</maxSeverity>
-    <initialSeverity>1</initialSeverity>
-    <canApplyDodChanceForCapacityChanges>true</canApplyDodChanceForCapacityChanges>
-    <defaultLabelColor>(0.6, 0, 1)</defaultLabelColor>
-    <stages>
-      <li>
-        <label>mild</label>
-        <minSeverity>1</minSeverity>
-        <painOffset>0.1</painOffset>
-        <capMods>
-          <li>
-            <capacity>Sight</capacity>
-            <offset>-0.1</offset>
-          </li>
-          <li>
-            <capacity>Breathing</capacity>
-            <offset>-0.15</offset>
-          </li>
-        </capMods>
-      </li>
-      <li>
-        <label>moderate</label>
-        <minSeverity>2</minSeverity>
-        <painOffset>0.15</painOffset>
-        <capMods>
-          <li>
-            <capacity>Sight</capacity>
-            <offset>-0.25</offset>
-          </li>
-          <li>
-            <capacity>Breathing</capacity>
-            <offset>-0.30</offset>
-          </li>
-        </capMods>
-      </li>
-      <li>
-        <label>severe</label>
-        <minSeverity>3</minSeverity>
-        <painOffset>0.25</painOffset>
-        <capMods>
-          <li>
-            <capacity>Sight</capacity>
-            <offset>-0.40</offset>
-          </li>
-          <li>
-            <capacity>Breathing</capacity>
-            <offset>-0.60</offset>
-          </li>
-        </capMods>
-      </li>
-    </stages>
-    <comps>
-      <li Class="HediffCompProperties_SeverityFromGasDensityDirect">
-        <gasType>ToxGas</gasType>
-        <densityStages>
-          <li>0.2</li>
-          <li>0.5</li>
-          <li>1</li>
-        </densityStages>
-      </li>
-    </comps>
-  </HediffDef>
-  -->
-
 	<HediffDef ParentName="AddedBodyPartBase">
 		<defName>ToxicDragonianOrb</defName>
 		<label>Toxic DragonianOrb</label>
diff --git a/1.6/Ideo1.6/Defs/AbilityDefs/DRM_Abilities_ideo.xml b/1.6/Ideo1.6/Defs/AbilityDefs/DRM_Abilities_ideo.xml
deleted file mode 100644
index d2fd660..0000000
--- a/1.6/Ideo1.6/Defs/AbilityDefs/DRM_Abilities_ideo.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-  <AbilityDef ParentName="RoleAuraBuffBase">
-    <defName>DRM_HealBreakOut</defName>
-    <label>Heal BreakOut</label>
-    <description>Overdrive orbs.Heal wound in insane speed.</description>
-    <iconPath>UI/Abilities/ImmunityDrive</iconPath>
-    <warmupMoteSocialSymbol>UI/Abilities/ImmunityDrive</warmupMoteSocialSymbol>
-    <cooldownTicksRange>60000</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <aiCanUse>false</aiCanUse>
-    <showCastingProgressBar>true</showCastingProgressBar>
-
-    <displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
-    <disableGizmoWhileUndrafted>true</disableGizmoWhileUndrafted>
-    <statBases>
-      <Ability_Duration>150</Ability_Duration>
-      <Ability_EffectRadius>0</Ability_EffectRadius>
-    </statBases>
-    <verbProperties>
-      <range>0</range>
-    </verbProperties>
-    <comps>
-      <li Class="CompProperties_AbilityGiveHediff">
-        <compClass>CompAbilityEffect_GiveHediff</compClass>
-        <hediffDef>DRM_HealBreakOut</hediffDef>
-        <onlyApplyToSelf>True</onlyApplyToSelf>
-        <replaceExisting>true</replaceExisting>
-      </li>
-    </comps>
-  </AbilityDef>
-
-</Defs>
\ No newline at end of file
diff --git a/1.6/Royal1.6/Defs/AbilityDefs/DRM_Abilities_royal.xml b/1.6/Royal1.6/Defs/AbilityDefs/DRM_Abilities_royal.xml
deleted file mode 100644
index c8a756a..0000000
--- a/1.6/Royal1.6/Defs/AbilityDefs/DRM_Abilities_royal.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
- 
-  <AbilityDef>
-    <defName>DRM_Skip</defName>
-    <label>skip</label>
-    <description>Teleport the target to a desired position not too far from its starting point. Objects which are too large cannot be teleported.</description>
-    <iconPath>UI/Abilities/Skip</iconPath>
-    <showPsycastEffects>False</showPsycastEffects>
-    <cooldownTicksRange>1800</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <label>skip</label>
-      <warmupTime>0.25</warmupTime>
-      <range>30</range>
-      <targetParams>
-        <canTargetSelf>True</canTargetSelf>
-        <canTargetAnimals>True</canTargetAnimals>
-        <canTargetItems>True</canTargetItems>
-      </targetParams>
-    </verbProperties>
-    <comps>
-      <li Class="CompProperties_AbilityTeleport">
-        <compClass>CompAbilityEffect_Teleport</compClass>
-        <destination>Selected</destination>
-        <requiresLineOfSight>True</requiresLineOfSight>
-        <range>30</range>
-        <clamorType>Ability</clamorType>
-        <clamorRadius>10</clamorRadius>
-        <destClamorType>Ability</destClamorType>
-        <destClamorRadius>10</destClamorRadius>
-        <stunTicks>18~60</stunTicks>
-        <goodwillImpact>-15</goodwillImpact>
-        <applyGoodwillImpactToLodgers>False</applyGoodwillImpactToLodgers>
-      </li>
-    </comps>
-  </AbilityDef>
-
-  <AbilityDef>
-    <defName>DRM_Farskip</defName>
-    <label>farskip</label>
-    <description>Skip the caster, to an ally at a distant location. This can send people far across the planet, but only works if there is a willing ally on the other side to use as a navigation beacon. The skipped people will always appear near a random ally on the target map.</description>
-    <iconPath>UI/Abilities/Farskip</iconPath>
-    <targetWorldCell>True</targetWorldCell>
-    <showGizmoOnWorldView>True</showGizmoOnWorldView>
-    <hostile>false</hostile>
-    <cooldownTicksRange>60000</cooldownTicksRange>
-    <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <label>release deadlife dust</label>
-      <warmupTime>5</warmupTime>
-      <range>0</range>
-      <drawAimPie>False</drawAimPie>
-      <requireLineOfSight>False</requireLineOfSight>
-    </verbProperties>
-    <comps>
-      <li Class="CompProperties_AbilityFarskip">
-        <stunTicks>18~60</stunTicks>
-        <clamorType>Ability</clamorType>
-        <clamorRadius>10</clamorRadius>
-      </li>
-    </comps>
-  </AbilityDef>
-
-</Defs>
\ No newline at end of file