diff --git a/1.5/Defs/AbilityDefs/DR_Abilities.xml b/1.5/Defs/AbilityDefs/DR_Abilities.xml
index 3f7097f..bd23a0d 100644
--- a/1.5/Defs/AbilityDefs/DR_Abilities.xml
+++ b/1.5/Defs/AbilityDefs/DR_Abilities.xml
@@ -69,7 +69,7 @@
         <label>BattleStaff burner</label>
         <description>Use terra magic to create a massive cone of flame.</description>
         <iconPath>UI/Abilities/Burner</iconPath>
-        <cooldownTicksRange>600</cooldownTicksRange>
+        <cooldownTicksRange>900</cooldownTicksRange>
         <aiCanUse>true</aiCanUse>
         <ai_IsIncendiary>true</ai_IsIncendiary>
         <warmupStartSound>FireSpew_Warmup</warmupStartSound>
diff --git a/1.5/Defs/Backstory/BackstoryDef_Special.xml b/1.5/Defs/Backstory/BackstoryDef_Special.xml
index 0abb2e5..1c9d8c3 100644
--- a/1.5/Defs/Backstory/BackstoryDef_Special.xml
+++ b/1.5/Defs/Backstory/BackstoryDef_Special.xml
@@ -214,6 +214,10 @@
 		<titleShort>Dragonian Necromancer</titleShort>
 		<baseDesc>[PAWN_nameDef] is Dragonian Necromancer.\nNot been identified,she is so mysterious that nobody knows she is live or dead.</baseDesc>
 		<slot>Adulthood</slot>
+
+		<forcedHediffs>
+			<li>DRM_SummonSickness</li>
+		</forcedHediffs>
 		
 		<spawnCategories>
 			<li>Dragonian_Necromancer</li>
diff --git a/1.5/Defs/Dragonianlike/HediffDefs/Hediffs_Local_AddedParts.xml b/1.5/Defs/Dragonianlike/HediffDefs/Hediffs_Local_AddedParts.xml
index bae032a..5bb3515 100644
--- a/1.5/Defs/Dragonianlike/HediffDefs/Hediffs_Local_AddedParts.xml
+++ b/1.5/Defs/Dragonianlike/HediffDefs/Hediffs_Local_AddedParts.xml
@@ -125,6 +125,7 @@
 		<priceImpact>false</priceImpact>
 		<abilities>
 			<li>DR_FireBurst</li>
+			<li>DR_BattleStaffBurner</li>
 		</abilities>
 		<addedPartProps>
 		  <solid>true</solid>
diff --git a/1.5/Defs/Dragonianlike/PawnKinds/PawnKinds_Dragonian_NPC.xml b/1.5/Defs/Dragonianlike/PawnKinds/PawnKinds_Dragonian_NPC.xml
index a638f37..45abd87 100644
--- a/1.5/Defs/Dragonianlike/PawnKinds/PawnKinds_Dragonian_NPC.xml
+++ b/1.5/Defs/Dragonianlike/PawnKinds/PawnKinds_Dragonian_NPC.xml
@@ -32,7 +32,6 @@
     <itemQuality>Poor</itemQuality>
     
     <apparelTags>
-      <li>DR_Apparel</li>
       <li>DR_Basic</li>
     </apparelTags>
     <gearHealthRange>0.2~2.0</gearHealthRange>
@@ -81,9 +80,6 @@
    
     <apparelTags>
       <li>DR_Apparel</li>
-      <li>DR_BattleDress</li>
-      <li>DR_BattleHelm</li>
-      <li>RoyalCombatGear</li>
     </apparelTags>
     <gearHealthRange>0.6~2</gearHealthRange>
     <apparelMoney>
@@ -92,22 +88,6 @@
     </apparelMoney>
     <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
 
