存改冷却

.gitignore

@@ -0,0 +1 @@
+/Source/

1.5/1.5/Defs/Effects/DRM_Mote.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  
+  <ThingDef ParentName="MoteBase">
+    <defName>Mote_DRM_GraserBeamBase</defName>
+    <thingClass>MoteDualAttached</thingClass>
+    <altitudeLayer>MoteOverhead</altitudeLayer>
+    <mote>
+      <fadeInTime>0.2</fadeInTime>
+      <fadeOutTime>0.3</fadeOutTime>
+      <solidTime>999999</solidTime>
+      <needsMaintenance>True</needsMaintenance>
+      <rotateTowardsTarget>True</rotateTowardsTarget>
+      <scaleToConnectTargets>True</scaleToConnectTargets>
+      <fadeOutUnmaintained>True</fadeOutUnmaintained>
+    </mote>
+    <drawOffscreen>true</drawOffscreen>
+    <graphicData>
+      <texPath>Things/Mote/GraserBeam</texPath>
+      <graphicClass>Graphic_MoteWithAgeSecs</graphicClass>
+      <shaderType>MoteBeam</shaderType>
+      <color>(0.6, 1.0, 1.0, 1.0)</color>
+      <shaderParameters>
+        <_ExtraTexA>/Things/Mote/BeamSecondaryNoise_A</_ExtraTexA>
+        <_ExtraTexB>/Things/Mote/BeamSecondaryNoise_B</_ExtraTexB>
+        <_ScrollSpeedA>-4 </_ScrollSpeedA>
+        <_ScrollSpeedB>3</_ScrollSpeedB>
+        <_Intensity>2</_Intensity>
+      </shaderParameters>
+    </graphicData>
+  </ThingDef>
+
+  </Defs>

1.5/Bio1.5/Defs/ThingDefs/DRM_Weapon_bio.xml

@@ -67,7 +67,7 @@
 				<beamFleckChancePerTick>0.32</beamFleckChancePerTick>
 				<beamMaxDeviation>0</beamMaxDeviation>
 				<beamCurvature>0</beamCurvature>
-				<beamMoteDef>Mote_GraserBeamBase</beamMoteDef>
+				<beamMoteDef>Mote_DRM_GraserBeamBase</beamMoteDef>
 				<beamEndEffecterDef>GraserBeam_End</beamEndEffecterDef>
 				<beamChanceToStartFire>0</beamChanceToStartFire>
 				<beamChanceToAttachFire>0</beamChanceToAttachFire>

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,17 +120,14 @@
                 <hitHediff>DRM_AwakenHeart</hitHediff>
                 <hitHediffSeverity>0.5</hitHediffSeverity>
             </li>
-            <li Class="CompProperties_Biocodable"/>
-            <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>
@@ -104,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.
@@ -160,9 +203,6 @@
             </li>
         </tools>
         <comps>
-            <li>
-                <compClass>CompQuality</compClass>
-            </li>
             <li Class="DragonianMix.CompPropertiesScarletSickle_Data">
                 <sputteringRange>3</sputteringRange>
                 <sputteringNumber>5</sputteringNumber>
@@ -171,17 +211,14 @@
                 <hitHediff>DRM_AwakenHeart</hitHediff>
                 <hitHediffSeverity>0.5</hitHediffSeverity>
             </li>
-            <li Class="CompProperties_Biocodable"/>
-            <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>

1.6/1.6/Defs/AbilityDefs/DRM_Abilities.xml

@@ -157,6 +157,7 @@
       <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
         <damageDef>DRM_Feargas</damageDef>
         <smokeRadius>9</smokeRadius>
+        <explosionSound>Explosion_Smoke</explosionSound>
         <clamorType>Ability</clamorType>
         <clamorRadius>20</clamorRadius>
         <postExplosionSpawnThingDef>DRM_FearGasCloud</postExplosionSpawnThingDef>        <!-- ARL_ToxicGasCloud -->
@@ -259,6 +260,7 @@
         <damageAmount>25</damageAmount>
         <armorPenetration>0.5</armorPenetration>
         <smokeRadius>9</smokeRadius>
+        <explosionSound>Explosion_Smoke</explosionSound>
         <clamorType>Ability</clamorType>
         <clamorRadius>20</clamorRadius>
         <postExplosionSpawnThingDef>DRM_AcidGasCloud</postExplosionSpawnThingDef>        <!-- ARL_ToxicGasCloud -->
