Merge branch 'master' of https://cloud.armorrush.com/Kalospacer/dragonianmix-rimworld-mod

1.5/Defs/AbilityDefs/DR_Abilities.xml

@@ -13,6 +13,9 @@
         <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>
@@ -31,4 +34,34 @@
         </comps>
       </AbilityDef> 
 
+      <AbilityDef ParentName="RoleAuraBuffBase">
+        <defName>DRM_HealBreakOut</defName>
+        <label>Heal BreakOut</label>
+        <description>Overdrive orbs.Heal wound in insane speed.</description>
+        <iconPath>UI/Abilities/UnnaturalHealing</iconPath>
+        <warmupMoteSocialSymbol>UI/Abilities/UnnaturalHealing</warmupMoteSocialSymbol>
+        <cooldownTicksRange>60000</cooldownTicksRange>
+        <sendMessageOnCooldownComplete>true</sendMessageOnCooldownComplete>
+        <aiCanUse>true</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>

1.5/Defs/Dragonianlike/HediffDefs/Hediffs_Local_AddedParts.xml

@@ -257,15 +257,15 @@
 		<labelNoun>a Hyperheal DragonianOrb.</labelNoun>
 		<description>An installed Hyperheal DragonianOrb.</description>
 		<priceImpact>false</priceImpact>
+		<abilities>
+			<li>DRM_HealBreakOut</li>
+		</abilities>
 		<keepOnBodyPartRestoration>True</keepOnBodyPartRestoration>
 		<stages>
 		  <li>
 			<minSeverity>0</minSeverity>
 			<regeneration>300</regeneration>
 			<showRegenerationStat>false</showRegenerationStat>
-			<statOffsets>
-			  <PainShockThreshold>10</PainShockThreshold>
-			</statOffsets>
 		  </li>
 		</stages>
 		<addedPartProps>
@@ -274,6 +274,29 @@
 		<spawnThingOnRemoved>HyperhealDragonianOrb</spawnThingOnRemoved>
 	  </HediffDef>
 
+  	<HediffDef ParentName="RoleStatBuff">
+  	  <defName>DRM_HealBreakOut</defName>
+  	  <label>Heal BreakOut</label>
+  	  <description>This person is in healbreakout.Heal wound in insane speed.</description>
+  	  <hediffClass>HediffWithComps</hediffClass>
+  	  <stages>
+  	    <li>
+			<minSeverity>0</minSeverity>
+			<regeneration>10000</regeneration>
+			<showRegenerationStat>false</showRegenerationStat>
+  	      <painFactor>0.1</painFactor>
+  	    </li>
+  	  </stages>
+  	  <comps>
+  	    <li Class="HediffCompProperties_Disappears">
+  	      <showRemainingTime>True</showRemainingTime>
+  	      <disappearsAfterTicks>15000</disappearsAfterTicks>
+  	    </li>
+  	    <li Class="HediffCompProperties_DisappearsOnDeath"/>
+  	  </comps>
+  	  <isBad>false</isBad>
+  	</HediffDef>
+
 	<ThingDef ParentName="BodyPartDROrbsBase">
 	  <defName>HyperhealDragonianOrb</defName>
 	  <label>Hyperheal DragonianOrb</label>

1.5/Defs/ThingDefs/DRM_Apparel.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-  <ThingDef Name="DRM_ApparelArmorReconBase" ParentName="ArmorMachineableBase" Abstract="True">
+  <ThingDef Name="DRM_ApparelArmorBase" ParentName="ApparelBase" Abstract="True">
     <recipeMaker>
 			<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
 			<workSkill>Crafting</workSkill>
@@ -65,7 +65,7 @@
     </thingSetMakerTags>
   </ThingDef>
 
-  <ThingDef Name="DRM_ApparelArmorHelmetReconBase" ParentName="ArmorHelmetMakeableBase" Abstract="True">
+  <ThingDef Name="DRM_ApparelArmorHelmetBase" ParentName="ApparelBase" Abstract="True">
     <recipeMaker>
 			<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
 			<workSkill>Crafting</workSkill>
@@ -97,9 +97,11 @@
       <Insulation_Heat>2</Insulation_Heat>
       <EquipDelay>1.5</EquipDelay>
     </statBases>
+    <thingCategories>
+      <li>ArmorHeadgear</li>
+    </thingCategories>
     <costList>