-    <specificApparelRequirements>
-      <li>
-        <bodyPartGroup>Torso</bodyPartGroup>
-        <requiredTag>DR_BattleDress</requiredTag>
-      </li>
-      <li>
-        <bodyPartGroup>UpperHead</bodyPartGroup>
-        <requiredTag>DR_BattleHelm</requiredTag>
-      </li>
-    </specificApparelRequirements>
-
-    <apparelRequired>
-      <li>DR_BattleDress</li>
-      <li>DR_BattleHelmA</li>
-    </apparelRequired>
-
     <weaponTags>
       <li>DR_BattleMace</li>
     </weaponTags>
@@ -156,9 +136,6 @@
    
     <apparelTags>
       <li>DR_Apparel</li>
-      <li>DR_BattleDress</li>
-      <li>DR_BattleHelm</li>
-      <li>RoyalCombatGear</li>
     </apparelTags>
     <gearHealthRange>0.6~2</gearHealthRange>
     <apparelMoney>
@@ -167,22 +144,6 @@
     </apparelMoney>
     <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
 
-    <specificApparelRequirements>
-      <li>
-        <bodyPartGroup>Torso</bodyPartGroup>
-        <requiredTag>DR_BattleDress</requiredTag>
-      </li>
-      <li>
-        <bodyPartGroup>UpperHead</bodyPartGroup>
-        <requiredTag>DR_BattleHelm</requiredTag>
-      </li>
-    </specificApparelRequirements>
-
-    <apparelRequired>
-      <li>DR_BattleDress</li>
-      <li>DR_BattleHelmB</li>
-    </apparelRequired>
-
     <weaponTags>
       <li>Gun</li>
       <li>LongShots</li>
@@ -233,9 +194,6 @@
 
     <apparelTags>
       <li>DR_Apparel</li>
-      <li>DR_BattleDress</li>
-      <li>DR_BattleHelm</li>
-      <li>RoyalCombatGear</li>
     </apparelTags>
     <gearHealthRange>1~1</gearHealthRange>
     <apparelMoney>
@@ -244,22 +202,6 @@
     </apparelMoney>
     <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
 
-    <specificApparelRequirements>
-      <li>
-        <bodyPartGroup>Torso</bodyPartGroup>
-        <requiredTag>DR_BattleDress</requiredTag>
-      </li>
-      <li>
-        <bodyPartGroup>UpperHead</bodyPartGroup>
-        <requiredTag>DR_BattleHelm</requiredTag>
-      </li>
-    </specificApparelRequirements>
-
-    <apparelRequired>
-      <li>DR_BattleDress</li>
-      <li>DR_BattleHelmA</li>
-    </apparelRequired>
-
     <weaponTags>
       <li>DR_Battlesword</li>
     </weaponTags>
@@ -309,7 +251,6 @@
 
     <apparelTags>
       <li>DR_Apparel</li>
-      <li>DR_Basic</li>
     </apparelTags>
     <gearHealthRange>1~1</gearHealthRange>
     <apparelMoney>
@@ -369,10 +310,6 @@
 
     <apparelTags>
       <li>DR_Apparel</li>
-      <li>DR_PsychicDress</li>
-      <li>DR_PsychicHelm</li>
-      <li>RoyalCombatGear</li>
-      <li>DR_ProtectionOrb</li>
     </apparelTags>
 
     <gearHealthRange>1~1</gearHealthRange>
@@ -635,13 +572,11 @@
       </li>
     </backstoryFiltersOverride>
 
+    <techHediffsChance>1</techHediffsChance>
     <techHediffsMoney>600~5500</techHediffsMoney>
 	  <techHediffsTags>
       <li>DragonianOrbAdvanced</li>
     </techHediffsTags>
-    <techHediffsRequired>
-      <li>HyperhealDragonianOrb</li>
-    </techHediffsRequired>
 
     <inventoryOptions>
       <skipChance>0.70</skipChance>
@@ -725,6 +660,7 @@
       </li>
     </backstoryFiltersOverride>
 