@@ -297,6 +299,7 @@
         <damageAmount>20</damageAmount>
         <armorPenetration>0.5</armorPenetration>
         <smokeRadius>6</smokeRadius>
+        <explosionSound>Explosion_Smoke</explosionSound>
         <clamorType>Ability</clamorType>
         <clamorRadius>20</clamorRadius>
         <postExplosionSpawnThingDef>DRM_FrostGasCloud_Ex</postExplosionSpawnThingDef>        <!-- ARL_ToxicGasCloud -->

1.6/1.6/Defs/Damage_Defs/DRM_Damages.xml

@@ -192,6 +192,23 @@
 		<stunAdaptationTicks>120</stunAdaptationTicks>
 	</DamageDef>
 
+	<DamageDef>
+		<defName>DRM_Rot</defName>
+		<label>rotting</label>
+		<additionalHediffs>
+			<li>
+				<hediff>DRM_NecroticVirus</hediff>
+				<severityPerDamageDealt>0.04</severityPerDamageDealt>
+			</li>
+		</additionalHediffs>
+		<hasForcefulImpact>false</hasForcefulImpact>
+		<makesBlood>false</makesBlood>
+		<canInterruptJobs>false</canInterruptJobs>
+		<workerClass>DamageWorker_AddInjury</workerClass>
+		<deathMessage>{0} died from metabolic disruptions caused by flesh rotten.</deathMessage>
+		<hediff>DRM_Rotten</hediff>
+	</DamageDef>
+
 	<DamageDef ParentName="Flame">
 		<defName>DRM_AcidBurn</defName>
 		<label>acid burn</label>

1.6/1.6/Defs/Effects/DRM_Mote.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  
+  <ThingDef ParentName="MoteBase">
+    <defName>Mote_DRM_GraserBeamBase</defName>
+    <thingClass>MoteDualAttached</thingClass>
+    <altitudeLayer>MoteOverhead</altitudeLayer>
+    <mote>
+      <fadeInTime>0.2</fadeInTime>
+      <fadeOutTime>0.3</fadeOutTime>
+      <solidTime>999999</solidTime>
+      <needsMaintenance>True</needsMaintenance>
+      <rotateTowardsTarget>True</rotateTowardsTarget>
+      <scaleToConnectTargets>True</scaleToConnectTargets>
+      <fadeOutUnmaintained>True</fadeOutUnmaintained>
+    </mote>
+    <drawOffscreen>true</drawOffscreen>
+    <graphicData>
+      <texPath>Things/Mote/GraserBeam</texPath>
+      <graphicClass>Graphic_MoteWithAgeSecs</graphicClass>
+      <shaderType>MoteBeam</shaderType>
+      <color>(0.6, 1.0, 1.0, 1.0)</color>
+      <shaderParameters>
+        <_ExtraTexA>/Things/Mote/BeamSecondaryNoise_A</_ExtraTexA>
+        <_ExtraTexB>/Things/Mote/BeamSecondaryNoise_B</_ExtraTexB>
+        <_ScrollSpeedA>-4 </_ScrollSpeedA>
+        <_ScrollSpeedB>3</_ScrollSpeedB>
+        <_Intensity>2</_Intensity>
+      </shaderParameters>
+    </graphicData>
+  </ThingDef>
+
+  </Defs>

1.6/1.6/Defs/HediffDefs/DRM_Hediffs_Damage_Effects.xml

@@ -991,4 +991,61 @@
 		</stages>
 	</HediffDef>
 