-      <WoolDragonian>20</WoolDragonian>
-      <Plasteel>30</Plasteel>
+      <Plasteel>25</Plasteel>
     </costList>
     <apparel>
       <bodyPartGroups>
@@ -112,6 +114,7 @@
       <defaultOutfitTags>
         <li>Soldier</li>
       </defaultOutfitTags>
+      <parentTagDef>ApparelHead</parentTagDef>
     </apparel>
     <comps>
       <li Class="CompProperties_Biocodable"/>
@@ -121,7 +124,7 @@
     </thingSetMakerTags>
   </ThingDef>
 
-  <ThingDef ParentName="DRM_ApparelArmorReconBase">
+  <ThingDef ParentName="DRM_ApparelArmorBase">
     <defName>DRM_BattleDressC</defName>
     <label>dragonian Battle dress c</label>
     <description>Lightweight armor with plate on the dress.Upgrade with Plasteel.</description>
@@ -131,21 +134,44 @@
         <li>DRM_BattleDressC</li>
 			</tags>
     </apparel>
+		<comps>
+			<li Class="CompProperties_CauseHediff_Apparel">
+				<hediff>DRM_KnightForce</hediff>
+			</li>
+		</comps>
   </ThingDef>
 
-  <ThingDef ParentName="DRM_ApparelArmorHelmetReconBase">
+  <HediffDef>
+		<defName>DRM_KnightForce</defName>
+		<label>KnightForce</label>
+		<description>Can't be knock back.This person is fully prepared.</description>
+		<hediffClass>HediffWithComps</hediffClass>
+    <stages>
+      <li>
+        <statFactors>
+          <StaggerDurationFactor>0</StaggerDurationFactor>
+        </statFactors>
+      </li>
+    </stages>
+		<comps>
+		  <li Class="HediffCompProperties_RemoveIfApparelDropped" />
+		</comps>
+		<isBad>false</isBad>
+	</HediffDef>
+
+  <ThingDef ParentName="DRM_ApparelArmorHelmetBase">
     <defName>DRM_BattleHelmC</defName>
     <label>dragonian battle helm C</label>
     <description>A lightweight battle helm with a complex design.Can protect Full Head.</description>
     <apparel>
 			<tags>
 				<li>DR_Armor</li>
-        <li>DRM_BattleHelmD</li>
+        <li>DRM_BattleHelmC</li>
 			</tags>
     </apparel>
   </ThingDef>
 
-  <ThingDef ParentName="DRM_ApparelArmorHelmetReconBase">
+  <ThingDef ParentName="DRM_ApparelArmorHelmetBase">
 		<defName>DRM_BattleHelmD</defName>
 		<label>dragonian battle helm D</label>
 		<description>A lightweight battle helm with a complex design.Can protect Full Head.</description>

1.5/Languages/ChineseSimplified (简体中文)/AbilityDef/Abilities.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LanguageData> 
+  
+  <DRM_HealBreakOut.label>超再生爆发</DRM_HealBreakOut.label>
+  <DRM_HealBreakOut.description>短时间超载龙珠。提供极度异常的再生速度。</DRM_HealBreakOut.description>
+
+  <DR_FireBurst.label>火焰喷发</DR_FireBurst.label>
+  <DR_FireBurst.description>向附近喷发易燃液体，在地面形成易燃区域。</DR_FireBurst.description>
+
+</LanguageData>

1.5/Languages/ChineseSimplified (简体中文)/Definjected/HediffDef/Hediffs_DRM_BodyParts.xml

@@ -29,4 +29,10 @@
   <HardenDragonianOrb.description>一颗龙珠。硬起来吧！</HardenDragonianOrb.description>
   <HardenDragonianOrb.labelNoun>硬化龙珠</HardenDragonianOrb.labelNoun>
   
+  <DRM_KnightForce.label>骑士之力</DRM_KnightForce.label>
+  <DRM_KnightForce.description>这个人已经完全准备就绪。无法被击退。</DRM_KnightForce.description>
+
+  <DRM_HealBreakOut.label>超再生爆发</DRM_HealBreakOut.label>
+  <DRM_HealBreakOut.description>这个人正处于超再生爆发状态。伤势以极度异常的速度愈合。</DRM_HealBreakOut.description>
+  
 </LanguageData>