+    <techHediffsChance>1</techHediffsChance>
     <techHediffsMoney>600~5500</techHediffsMoney>
 	  <techHediffsTags>
       <li>DragonianOrbAdvanced</li>
@@ -750,46 +686,8 @@
     <isFighter>true</isFighter>
     <itemQuality>Normal</itemQuality>
 
-    <apparelTags>
-      <li>DR_Apparel</li>
-      <li>DR_BattleDress</li>
-      <li>DR_BattleHelm</li>
-      <li>RoyalCombatGear</li>
-    </apparelTags>
-    <gearHealthRange>1~1</gearHealthRange>
-    <apparelMoney>
-      <min>1500</min>
-      <max>2500</max>
-    </apparelMoney>
-    <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
-
-    <specificApparelRequirements>
-      <li>
-        <bodyPartGroup>Torso</bodyPartGroup>
-        <requiredTag>DR_BattleDress</requiredTag>
-      </li>
-      <li>
-        <bodyPartGroup>UpperHead</bodyPartGroup>
-        <requiredTag>DR_BattleHelm</requiredTag>
-      </li>
-      <li>
-        <bodyPartGroup>Torso</bodyPartGroup>
-        <alternateTagChoices>
-          <li>
-            <tag>BeltDefenseNecro</tag>
-            <chance>1</chance>
-          </li>
-        </alternateTagChoices>
-      </li>
-    </specificApparelRequirements>
-
-    <apparelRequired>
-      <li>DR_BattleDress</li>
-      <li>DR_BattleHelmA</li>
-    </apparelRequired>
-
     <weaponTags>
-      <li>DR_Battlesword</li>
+      <li>DR_BattleStaff_Melee</li>
     </weaponTags>
     <weaponMoney>
       <min>900</min>
diff --git a/1.5/Defs/ThingDefs/DR_Weapon.xml b/1.5/Defs/ThingDefs/DR_Weapon.xml
index 66bcefa..1ad6ba2 100644
--- a/1.5/Defs/ThingDefs/DR_Weapon.xml
+++ b/1.5/Defs/ThingDefs/DR_Weapon.xml
@@ -202,7 +202,7 @@
 	<ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
 		<defName>DR_BattleStaff_Beam</defName>
 		<label>Dragonian Beam Staff</label>
-		<description>A Staff for Dragonian.</description>
+		<description>A Staff for Dragonian.Can Shoot Frozen Beam.</description>
 		<graphicData>
 			<texPath>Dragonian/Things/Weapon/staff</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -213,7 +213,12 @@
 		<statBases>
 			<WorkToMake>12000</WorkToMake>
 			<Mass>15</Mass>
-		</statBases>
+			<AccuracyTouch>0.60</AccuracyTouch>
+			<AccuracyShort>0.70</AccuracyShort>
+			<AccuracyMedium>0.65</AccuracyMedium>
+			<AccuracyLong>0.55</AccuracyLong>
+			<RangedWeapon_Cooldown>1.70</RangedWeapon_Cooldown>
+		  </statBases>
 		<equippedAngleOffset>45</equippedAngleOffset>
 		<costStuffCount>80</costStuffCount>
 		<stuffCategories>
@@ -229,7 +234,55 @@
 				<Crafting>10</Crafting>
 			</skillRequirements>
 		</recipeMaker>