+	<HediffDef>
+		<defName>DRM_NecroticVirus</defName>
+		<hediffClass>DragonianMix.Hediff_NecroticVirus</hediffClass>
+		<label>死灵病毒</label>
+		<description>一种致命的纳米病毒，感染者死亡后将转变为敌对的蹒跚怪。</description>
+		<defaultLabelColor>(1, 1, 0.8)</defaultLabelColor>
+		<isBad>true</isBad>
+		<lethalSeverity>0.95</lethalSeverity>
+		<makesSickThought>true</makesSickThought>
+		<comps>
+			<li Class="HediffCompProperties_SeverityPerDay">
+				<severityPerDay>-4</severityPerDay>
+			</li>
+		</comps>
+		<stages>
+			<li>
+				<label>潜伏期</label>
+				<becomeVisible>true</becomeVisible>
+				<vomitMtbDays>5</vomitMtbDays>
+			</li>
+			<li>
+				<label>活跃期</label>
+				<minSeverity>0.5</minSeverity>
+				<lifeThreatening>true</lifeThreatening>
+				<vomitMtbDays>1</vomitMtbDays>
+				<painFactor>1.5</painFactor>
+			</li>
+			<li>
+				<label>终末期</label>
+				<minSeverity>0.75</minSeverity>
+				<deathMtbDays>0.5</deathMtbDays>
+				<painFactor>2.0</painFactor>
+				<capMods>
+					<li>
+						<capacity>Consciousness</capacity>
+						<setMax>0.7</setMax>
+					</li>
+				</capMods>
+			</li>
+		</stages>
+	</HediffDef>
+
+	<HediffDef ParentName="BurnBase">
+		<defName>DRM_Rotten</defName>
+		<label>Rotten</label>
+		<labelNoun>a Rotten part</labelNoun>
+		<labelNounPretty>Rotten {1}</labelNounPretty>
+		<description>This part of body has Rotten.</description>
+		<defaultLabelColor>(0.5, 0.5, 0.5)</defaultLabelColor>
+		<displayWound>false</displayWound>
+		<injuryProps>
+			<averagePainPerSeverityPermanent>0.00625</averagePainPerSeverityPermanent>
+			<destroyedLabel>Rotten</destroyedLabel>
+			<alwaysUseDestroyedLabel>true</alwaysUseDestroyedLabel>
+		</injuryProps>
+	</HediffDef>
+
 </Defs>

1.6/1.6/Defs/ThingDefs/DRM_Weapon.xml

@@ -75,6 +75,9 @@
 				<chanceFactor>10</chanceFactor>
 			</li>
 		</tools>
+		<equippedStatOffsets>
+			<DR_DragonSculptureR>1</DR_DragonSculptureR>
+		</equippedStatOffsets>
 		<meleeHitSound>DRHammerSound</meleeHitSound>
 	</ThingDef>
 
@@ -279,6 +282,9 @@
 				<chanceFactor>10</chanceFactor>
 			</li>
 		</tools>
+		<equippedStatOffsets>
+			<DR_DragonSculptureR>1</DR_DragonSculptureR>
+		</equippedStatOffsets>
 		<meleeHitSound>DRHammerSound</meleeHitSound>
 	</ThingDef>
 

1.6/1.6/Defs/ThingDefs/DRM_Weapon_Gun.xml

@@ -43,7 +43,7 @@
 				<verbClass>DragonianMix.Verb_ShootShotgun</verbClass>
 				<hasStandardCommand>true</hasStandardCommand>
 				<defaultProjectile>DRM_Bullet_RifledFlintlock</defaultProjectile>
-				<warmupTime>1.5</warmupTime>
+				<warmupTime>3</warmupTime>
 				<range>36.9</range>
 				<burstShotCount>2</burstShotCount>
 				<ticksBetweenBurstShots>16</ticksBetweenBurstShots>
@@ -71,6 +71,9 @@
         <cooldownTime>2</cooldownTime>
       </li>
     </tools>
+    <equippedStatOffsets>
+			<DR_DragonSculptureR>1</DR_DragonSculptureR>
+		</equippedStatOffsets>
   </ThingDef>
 
     <ThingDef ParentName="BaseBullet">
@@ -157,7 +160,7 @@
 				<verbClass>DragonianMix.Verb_ShootShotgun</verbClass>
 				<hasStandardCommand>true</hasStandardCommand>
 				<defaultProjectile>DRM_Bullet_Revolver</defaultProjectile>
-        <warmupTime>1.6</warmupTime>
+        <warmupTime>3</warmupTime>
         <range>25.9</range>
 				<burstShotCount>1</burstShotCount>
 				<ticksBetweenBurstShots>16</ticksBetweenBurstShots>
@@ -185,6 +188,9 @@
         <cooldownTime>2</cooldownTime>
       </li>
     </tools>
+    <equippedStatOffsets>
+			<DR_DragonSculptureR>1</DR_DragonSculptureR>
+		</equippedStatOffsets>
   </ThingDef>
 
 </Defs>

1.6/1.6/Defs/ThingDefs/DRM_Weapon_Spear.xml

@@ -71,6 +71,9 @@
 				<cooldownTime>2</cooldownTime>
 			</li>
 		</tools>
