From e71f661ce2a8e0f1d2e0b94fd3015d5281f5cecf Mon Sep 17 00:00:00 2001
From: "DUDULUU-R7\\duduluu" <duduluu@outlook.com>
Date: Mon, 30 Oct 2017 23:31:12 +0800
Subject: [PATCH] Update DamageDef

---
 .../DamageDef/Damages_Environmental.xml       |  4 +-
 DefInjected/DamageDef/Damages_LocalInjury.xml | 59 -------------------
 DefInjected/DamageDef/Damages_MeleeWeapon.xml |  8 +--
 .../DamageDef/Damages_RangedWeapon.xml        | 14 ++---
 4 files changed, 13 insertions(+), 72 deletions(-)
 delete mode 100644 DefInjected/DamageDef/Damages_LocalInjury.xml

diff --git a/DefInjected/DamageDef/Damages_Environmental.xml b/DefInjected/DamageDef/Damages_Environmental.xml
index 69486d62..6f16d902 100644
--- a/DefInjected/DamageDef/Damages_Environmental.xml
+++ b/DefInjected/DamageDef/Damages_Environmental.xml
@@ -13,8 +13,8 @@
   <Frostbite.label>冻伤</Frostbite.label>
   <Frostbite.deathMessage>{0}被冻死了。</Frostbite.deathMessage>
 
-  <TornadoScratch.label>scratch</TornadoScratch.label>
-  <TornadoScratch.deathMessage>{0} has been killed by a tornado.</TornadoScratch.deathMessage>
+  <TornadoScratch.label>刮伤</TornadoScratch.label>
+  <TornadoScratch.deathMessage>{0}死于龙卷风。</TornadoScratch.deathMessage>
 
 
 </LanguageData>
\ No newline at end of file
diff --git a/DefInjected/DamageDef/Damages_LocalInjury.xml b/DefInjected/DamageDef/Damages_LocalInjury.xml
deleted file mode 100644
index 41c2dc69..00000000
--- a/DefInjected/DamageDef/Damages_LocalInjury.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LanguageData>
-
-  <!--<Cut.label>割伤</Cut.label>-->
-  <!--<Cut.deathMessage>{0}死于割伤。</Cut.deathMessage>-->
-
-
-  <!-- Surgical cut: Makes it possible to remove inner organs without harming outer body parts -->
-
-  <!--<SurgicalCut.label>手术伤</SurgicalCut.label>-->
-  <!--<SurgicalCut.deathMessage>{0}在手术中死亡。</SurgicalCut.deathMessage>-->
-
-
-  <!-- Execution cut: Makes it possible to distinguish execution damage from others -->
-
-  <!--<ExecutionCut.label>处决</ExecutionCut.label>-->
-  <!--<ExecutionCut.deathMessage>{0}被处决了。</ExecutionCut.deathMessage>-->
-
-  <!--<Crush.label>压伤</Crush.label>-->
-  <!--<Crush.deathMessage>{0}被压死了。</Crush.deathMessage>-->
-
-  <!--<Blunt.label>钝伤</Blunt.label>-->
-  <!--<Blunt.deathMessage>{0}被钝器打死了。</Blunt.deathMessage>-->
-
-  <!--<Stab.label>刺伤</Stab.label>-->
-  <!--<Stab.deathMessage>{0}被刺死了。</Stab.deathMessage>-->
-
-  <!--<Bullet.label>枪伤</Bullet.label>-->
-  <!--<Bullet.deathMessage>{0}被枪杀了。</Bullet.deathMessage>-->
-
-  <!--<Arrow.label>箭伤</Arrow.label>-->
-  <!--<Arrow.deathMessage>{0}被箭射死了。</Arrow.deathMessage>-->
-
-  <!--<Scratch.label>抓伤</Scratch.label>-->
-  <!--<Scratch.deathMessage>{0}被抓死了。</Scratch.deathMessage>-->
-
-  <!--<Bite.label>咬伤</Bite.label>-->
-  <!--<Bite.deathMessage>{0}被咬死了。</Bite.deathMessage>-->
-
-  <!--<ToxicBite.label>有毒咬伤</ToxicBite.label>-->
-  <!--<ToxicBite.deathMessage>{0}死于有毒咬伤。</ToxicBite.deathMessage>-->
-
-  <!--<Bomb.label>炸伤</Bomb.label>-->
-  <!--<Bomb.deathMessage>{0}被炸死了。</Bomb.deathMessage>-->
-
-  <!--<Flame.label>烧伤</Flame.label>-->
-  <!--<Flame.deathMessage>{0}被烧死了。</Flame.deathMessage>-->
-
-
-  <!-- Burn is like Flame, but doesn't ignite anything -->
-
-  <!--<Burn.label>烧伤</Burn.label>-->
-  <!--<Burn.deathMessage>{0}被烧死了。</Burn.deathMessage>-->
-
-  <!--<Frostbite.label>冻伤</Frostbite.label>-->
-  <!--<Frostbite.deathMessage>{0}被冻死了。</Frostbite.deathMessage>-->
-
-
-</LanguageData>
\ No newline at end of file
diff --git a/DefInjected/DamageDef/Damages_MeleeWeapon.xml b/DefInjected/DamageDef/Damages_MeleeWeapon.xml
index 7d549550..ca17bffb 100644
--- a/DefInjected/DamageDef/Damages_MeleeWeapon.xml
+++ b/DefInjected/DamageDef/Damages_MeleeWeapon.xml
@@ -8,13 +8,13 @@
   <Crush.deathMessage>{0}被压死了。</Crush.deathMessage>
 
   <Blunt.label>钝伤</Blunt.label>