-		<tools>
+		<weaponTags>
+			<li>DR_BattleStaff</li>
+		</weaponTags>
+		<thingCategories>
+			<li>WeaponsRanged</li>
+		  </thingCategories>
+		  <weaponClasses>
+			<li>Ranged</li>
+		  </weaponClasses>
+		  <verbs>
+			<li>
+			  <verbClass>Verb_ShootBeam</verbClass>
+			  <hasStandardCommand>true</hasStandardCommand>
+			  <warmupTime>1.5</warmupTime>
+			  <range>24.9</range>
+			  <minRange>3.9</minRange>
+			  <muzzleFlashScale>9</muzzleFlashScale>
+			  <soundCastTail>GunTail_Medium</soundCastTail>
+			  <soundCastBeam>BeamGraser_Shooting</soundCastBeam>
+
+			  <beamStartOffset>0.8</beamStartOffset>
+			  <beamFullWidthRange>3</beamFullWidthRange>
+			  <beamWidth>-3</beamWidth>
+			  <beamMaxDeviation>0.5</beamMaxDeviation>
+			  <beamCurvature>0.1</beamCurvature>
+			  <burstShotCount>15</burstShotCount>
+			  <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+			  <showBurstShotStats>false</showBurstShotStats>
+			  <beamFleckChancePerTick>0.32</beamFleckChancePerTick>
+			  <beamGroundFleckDef>Fleck_BeamBurn</beamGroundFleckDef>
+			  
+			  <beamDamageDef>DRM_Frostbite</beamDamageDef>
+			  <beamMoteDef>Mote_GraserBeamBase</beamMoteDef>
+			  <beamEndEffecterDef>GraserBeam_End</beamEndEffecterDef>
+			  <beamLineFleckDef>Fleck_BeamSpark</beamLineFleckDef>
+
+			  <beamChanceToStartFire>0</beamChanceToStartFire>
+			  <beamChanceToAttachFire>0</beamChanceToAttachFire>
+			  <beamFireSizeRange>0</beamFireSizeRange>
+			  <beamLineFleckChanceCurve>
+				<points>
+				  <li>(0, 0)</li>
+				  <li>(0.2, 0.1)</li>
+				  <li>(0.4, 0.2)</li>
+				</points>
+			  </beamLineFleckChanceCurve>
+			</li>
+		  </verbs>
+		  <tools>
 			<li>
 				<label>handle</label>
 				<capacities>
@@ -244,12 +297,163 @@
 					<li>Blunt</li>
 					<li>Demolish</li>
 				</capacities>
-				<power>45</power>
+				<power>15</power>
 				<extraMeleeDamages>
 					<li>
-						<def>EMP</def>
-						<amount>4.5</amount>
+						<def>DRM_Frostbite</def>
+						<amount>30</amount>
+						<chance>1</chance>
+					  </li>
+					<li>
+						<def>Stun</def>
+						<amount>1.5</amount>
+						<chance>0.25</chance>
 					</li>