+		<equippedStatOffsets>
+			<DR_DragonSculptureR>1</DR_DragonSculptureR>
+		</equippedStatOffsets>
 	</ThingDef>
 
 	<ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
@@ -145,6 +148,9 @@
 				<cooldownTime>2</cooldownTime>
 			</li>
 		</tools>
+		<equippedStatOffsets>
+			<DR_DragonSculptureR>1</DR_DragonSculptureR>
+		</equippedStatOffsets>
 	</ThingDef>
 
 	<ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
@@ -220,6 +226,9 @@
 				<cooldownTime>2</cooldownTime>
 			</li>
 		</tools>
+		<equippedStatOffsets>
+			<DR_DragonSculptureR>1</DR_DragonSculptureR>
+		</equippedStatOffsets>
 	</ThingDef>
 
 	<ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
@@ -294,6 +303,9 @@
 				<cooldownTime>2</cooldownTime>
 			</li>
 		</tools>
+		<equippedStatOffsets>
+			<DR_DragonSculptureR>1</DR_DragonSculptureR>
+		</equippedStatOffsets>
 	</ThingDef>
 
 	<ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
@@ -369,6 +381,9 @@
 				<cooldownTime>2</cooldownTime>
 			</li>
 		</tools>
+		<equippedStatOffsets>
+			<DR_DragonSculptureR>1</DR_DragonSculptureR>
+		</equippedStatOffsets>
 	</ThingDef>
 
 	<ThingDef ParentName="BaseProjectileNeolithic">

1.6/1.6/Defs/ThingDefs/DRM_Weapon_Stuff.xml

@@ -54,7 +54,7 @@
 				<verbClass>Verb_Shoot</verbClass>
 				<hasStandardCommand>true</hasStandardCommand>
 				<defaultProjectile>DRM_Bullet_AirCannon</defaultProjectile>
-				<warmupTime>2.4</warmupTime>
+				<warmupTime>10</warmupTime>
 				<range>23.9</range>
 				<isMortar>true</isMortar>
 				<requireLineOfSight>false</requireLineOfSight>
@@ -102,20 +102,23 @@
 		<equippedStatOffsets>
 			<PsychicSensitivityOffset MayRequire="Ludeon.Rimworld.Royalty">0.50</PsychicSensitivityOffset>
 			<PsychicEntropyRecoveryRate MayRequire="Ludeon.Rimworld.Royalty">0.083</PsychicEntropyRecoveryRate>
+			<DR_DragonSculptureR>1</DR_DragonSculptureR>
 		</equippedStatOffsets>
 		<meleeHitSound>DRHammerSound</meleeHitSound>
 	</ThingDef>
 
 	<ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
-		<defName>DR_BattleStaff_AcidAir</defName>
+		<defName>DR_GreatBow_Acid</defName>
-		<label>Dragonian AcidAirCannon Staff</label>
+		<label>Dragonian Acid javelin thrower</label>
-		<description>A Staff for Dragonian.Can Shoot AcidAirCannon.</description>
+		<description>A GreatBow for Dragonian.Can Shoot AcidSpear.</description>
 		<graphicData>
-			<texPath>Dragonian/Things/Weapon/staff</texPath>
+			<texPath>Dragonian/Things/Weapon/greatbow</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<shaderType>CutoutComplex</shaderType>
+			<drawSize>1.54</drawSize>
 		</graphicData>
-		<uiIconScale>1</uiIconScale>
+		<uiIconScale>0.72</uiIconScale>
+		<soundInteract>Bow_Large</soundInteract>
+		<equippedAngleOffset>40</equippedAngleOffset>
 		<techLevel>Medieval</techLevel>
 		<statBases>
 			<WorkToMake>12000</WorkToMake>
@@ -141,8 +144,8 @@
 				<Crafting>10</Crafting>
 			</skillRequirements>
 			<researchPrerequisites>
-				<li>DragonianMeleeWeapon</li>
+				<li>DragonianRangedWeapon</li>
-				<li>DragonianWandMagic</li>
+				<li>DragonianEnhancedWeapon</li>
 			</researchPrerequisites>
 		</recipeMaker>
 		<weaponTags>
@@ -158,16 +161,15 @@
 			<li>
 				<verbClass>Verb_Shoot</verbClass>
 				<hasStandardCommand>true</hasStandardCommand>