-  <Blunt.deathMessage>{0}被钝器打死了。</Blunt.deathMessage>
+  <Blunt.deathMessage>{0}被锤死了。</Blunt.deathMessage>
 
 
   <!-- Damage types are the same as Blunt, but behaves like stabbing; intended for things like rifle barrels -->
 
-  <Poke.label>blunt</Poke.label>
-  <Poke.deathMessage>{0} has been beaten to death.</Poke.deathMessage>
+  <Poke.label>钝伤</Poke.label>
+  <Poke.deathMessage>{0}被锤死了。</Poke.deathMessage>
 
   <Stab.label>刺伤</Stab.label>
   <Stab.deathMessage>{0}被刺死了。</Stab.deathMessage>
@@ -25,7 +25,7 @@
   <Bite.label>咬伤</Bite.label>
   <Bite.deathMessage>{0}被咬死了。</Bite.deathMessage>
 
-  <ToxicBite.label>有毒咬伤</ToxicBite.label>
+  <ToxicBite.label>毒咬伤</ToxicBite.label>
   <ToxicBite.deathMessage>{0}死于有毒咬伤。</ToxicBite.deathMessage>
 
 
diff --git a/DefInjected/DamageDef/Damages_RangedWeapon.xml b/DefInjected/DamageDef/Damages_RangedWeapon.xml
index fa995d46..7187957f 100644
--- a/DefInjected/DamageDef/Damages_RangedWeapon.xml
+++ b/DefInjected/DamageDef/Damages_RangedWeapon.xml
@@ -3,17 +3,17 @@
 
   <!-- Temporary hack; ranged weapons need to use the old pre-flavorful-combat system to avoid a rebalance cascade. -->
 
-  <RangedStab.label>stab</RangedStab.label>
-  <RangedStab.deathMessage>{0} has been stabbed to death.</RangedStab.deathMessage>
+  <RangedStab.label>刺伤</RangedStab.label>
+  <RangedStab.deathMessage>{0}被刺死了。</RangedStab.deathMessage>
 
-  <Bullet.label>枪伤</Bullet.label>
-  <Bullet.deathMessage>{0}被枪杀了。</Bullet.deathMessage>
+  <Bullet.label>子弹伤</Bullet.label>
+  <Bullet.deathMessage>{0}被枪射杀了。</Bullet.deathMessage>
 
   <Arrow.label>箭伤</Arrow.label>
-  <Arrow.deathMessage>{0}被箭射死了。</Arrow.deathMessage>
+  <Arrow.deathMessage>{0}被箭射杀了。</Arrow.deathMessage>
 
-  <ArrowHighVelocity.label>arrow</ArrowHighVelocity.label>
-  <ArrowHighVelocity.deathMessage>{0} has been shot to death.</ArrowHighVelocity.deathMessage>
+  <ArrowHighVelocity.label>箭伤</ArrowHighVelocity.label>
+  <ArrowHighVelocity.deathMessage>{0}被箭射杀了。</ArrowHighVelocity.deathMessage>
 
 
 </LanguageData>
\ No newline at end of file