+				</extraMeleeDamages>
+				<cooldownTime>5.2</cooldownTime>
+			</li>
+		</tools>
+		<equippedStatOffsets>
+			<PsychicSensitivityOffset MayRequire="Ludeon.Rimworld.Royalty">0.50</PsychicSensitivityOffset>
+			<PsychicEntropyRecoveryRate MayRequire="Ludeon.Rimworld.Royalty">0.083</PsychicEntropyRecoveryRate>
+		</equippedStatOffsets>
+		<meleeHitSound>DRHammerSound</meleeHitSound>
+	</ThingDef>
+
+	<DamageDef>
+		<defName>DRM_Frostbite</defName>
+		<label>frostbite</label>
+		<workerClass>DamageWorker_Frostbite</workerClass>
+		<externalViolence>false</externalViolence>
+		<deathMessage>{0} has succumbed to frostbite.</deathMessage>
+		<hediff>Frostbite</hediff>
+		<harmAllLayersUntilOutside>true</harmAllLayersUntilOutside>
+		<canUseDeflectMetalEffect>false</canUseDeflectMetalEffect>
+		<additionalHediffs>
+			<li>
+				<hediff>Hypothermia</hediff>
+				<severityPerDamageDealt>0.01</severityPerDamageDealt>
+			</li>
+		</additionalHediffs>
+		<armorCategory>Heat</armorCategory>
+		<isRanged>true</isRanged>
+		<makesAnimalsFlee>true</makesAnimalsFlee>
+		<defaultDamage>3</defaultDamage>
+		<defaultArmorPenetration>0</defaultArmorPenetration>
+		<buildingDamageFactorImpassable>0</buildingDamageFactorImpassable>
+		<buildingDamageFactorPassable>0</buildingDamageFactorPassable>
+	</DamageDef>
+
+	<ThingDef ParentName="BaseMeleeWeapon_Sharp_Quality">
+		<defName>DR_BattleStaff_Flare</defName>
+		<label>Dragonian Flare Staff</label>
+		<description>A Staff for Dragonian.Can Spray Fire shoot.</description>
+		<graphicData>
+			<texPath>Dragonian/Things/Weapon/staff</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>CutoutComplex</shaderType>
+		</graphicData>
+		<uiIconScale>1</uiIconScale>
+		<techLevel>Medieval</techLevel>
+		<statBases>
+			<WorkToMake>12000</WorkToMake>
+			<Mass>15</Mass>
+			<AccuracyTouch>0.60</AccuracyTouch>
+			<AccuracyShort>0.70</AccuracyShort>
+			<AccuracyMedium>0.65</AccuracyMedium>
+			<AccuracyLong>0.55</AccuracyLong>
+			<RangedWeapon_Cooldown>1.70</RangedWeapon_Cooldown>
+		  </statBases>
+		<equippedAngleOffset>45</equippedAngleOffset>
+		<costStuffCount>80</costStuffCount>
+		<stuffCategories>
+			<li>Metallic</li>
+		</stuffCategories>	
+		<costList>
+			<WoolDragonian>40</WoolDragonian>
+			<Steel>40</Steel>
+			<ComponentIndustrial>5</ComponentIndustrial>
+		</costList>	
+		<recipeMaker>
+			<skillRequirements>
+				<Crafting>10</Crafting>
+			</skillRequirements>
+		</recipeMaker>
+		<weaponTags>
+			<li>DR_BattleStaff</li>
+		</weaponTags>
+		<thingCategories>
+			<li>WeaponsRanged</li>
+		  </thingCategories>
+		  <weaponClasses>
+			<li>Ranged</li>
+		  </weaponClasses>
+		  <verbs>
+			<li>
+			  <verbClass>Verb_ArcSprayIncinerator</verbClass>
+			  <hasStandardCommand>true</hasStandardCommand>
+			  <warmupTime>0.5</warmupTime>
+			  <range>22.9</range>
+			  <minRange>5.9</minRange>
+			  <beamFullWidthRange>11</beamFullWidthRange>
+			  <burstShotCount>15</burstShotCount>
+			  <showBurstShotStats>false</showBurstShotStats>
+			  <requireLineOfSight>true</requireLineOfSight>
+			  <beamWidth>4</beamWidth>
+			  <ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			  <beamDamageDef>Flame</beamDamageDef>
+			  <soundCastTail>GunTail_Medium</soundCastTail>
+			  <muzzleFlashScale>9</muzzleFlashScale>
+			  <soundCastBeam>Flamethrower_Firing</soundCastBeam>
+			  <beamGroundFleckDef>Fleck_IncineratorBeamBurn</beamGroundFleckDef>
+			  <beamFleckChancePerTick>0.32</beamFleckChancePerTick>
+			  <beamMaxDeviation>0.5</beamMaxDeviation>
+			  <beamCurvature>0</beamCurvature>
+			  <beamEndEffecterDef>IncineratorBeam_End</beamEndEffecterDef> 
+			  <beamChanceToStartFire>0.1</beamChanceToStartFire>
+			  <beamFireSizeRange>0.55~0.85</beamFireSizeRange>
+			  <beamHitsNeighborCells>true</beamHitsNeighborCells>
+			  <beamCantHitWithinMinRange>true</beamCantHitWithinMinRange>
+			  <beamHitsNeighborCellsRequiresLOS>true</beamHitsNeighborCellsRequiresLOS>
+			  <beamSetsGroundOnFire>true</beamSetsGroundOnFire>
+			  <ai_BeamIsIncendiary>true</ai_BeamIsIncendiary>
+			  <highlightColor>(180, 60, 10)</highlightColor>
+			  <secondaryHighlightColor>(220, 210, 20)</secondaryHighlightColor>
+			  <targetParams>
+				<canTargetLocations>true</canTargetLocations>
+			  </targetParams>
+			  <flammabilityAttachFireChanceCurve>
+				<points>
+				  <li>(0.6, 0)</li>
+				  <li>(0.7, 0.2)</li>
+				  <li>(1.2, 0.8)</li>
+				</points>
+			  </flammabilityAttachFireChanceCurve>
+			  <rangedFireRulepack>Combat_RangedFlamethrower</rangedFireRulepack>
+			</li>
+		  </verbs>
+		  <tools>
+			<li>
+				<label>handle</label>
+				<capacities>
+					<li>Poke</li>
+				</capacities>
+				<power>8</power>
+				<cooldownTime>2</cooldownTime>
+			</li>
+			<li>
+				<label>physical-magic</label>
+				<capacities>
+					<li>Blunt</li>
+					<li>Demolish</li>
+				</capacities>
+				<power>15</power>
+				<extraMeleeDamages>
+					<li>
+						<def>Flame</def>
+						<amount>30</amount>
+						<chance>1</chance>
+					  </li>
 					<li>
 						<def>Stun</def>
 						<amount>1.5</amount>