-				<defaultProjectile>DRM_Bullet_AcidAirCannon</defaultProjectile>
+				<defaultProjectile>DRM_Bullet_Acidjavelin</defaultProjectile>
-				<warmupTime>2.4</warmupTime>
+				<warmupTime>10</warmupTime>
 				<range>29.9</range>
 				<isMortar>true</isMortar>
 				<requireLineOfSight>false</requireLineOfSight>
 				<forcedMissRadius>1.9</forcedMissRadius>
 				<burstShotCount>3</burstShotCount>
 				<ticksBetweenBurstShots>16</ticksBetweenBurstShots>
-				<soundCast>Shot_IncendiaryLauncher</soundCast>
+				<soundCast>DRBowSound</soundCast>
-				<soundCastTail>GunTail_Medium</soundCastTail>
 				<muzzleFlashScale>14</muzzleFlashScale>
 				<targetParams>
 					<canTargetLocations>true</canTargetLocations>
@@ -176,7 +178,7 @@
 		</verbs>
 		<tools>
 			<li>
-				<label>handle</label>
+				<label>Spear</label>
 				<capacities>
 					<li>Poke</li>
 				</capacities>
@@ -192,7 +194,7 @@
 				<power>15</power>
 				<extraMeleeDamages>
 					<li>
-						<def>DRM_Arc</def>
+						<def>DRM_Damage_AcidCover_Ex</def>
 						<amount>15</amount>
 						<chance>1</chance>
 					</li>
@@ -205,11 +207,12 @@
 				<cooldownTime>5.2</cooldownTime>
 			</li>
 		</tools>
+		<rotateInShelves>false</rotateInShelves>
 		<equippedStatOffsets>
 			<PsychicSensitivityOffset MayRequire="Ludeon.Rimworld.Royalty">0.50</PsychicSensitivityOffset>
 			<PsychicEntropyRecoveryRate MayRequire="Ludeon.Rimworld.Royalty">0.083</PsychicEntropyRecoveryRate>
+			<DR_DragonSculptureR>1</DR_DragonSculptureR>
 		</equippedStatOffsets>
-		<meleeHitSound>DRHammerSound</meleeHitSound>
 	</ThingDef>
 
 	<ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
@@ -265,7 +268,7 @@
 				<verbClass>Verb_Shoot</verbClass>
 				<hasStandardCommand>true</hasStandardCommand>
 				<defaultProjectile>DRM_Bullet_FeargasLauncher</defaultProjectile>
-				<warmupTime>3.5</warmupTime>
+				<warmupTime>10</warmupTime>
 				<range>23.9</range>
 				<forcedMissRadius>1.9</forcedMissRadius>
 				<burstShotCount>1</burstShotCount>
@@ -311,6 +314,7 @@
 		<equippedStatOffsets>
 			<PsychicSensitivityOffset MayRequire="Ludeon.Rimworld.Royalty">0.50</PsychicSensitivityOffset>
 			<PsychicEntropyRecoveryRate MayRequire="Ludeon.Rimworld.Royalty">0.083</PsychicEntropyRecoveryRate>
+			<DR_DragonSculptureR>1</DR_DragonSculptureR>
 		</equippedStatOffsets>
 		<meleeHitSound>DRHammerSound</meleeHitSound>
 	</ThingDef>
@@ -348,13 +352,13 @@
 	</ThingDef>
 
 	<ThingDef ParentName="BaseBullet">
-		<defName>DRM_Bullet_AcidAirCannon</defName>
+		<defName>DRM_Bullet_Acidjavelin</defName>
-		<label>AcidAirCannon shell</label>
+		<label>Acidjavelin</label>
 		<graphicData>
-			<texPath>Things/Projectile/LauncherShot</texPath>
+		  <texPath>Dragonian/Things/Weapon/spear</texPath>
 		  <graphicClass>Graphic_Single</graphicClass>
 		  <shaderType>TransparentPostLight</shaderType>
-			<color>(111,111,111)</color>
+		  <drawSize>1.9</drawSize>
 		</graphicData>
 		<projectile>
 			<damageDef>DRM_Damage_AcidCover_Ex</damageDef>
@@ -370,19 +374,24 @@
 				<!-- 主爆炸参数 -->
 				<customDamageDef>DRM_Damage_AcidCover_Ex</customDamageDef>
 				<customDamageAmount>5</customDamageAmount>
-				<customExplosionRadius>1.1</customExplosionRadius>
+				<customExplosionRadius>2.1</customExplosionRadius>
 				<customSoundExplode>ThumpCannon_Impact</customSoundExplode>
 
 				<!-- 子爆炸系统 -->
 				<useSubExplosions>true</useSubExplosions>
-				<subExplosionCount>2</subExplosionCount>
+				<subExplosionCount>3</subExplosionCount>
 				<subExplosionRadius>1.1</subExplosionRadius>
 				<subExplosionDamage>5</subExplosionDamage>
-				<subExplosionSpread>3</subExplosionSpread>
+				<subExplosionSpread>6</subExplosionSpread>
 				<subDamageDef>DRM_Damage_AcidCover_Ex</subDamageDef>
 				<subSoundExplode>ThumpCannon_Impact</subSoundExplode>
 			</li>
 		</modExtensions>
+		<comps>
+			<li Class="CompProperties_ProjectileEffecter">
+				<effecterDef>DR_Shell_AirStream</effecterDef>
+			</li>
+		</comps>
 	</ThingDef>
 
 	<ThingDef ParentName="BaseBullet">
@@ -466,7 +475,7 @@
 				<damageDef>DRM_Arc</damageDef>
 				<damageAmount>15</damageAmount>
 				<EMPDamageAmount>20</EMPDamageAmount>
-				<warmupTime>1.5</warmupTime>
+				<warmupTime>6</warmupTime>
 				<range>24.9</range>
 				<affectedAngle>20</affectedAngle>
 				<armorPenetration>1.0</armorPenetration>
@@ -516,6 +525,7 @@
 		<equippedStatOffsets>
 			<PsychicSensitivityOffset MayRequire="Ludeon.Rimworld.Royalty">0.50</PsychicSensitivityOffset>
 			<PsychicEntropyRecoveryRate MayRequire="Ludeon.Rimworld.Royalty">0.083</PsychicEntropyRecoveryRate>
+			<DR_DragonSculptureR>1</DR_DragonSculptureR>
 		</equippedStatOffsets>
 		<meleeHitSound>DRHammerSound</meleeHitSound>
 	</ThingDef>

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

@@ -261,6 +261,15 @@
   <!-- EN: extreme -->
   <DRM_SlimeCoverd_mini.stages.completely.label>完全</DRM_SlimeCoverd_mini.stages.completely.label>
 
+    <!-- EN: decayed organ -->
+  <DRM_Rotten.label>腐坏</DRM_Rotten.label>
+  <!-- EN: This organ has completely decayed. -->
+  <DRM_Rotten.description>这个身体部件已经腐坏。</DRM_Rotten.description>
+  <!-- EN: a decayed organ -->
+  <DRM_Rotten.labelNoun>腐坏</DRM_Rotten.labelNoun>
+  <!-- EN: decayed {1} -->
+  <DRM_Rotten.labelNounPretty>腐坏{1}</DRM_Rotten.labelNounPretty>
+
 
   <DRM_Stun.label>被震撼</DRM_Stun.label>
   <DRM_Stun.description>被强大的外力冲击掀翻在地。需要一点时间振作。</DRM_Stun.description>

1.6/1.6/Languages/ChineseSimplified (简体中文)/Definjected/ThingDef/ThingDefs_DRM_Weapon.xml

@@ -28,8 +28,8 @@
   <DR_BattleStaff_Air.label>龙娘 气震法杖</DR_BattleStaff_Air.label>
   <DR_BattleStaff_Air.description>龙娘使用的法杖。一个压缩的气体发射器。能够发射对建筑伤害极大的共振气团。</DR_BattleStaff_Air.description>
 
-  <DR_BattleStaff_AcidAir.label>龙娘 酸雾法杖</DR_BattleStaff_AcidAir.label>
+  <DR_GreatBow_Acid.label>龙娘 酸雾大弓</DR_GreatBow_Acid.label>
-  <DR_BattleStaff_AcidAir.description>龙娘使用的法杖。一个压缩的气体发射器。能够发射对环境有害的酸雾气团。</DR_BattleStaff_AcidAir.description>
+  <DR_GreatBow_Acid.description>龙娘使用的大弓。装载能够产生酸雾爆炸的巨矛。能够发射对环境有害的酸雾气团。</DR_GreatBow_Acid.description>
 
   <DRM_RifledFlintlock.label>龙娘 线膛燧发枪</DRM_RifledFlintlock.label>
   <DRM_RifledFlintlock.description>龙娘使用的枪械。具有古典的设计和性能。</DRM_RifledFlintlock.description>