diff --git a/1.5/Languages/ChineseSimplified (简体中文)/Definjected/AbilityDef/Abilities.xml b/1.5/Languages/ChineseSimplified (简体中文)/Definjected/AbilityDef/Abilities.xml
index bbf8da9..c2e15bf 100644
--- a/1.5/Languages/ChineseSimplified (简体中文)/Definjected/AbilityDef/Abilities.xml	
+++ b/1.5/Languages/ChineseSimplified (简体中文)/Definjected/AbilityDef/Abilities.xml	
@@ -7,7 +7,7 @@
   <DR_FireBurst.label>火焰爆发</DR_FireBurst.label>
   <DR_FireBurst.description>超载龙珠引发爆炸，并在地面形成易燃区域。</DR_FireBurst.description>
 
-  <DR_BattleStaffBurner.label>火焰喷射（灵质法杖）</DR_BattleStaffBurner.label>
+  <DR_BattleStaffBurner.label>火焰喷射</DR_BattleStaffBurner.label>
   <DR_BattleStaffBurner.description>使用大地魔法的力量，喷射出一片巨大的锥形火焰。</DR_BattleStaffBurner.description>
     
 </LanguageData>
\ No newline at end of file
diff --git a/1.5/Languages/ChineseSimplified (简体中文)/Definjected/HediffDef/Hediffs_DRM_BodyParts.xml b/1.5/Languages/ChineseSimplified (简体中文)/Definjected/HediffDef/Hediffs_DRM_BodyParts.xml
index d195297..4f58ffe 100644
--- a/1.5/Languages/ChineseSimplified (简体中文)/Definjected/HediffDef/Hediffs_DRM_BodyParts.xml	
+++ b/1.5/Languages/ChineseSimplified (简体中文)/Definjected/HediffDef/Hediffs_DRM_BodyParts.xml	
@@ -37,4 +37,21 @@
   
   <DRM_SummonSickness.label>召唤失调综合征</DRM_SummonSickness.label>
   <DRM_SummonSickness.description>这个人不应该出现在这里。他的身体正在崩解，症状将会持续恶化，最终会导致死亡。</DRM_SummonSickness.description>
+
+  <!-- EN: frostbite -->
+  <DRM_Frostbite.label>冻伤</DRM_Frostbite.label>
+  <!-- EN: Frozen tissue caused by exposure to cold without adequate protection. Frostbite is very painful, and frostbitten body parts are often lost. -->
+  <DRM_Frostbite.description>冻伤是由于寒冷潮湿作用引起的患者局部或全身损伤。冻伤非常痛苦，患者经常会被迫失去冻伤的身体部位。</DRM_Frostbite.description>
+  <!-- EN: tended -->
+  <DRM_Frostbite.comps.HediffComp_TendDuration.labelSolidTendedWell>已简单处理</DRM_Frostbite.comps.HediffComp_TendDuration.labelSolidTendedWell>
+  <!-- EN: bandaged -->
+  <DRM_Frostbite.comps.HediffComp_TendDuration.labelTendedWell>已包扎</DRM_Frostbite.comps.HediffComp_TendDuration.labelTendedWell>
+  <!-- EN: tended -->
+  <DRM_Frostbite.comps.HediffComp_TendDuration.labelTendedWellInner>已缝合</DRM_Frostbite.comps.HediffComp_TendDuration.labelTendedWellInner>
+  <!-- EN: frostbite scar -->
+  <DRM_Frostbite.comps.HediffComp_GetsPermanent.permanentLabel>冻伤疤痕</DRM_Frostbite.comps.HediffComp_GetsPermanent.permanentLabel>
+  <!-- EN: Lost to frostbite -->
+  <DRM_Frostbite.injuryProps.destroyedLabel>因冻伤失去</DRM_Frostbite.injuryProps.destroyedLabel>
+  <!-- EN: {0} in the {1} -->
+  <DRM_Frostbite.labelNounPretty>{1}中的{0}</DRM_Frostbite.labelNounPretty>
 </LanguageData>
\ No newline at end of file
diff --git a/1.5/Languages/ChineseSimplified (简体中文)/Definjected/ThingDef/ThingDefs_DRM_Weapon.xml b/1.5/Languages/ChineseSimplified (简体中文)/Definjected/ThingDef/ThingDefs_DRM_Weapon.xml
index b66a6ce..6018d9a 100644
--- a/1.5/Languages/ChineseSimplified (简体中文)/Definjected/ThingDef/ThingDefs_DRM_Weapon.xml	
+++ b/1.5/Languages/ChineseSimplified (简体中文)/Definjected/ThingDef/ThingDefs_DRM_Weapon.xml	
@@ -3,5 +3,11 @@
   
   <DR_BattleHammer.label>龙娘 战锤</DR_BattleHammer.label>
   <DR_BattleHammer.description>一柄内置了EMP发生器的战锤。当击中时会释放电击瘫痪机械装置。</DR_BattleHammer.description>
+
+  <DR_BattleStaff_Beam.label>龙娘 光束法杖</DR_BattleStaff_Beam.label>
+  <DR_BattleStaff_Beam.description>龙娘使用的法杖。能射出急冻光束。</DR_BattleStaff_Beam.description>
+
+  <DR_BattleStaff_Flare.label>龙娘 火焰法杖</DR_BattleStaff_Flare.label>
+  <DR_BattleStaff_Flare.description>龙娘使用的法杖。能射出火焰束。</DR_BattleStaff_Flare.description>
   
 </LanguageData>
\ No newline at end of file
diff --git a/1.5/Patches/DR_Weapon_Patch.xml b/1.5/Patches/DR_Weapon_Patch.xml
index ef8b39e..b719110 100644
--- a/1.5/Patches/DR_Weapon_Patch.xml
+++ b/1.5/Patches/DR_Weapon_Patch.xml
@@ -49,77 +49,10 @@
 				<xpath>Defs/ThingDef[defName="DR_BattleStaff"]</xpath>
 				<value>
 					<weaponTags>