1.6/1.6/Patches/DRM_Patch.xml

@@ -152,7 +152,7 @@
 	<Operation Class="PatchOperationSequence">
 		<operations>
 			<li Class="PatchOperationAdd">
-				<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/alienRace/generalSettings/alienPartGenerator/bodyAddons/li/extendedGraphics</xpath>
+				<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Dragonian_Race"]/alienRace/generalSettings/alienPartGenerator/bodyAddons/li/extendedGraphics/Gender[@For='Female']/extendedGraphics</xpath>
 				<value>
 					<Hediff For="DRM_Princess_Mark">Dragonian/Dragonianlike/AddonHairs/DRM</Hediff>
 				</value>

1.6/1.6/Patches/DRM_Weapon_Patch.xml

@@ -78,6 +78,33 @@
 		</operations>
 	</Operation>
 
+	<Operation Class="PatchOperationSequence">
+
+		<operations>
+			<li Class="PatchOperationTest">
+				<xpath>Defs/ThingDef[defName="DR_GreatBow"]</xpath>
+
+			</li>
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="DR_GreatBow"]/weaponTags</xpath>
+				<value>
+					<weaponTags>
+						<li>DR_GreatBow</li>
+					</weaponTags>
+				</value>
+			</li>
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="DR_BattleStaff"]/recipeMaker</xpath>
+				<value>
+					<researchPrerequisites>
+						<li>DragonianRangedWeapon</li>
+						<li>DragonianEnhancedWeapon</li>
+					</researchPrerequisites>
+				</value>
+			</li>
+		</operations>
+	</Operation>
+
 	<!--龙娘武器限制删除-->
 	<Operation Class="PatchOperationSequence">
 		<operations>

1.6/Ano1.6/Defs/AbilityDefs/DRM_Abilities_ano.xml

@@ -74,6 +74,7 @@
         <damageDef>Smoke</damageDef>
         <smokeRadius>9</smokeRadius>
         <gasType>DeadlifeDust</gasType>
+        <explosionSound>Explosion_Smoke</explosionSound>
         <clamorType>Ability</clamorType>
         <clamorRadius>20</clamorRadius>
       </li>

1.6/Ano1.6/Defs/HediffDefs/DRM_Hediffs_Local_AddedParts_ano.xml

@@ -24,6 +24,15 @@
 		<addedPartProps>
 			<solid>true</solid>
 		</addedPartProps>
+		<modExtensions>
+			<li Class="DragonianMix.ProphecyGearEffect">
+				<enableHediffEffect>false</enableHediffEffect>
+
+				<extraDamageFactor>0.2</extraDamageFactor>
+				<extraDamageType>DRM_Rot</extraDamageType>
+				<armorPenetration>0.1</armorPenetration>
+			</li>
+		</modExtensions>
 		<spawnThingOnRemoved>NecroDragonianOrb</spawnThingOnRemoved>
 	</HediffDef>
 
@@ -74,6 +83,15 @@
 			<MarketValue>1000</MarketValue>
 			<Mass>0.3</Mass>
 		</statBases>
+		<modExtensions>
+			<li Class="DragonianMix.ProphecyGearEffect">
+				<enableHediffEffect>false</enableHediffEffect>
+
+				<extraDamageFactor>0.2</extraDamageFactor>
+				<extraDamageType>DRM_Rot</extraDamageType>
+				<armorPenetration>0.1</armorPenetration>
+			</li>
+		</modExtensions>
 		<thingSetMakerTags>
 			<li>RewardStandardCore</li>
 		</thingSetMakerTags>

1.6/Bio1.6/Defs/AbilityDefs/DRM_Abilities_bio.xml

@@ -26,6 +26,7 @@
       <li Class="DragonianMix.CompProperties_AbilityDRM_Deaddustpop">
         <damageDef>Smoke</damageDef>
         <smokeRadius>9</smokeRadius>
+        <explosionSound>Explosion_Smoke</explosionSound>
         <gasType>ToxGas</gasType>
         <clamorType>Ability</clamorType>
         <clamorRadius>20</clamorRadius>

1.6/Bio1.6/Defs/ThingDefs/DRM_Weapon_bio.xml

@@ -67,7 +67,7 @@
 				<beamFleckChancePerTick>0.32</beamFleckChancePerTick>
 				<beamMaxDeviation>0</beamMaxDeviation>
 				<beamCurvature>0</beamCurvature>
-				<beamMoteDef>Mote_GraserBeamBase</beamMoteDef>
+				<beamMoteDef>Mote_DRM_GraserBeamBase</beamMoteDef>
 				<beamEndEffecterDef>GraserBeam_End</beamEndEffecterDef>
 				<beamChanceToStartFire>0</beamChanceToStartFire>
 				<beamChanceToAttachFire>0</beamChanceToAttachFire>

1.6/CQF1.6/Defs/QuestEditor_Library.SpecialMapGenerator/FactionBase.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+    <QuestEditor_Library.SpecialMapGenerationDef>        <!-- Replace faction settlement generation -->
+        <defName>DRM_MapGeneratioin_Unfrindly_Dragonian</defName>
+        <factionOfReplacedSettlement>Unfrindly_Dragonian</factionOfReplacedSettlement>        <!-- Replaced faction -->
+        <customMapDataTagsToReplace>            <!-- custom map data -->
+            <DRM_Base_Un>1</DRM_Base_Un>
+        </customMapDataTagsToReplace>
+    </QuestEditor_Library.SpecialMapGenerationDef>
+
+    <QuestEditor_Library.SpecialMapGenerationDef>        <!-- Replace faction settlement generation -->
+        <defName>DRM_MapGeneratioin_Dragonian</defName>
+        <factionOfReplacedSettlement>Dragonian_NPC</factionOfReplacedSettlement>        <!-- Replaced faction -->
+        <customMapDataTagsToReplace>            <!-- custom map data -->
+            <DRM_Base>1</DRM_Base>
+        </customMapDataTagsToReplace>
+    </QuestEditor_Library.SpecialMapGenerationDef>
+
+</Defs>

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,17 +120,14 @@
                 <hitHediff>DRM_AwakenHeart</hitHediff>
                 <hitHediffSeverity>0.5</hitHediffSeverity>
             </li>
-            <li Class="CompProperties_Biocodable"/>
-            <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>
@@ -104,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.
@@ -160,9 +203,6 @@
             </li>
         </tools>
         <comps>
-            <li>
-                <compClass>CompQuality</compClass>
-            </li>
             <li Class="DragonianMix.CompPropertiesScarletSickle_Data">
                 <sputteringRange>3</sputteringRange>
                 <sputteringNumber>5</sputteringNumber>
@@ -171,17 +211,14 @@
                 <hitHediff>DRM_AwakenHeart</hitHediff>
                 <hitHediffSeverity>0.5</hitHediffSeverity>
             </li>
-            <li Class="CompProperties_Biocodable"/>
-            <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>

About/About.xml

@@ -8,11 +8,10 @@
   <li>1.6</li>
   </supportedVersions>
   <packageId>kalospacer.DragonianMix</packageId>
-  <modVersion>1.6.02</modVersion><!-- prev 1.5.23 -->
+  <modVersion>1.6.04</modVersion><!-- prev 1.5.23 -->
   <modIconPath IgnoreIfNoMatchingField="True">Dragonian/Icon/viewicon</modIconPath>
   <description>
 For 1.6 needed 'Humanoid Alien Races ~ Dev' Search and subscribe it in steamworkshop.
-And Replace 'Gloomy Dragonian race/1.5/Assemblies/Dragonian.dll' with my 'Dragonian1.6.dll' that you can find in my mod root folder. For Replace I mean DELETE 'Gloomy Dragonian race/1.5/Assemblies/Dragonian.dll' AND PUT 'Dragonian1.6.dll' IN 'Gloomy Dragonian race/1.5/Assemblies' FOLDER. Then you get 'Gloomy Dragonian race/1.5/Assemblies/Dragonian1.6.dll' at end.
 Then put mod list like this:
   - Harmony
   - Core

LoadFolders.xml

@@ -20,5 +20,6 @@
       <li IfModActive="Ludeon.RimWorld.Anomaly">1.6/Ano1.6</li>
       <li IfModActive="Ludeon.RimWorld.Biotech">1.6/Bio1.6</li>
       <li IfModActive="Ludeon.RimWorld.Royalty">1.6/Royal1.6</li>
+      <li IfModActive="hailuan.customquestframework">1.6/CQF1.6</li>
     </v1.6>
 </loadFolders>