-						<li>DR_BattleStaff</li>
+						<li>DR_BattleStaff_Melee</li>
 					</weaponTags>
 				</value>
 			</li>
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName="DR_BattleStaff"]</xpath>
-				<value>
-					<thingCategories>
-						<li>WeaponsRanged</li>
-					  </thingCategories>
-					  <verbs>
-						<li>
-						  <verbClass>Verb_ShootBeam</verbClass>
-						  <hasStandardCommand>true</hasStandardCommand>
-						  <warmupTime>1.0</warmupTime>
-						  <range>24.9</range>
-						  <minRange>3.9</minRange>
-						  <muzzleFlashScale>9</muzzleFlashScale>
-						  <soundCastTail>GunTail_Medium</soundCastTail>
-						  <soundCastBeam>BeamGraser_Shooting</soundCastBeam>
-
-						  <beamStartOffset>0.8</beamStartOffset>
-						  <beamFullWidthRange>3</beamFullWidthRange>
-						  <beamWidth>-3</beamWidth>
-						  <beamMaxDeviation>0.5</beamMaxDeviation>
-						  <burstShotCount>30</burstShotCount>
-						  <showBurstShotStats>false</showBurstShotStats>
-						  
-						  <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-						  <beamDamageDef>Beam</beamDamageDef>
-
-						  <beamGroundFleckDef>Fleck_BeamBurn</beamGroundFleckDef>
-						  <beamFleckChancePerTick>0.32</beamFleckChancePerTick>
-						 
-						  <beamCurvature>0.6</beamCurvature>
-						  <beamMoteDef>Mote_GraserBeamBase</beamMoteDef>
-						  <beamEndEffecterDef>GraserBeam_End</beamEndEffecterDef>
-
-						  <beamLineFleckDef>Fleck_BeamSpark</beamLineFleckDef>
-
-
-						  <beamChanceToStartFire>0.85</beamChanceToStartFire>
-						  <beamChanceToAttachFire>0.85</beamChanceToAttachFire>
-						  <beamFireSizeRange>0.55~0.85</beamFireSizeRange>
-						  <beamLineFleckChanceCurve>
-							<points>
-							  <li>(0, 0)</li>
-							  <li>(0.2, 0.1)</li>
-							  <li>(0.4, 0.2)</li>
-							</points>
-						  </beamLineFleckChanceCurve>
-						</li>
-					  </verbs>
-					<comps Inherit="False">
-						<li Class="CompProperties_EquippableAbilityReloadable">
-						  <abilityDef>DR_BattleStaffBurner</abilityDef>
-						</li>
-						<li Class="CompProperties_Forbiddable"/>
-						<li Class="CompProperties_Styleable"/>
-						<li Class="CompProperties_Biocodable"/>
-						<li>
-						  <compClass>CompQuality</compClass>
-						</li>
-						<li Class="CompProperties_Art">
-						  <nameMaker>NamerArtWeaponGun</nameMaker>
-						  <descriptionMaker>ArtDescription_WeaponGun</descriptionMaker>
-						  <minQualityForArtistic>Excellent</minQualityForArtistic>
-						</li>
-					  </comps>
-				</value>
-			</li>
 
 		</operations>
 	</Operation>
@@ -145,8 +78,8 @@
 					<power>15</power>
 					<extraMeleeDamages>
 						<li>
-							<def>Flame</def>
-							<amount>30</amount>
+							<def>Bomb</def>
+							<amount>40</amount>
 							<chance>1</chance>
 						  </li>
 						<li>
@@ -161,19 +94,4 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="DR_BattleStaff"]/statBases</xpath>
-		<value>
-			<statBases>
-				<WorkToMake>12000</WorkToMake>
-				<Mass>15</Mass>
-				<AccuracyTouch>0.60</AccuracyTouch>
-				<AccuracyShort>0.70</AccuracyShort>
-				<AccuracyMedium>0.65</AccuracyMedium>
-				<AccuracyLong>0.55</AccuracyLong>
-				<RangedWeapon_Cooldown>1.70</RangedWeapon_Cooldown>
-			  </statBases>
-		</value>
-	</Operation>
-
 </Patch>
\ No newline at end of file