Merge branch 'Development' into pr/SamaelGray/3499

Defs/Ammo/Rifle/762x54mmR.xml

@@ -45,7 +45,7 @@
 		<defName>Ammo_762x54mmR_FMJ</defName>
 		<label>7.62x54mmR (FMJ)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Rifle/SovietLarge/FMJ</texPath>
+			<texPath>Things/Ammo/Rifle/SovietBattlerifle/FMJ</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -59,7 +59,7 @@
 		<defName>Ammo_762x54mmR_AP</defName>
 		<label>7.62x54mmR (AP)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Rifle/SovietLarge/AP</texPath>
+			<texPath>Things/Ammo/Rifle/SovietBattlerifle/AP</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -73,7 +73,7 @@
 		<defName>Ammo_762x54mmR_HP</defName>
 		<label>7.62x54mmR (HP)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Rifle/SovietLarge/HP</texPath>
+			<texPath>Things/Ammo/Rifle/SovietBattlerifle/HP</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -87,7 +87,7 @@
 		<defName>Ammo_762x54mmR_Incendiary</defName>
 		<label>7.62x54mmR (AP-I)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Rifle/SovietLarge/Incendiary</texPath>
+			<texPath>Things/Ammo/Rifle/SovietBattlerifle/Incendiary</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -101,7 +101,7 @@
 		<defName>Ammo_762x54mmR_HE</defName>
 		<label>7.62x54mmR (AP-HE)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Rifle/SovietLarge/HE</texPath>
+			<texPath>Things/Ammo/Rifle/SovietBattlerifle/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -115,7 +115,7 @@
 		<defName>Ammo_762x54mmR_Sabot</defName>
 		<label>7.62x54mmR (Sabot)</label>
 		<graphicData>
-			<texPath>Things/Ammo/Rifle/SovietLarge/Sabot</texPath>
+			<texPath>Things/Ammo/Rifle/SovietBattlerifle/Sabot</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>

Defs/Ammo/Shell/105mmHowitzer.xml

@@ -161,9 +161,7 @@
 			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
 			<soundAmbient>MortarRound_Ambient</soundAmbient>
 			<flyOverhead>true</flyOverhead>
-			<dropsCasings>true</dropsCasings>
-			<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
-			<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
+			<dropsCasings>false</dropsCasings>
 			<gravityFactor>5</gravityFactor>
 			<shellingProps>
 				<tilesPerTick>0.10</tilesPerTick>
@@ -303,9 +301,7 @@
 			<speed>147</speed>
 			<soundExplode>MortarBomb_Explode</soundExplode>
 			<flyOverhead>false</flyOverhead>
-			<dropsCasings>true</dropsCasings>
-			<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
-			<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
+			<dropsCasings>false</dropsCasings>
 		</projectile>
 	</ThingDef>
 

Defs/Ammo/Shell/155mmHowitzer.xml

@@ -141,9 +141,7 @@
 			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
 			<soundAmbient>MortarRound_Ambient</soundAmbient>
 			<flyOverhead>true</flyOverhead>
-			<dropsCasings>true</dropsCasings>
-			<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
-			<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
+			<dropsCasings>false</dropsCasings>
 			<gravityFactor>5</gravityFactor>
 			<shellingProps>
 				<tilesPerTick>0.12</tilesPerTick>

Defs/ThingDefs_Buildings/Buildings_Turrets.xml

@@ -398,6 +398,7 @@
 			</shadowData>
 		</graphicData>
 		<uiIconPath>UI/Icons/Turrets/FlakTurret_uiIcon</uiIconPath>
+		<fillPercent>1</fillPercent>
 		<statBases>
 			<MaxHitPoints>500</MaxHitPoints>
 			<Flammability>0.4</Flammability>
@@ -437,6 +438,20 @@
 			<li>CE_TurretHeavyWeapons</li>
 		</researchPrerequisites>
 		<designationCategory>Security</designationCategory>
+		<damageMultipliers>
+			<li>
+				<damageDef>Bomb</damageDef>
+				<multiplier>0.66</multiplier>
+			</li>
+			<li>
+				<damageDef>Bomb_Secondary</damageDef>
+				<multiplier>0.66</multiplier>
+			</li>
+			<li>
+				<damageDef>Bullet</damageDef>
+				<multiplier>0.66</multiplier>
+			</li>
+		</damageMultipliers>		
 	</ThingDef>
 
 </Defs>

Languages/ChineseSimplified/DefInjected/BodyPartGroupDef/BodyPartGroups.xml

@@ -52,9 +52,6 @@
   <!-- EN: neck -->
   <Neck.label>颈</Neck.label>
 
-  <!-- EN: outside squishy -->
-  <OutsideSquishy.label>外溢粘液</OutsideSquishy.label>
-
   <!-- EN: point -->
   <Point.label>尖</Point.label>
 

Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Advanced.xml

@@ -6,6 +6,11 @@
   <!-- EN: A tiny ultra-tech warhead usually used by spacecraft or glitterworld war machines. Powered by a grain of antimatter, it creates a huge explosion and starts fires around the target. -->
   <Antigrain.description>一种小型的超技术弹头，通常由宇宙飞船或闪耀世界使机器用，在一反物质的推动下，产生巨量高能伽玛射线，拥有巨大的湮灭性摧毁能力。</Antigrain.description>
 
+  <!-- EN: bioferrite -->
+  <Bioferrite.label>活铁</Bioferrite.label>
+  <!-- EN: An infusion of crystalline bioferrite attacks organic matter on a cellular level, disrupting regeneration and weakening tisue. -->
+  <Bioferrite.description>含有结晶活铁的浸渍物质能够在细胞层面攻击有机物，干扰再生并削弱组织。</Bioferrite.description>
+
   <!-- EN: concentrated tibanna -->
   <BlasterAP.label>浓缩提班纳</BlasterAP.label>
   <!-- EN: Energy bolts created with tibanna gas. Causes neat punctures and burns that tend to carbonize and char. Low chance of wound infection. Spun to a higher pressure to create bolts with improved penetration, at the loss of wounding potential. -->
@@ -27,7 +32,7 @@
   <BlasterStun.description>使用提班纳气体制造的低能量光矢，可以暂时使目标昏迷并丧失行动能力。</BlasterStun.description>
 
   <!-- EN: charge -->
-  <Charged.label>普通电荷弹</Charged.label>
+  <Charged.label>电荷弹</Charged.label>
   <!-- EN: The charged particle coating disrupts armor and tissue in equal measure. -->
   <Charged.description>拥有电荷粒子涂层，对装甲目标和人体组织都有良好的破坏力。</Charged.description>
 

Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Neolithic.xml

@@ -27,8 +27,10 @@
 
   <!-- EN: nerve -->
   <Nerve.label>神经毒素</Nerve.label>
-  <!-- EN: The project is coated with a potent biotoxin that leaves organic targets stuned and disoriented. -->
+  <!-- EN: The projectile is coated with a potent bioferrite-based biotoxin that stuns organic targets and disrupts regeneration. -->
   <Nerve.description>该工程表面涂覆了一种强力的生物毒素，能够使有机体目标变得晕眩和迷失方向。</Nerve.description>
+  <!-- EN: nerve -->
+  <Nerve.labelShort>神经毒素</Nerve.labelShort>
 
   <!-- EN: plasteel arrow -->
   <PlasteelArrow.label>玻璃钢箭</PlasteelArrow.label>

Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/12Gauge.xml

@@ -4,4 +4,7 @@
   <!-- EN: 12 Gauge -->
   <AmmoSet_12Gauge.label>12号径霰弹</AmmoSet_12Gauge.label>
 
+  <!-- EN: 12 Gauge -->
+  <AmmoSet_12Gauge_SB.label>12号径霰弹</AmmoSet_12Gauge_SB.label>
+
 </LanguageData>

Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/Flamethrower_Burst.xml

@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
-
-  <!-- AmmoSet -->
-
+
+  <!-- EN: flamethrower fuel -->
   <AmmoSet_Incinerator_Burst.label>火焰喷射器燃料</AmmoSet_Incinerator_Burst.label>
-
-
+
 </LanguageData>

Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/NerveSpikerBolt.xml

@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
-
-  <!-- AmmoSet -->
-
+
+  <!-- EN: nerve spiker bolts -->
   <AmmoSet_NerveSpikerBolt.label>麻痹毒刺</AmmoSet_NerveSpikerBolt.label>
-
-
+
 </LanguageData>

Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/PlasmaCannon.xml

@@ -4,6 +4,9 @@
   <!-- EN: plasma canister -->
   <AmmoSet_PlasmaCanister_Cannon.label>罐装等离子体</AmmoSet_PlasmaCanister_Cannon.label>
 
+  <!-- EN: plasma canister -->
+  <AmmoSet_PlasmaCanister_Destroyer.label>罐装等离子体</AmmoSet_PlasmaCanister_Destroyer.label>
+
   <!-- EN: plasma canister -->
   <AmmoSet_PlasmaCanister_Pistol.label>罐装等离子体</AmmoSet_PlasmaCanister_Pistol.label>
 

Languages/ChineseSimplified/DefInjected/DamageDef/DamageDefs_Anomaly.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LanguageData>
+
+  <!-- EN: bioferrite flame -->
+  <BioferriteFlame.label>活铁火焰</BioferriteFlame.label>
+  <!-- EN: {0} has burned to death. -->
+  <BioferriteFlame.deathMessage>{0}已被烧死。</BioferriteFlame.deathMessage>
+
+  <!-- EN: scratch -->
+  <DemolishScratch.label>划伤</DemolishScratch.label>
+  <!-- EN: {0} has been torn to death. -->
+  <DemolishScratch.deathMessage>{0}被撕裂了.</DemolishScratch.deathMessage>
+
+  <!-- EN: nerve -->
+  <NerveBioferrite.label>神经</NerveBioferrite.label>
+  <!-- EN: {0} has been killed by nerve shock. -->
+  <NerveBioferrite.deathMessage>{0}死于神经休克。</NerveBioferrite.deathMessage>
+
+</LanguageData>

Languages/ChineseSimplified/DefInjected/DesignatorDropdownGroupDef/DesignatorDropdownGroupDef.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LanguageData>
+
+  <!-- EN: combat extended auto-turrets -->
+  <CE_AutoTurrets.label>战斗扩展自动炮塔</CE_AutoTurrets.label>
+
+  <!-- EN: combat extended blackpowder emplacements -->
+  <CE_BlackpowderEmplacements.label>战斗扩展黑火药炮台</CE_BlackpowderEmplacements.label>
+
+  <!-- EN: combat extended heavy manned turrets -->
+  <CE_HeavyMannedTurrets.label>战斗扩展重型手操炮塔</CE_HeavyMannedTurrets.label>
+
+  <!-- EN: combat extended medium manned turrets -->
+  <CE_MediumMannedTurrets.label>战斗扩展中型手操炮塔</CE_MediumMannedTurrets.label>
+
+  <!-- EN: combat extended modern manned turrets -->
+  <CE_ModernMannedTurrets.label>战斗扩展新式手操炮塔</CE_ModernMannedTurrets.label>
+
+</LanguageData>

Languages/ChineseSimplified/DefInjected/HediffDef/Hediffs_Anomaly.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LanguageData>
+
+  <!-- EN: Bioferrite toxicity -->
+  <BioferriteToxicity.label>活铁毒气</BioferriteToxicity.label>
+  <!-- EN: Ravaged by the effects of bioferrite toxicity. -->
+  <BioferriteToxicity.description>受到活铁毒气的影响</BioferriteToxicity.description>
+  <!-- EN: minor -->
+  <BioferriteToxicity.stages.minor.label>较轻</BioferriteToxicity.stages.minor.label>
+  <!-- EN: moderate -->
+  <BioferriteToxicity.stages.moderate.label>中等</BioferriteToxicity.stages.moderate.label>
+  <!-- EN: major -->
+  <BioferriteToxicity.stages.major.label>较重</BioferriteToxicity.stages.major.label>
+  <!-- EN: severe -->
+  <BioferriteToxicity.stages.severe.label>严重</BioferriteToxicity.stages.severe.label>
+  <!-- EN: extreme -->
+  <BioferriteToxicity.stages.extreme.label>极重</BioferriteToxicity.stages.extreme.label>
+
+</LanguageData>

Languages/ChineseSimplified/DefInjected/RecipeDef/357Magnum.xml

@@ -4,21 +4,21 @@
   <!-- EN: make .357 Magnum (AP) cartridge x500 -->
   <MakeAmmo_357Magnum_AP.label>制作.357 马格南手枪弹 (穿甲弹) x500</MakeAmmo_357Magnum_AP.label>
   <!-- EN: Craft 500 .357 Magnum (AP) cartridges. -->
-  <MakeAmmo_357Magnum_AP.description>制作500枚.357 马格南手枪弹 (穿甲弹)。</MakeAmmo_357Magnum_AP.description>
+  <MakeAmmo_357Magnum_AP.description>制作.357 马格南手枪弹 (穿甲弹) x500。</MakeAmmo_357Magnum_AP.description>
   <!-- EN: Making .357 Magnum (AP) cartridges. -->
   <MakeAmmo_357Magnum_AP.jobString>正在制作.357 马格南手枪弹 (穿甲弹)。</MakeAmmo_357Magnum_AP.jobString>
 
   <!-- EN: make .357 Magnum (FMJ) cartridge x500 -->
   <MakeAmmo_357Magnum_FMJ.label>制作.357 马格南手枪弹 (全金属被甲弹) x500</MakeAmmo_357Magnum_FMJ.label>
   <!-- EN: Craft 500 .357 Magnum (FMJ) cartridges. -->
-  <MakeAmmo_357Magnum_FMJ.description>制作500枚.357 马格南手枪弹 (全金属被甲弹)。</MakeAmmo_357Magnum_FMJ.description>
+  <MakeAmmo_357Magnum_FMJ.description>制作.357 马格南手枪弹 (全金属被甲弹) x500。</MakeAmmo_357Magnum_FMJ.description>
   <!-- EN: Making .357 Magnum (FMJ) cartridges. -->
   <MakeAmmo_357Magnum_FMJ.jobString>正在制作.357 马格南手枪弹 (全金属被甲弹)。</MakeAmmo_357Magnum_FMJ.jobString>
 
   <!-- EN: make .357 Magnum (HP) cartridge x500 -->
   <MakeAmmo_357Magnum_HP.label>制作.357 马格南手枪弹 (空尖弹) x500</MakeAmmo_357Magnum_HP.label>
   <!-- EN: Craft 500 .357 Magnum (HP) cartridges. -->
-  <MakeAmmo_357Magnum_HP.description>制作500枚.357 马格南手枪弹 (空尖弹)。</MakeAmmo_357Magnum_HP.description>
+  <MakeAmmo_357Magnum_HP.description>制作.357 马格南手枪弹 (空尖弹) x500。</MakeAmmo_357Magnum_HP.description>
   <!-- EN: Making .357 Magnum (HP) cartridges. -->
   <MakeAmmo_357Magnum_HP.jobString>正在制作.357 马格南手枪弹 (空尖弹)。</MakeAmmo_357Magnum_HP.jobString>
 

Languages/ChineseSimplified/DefInjected/RecipeDef/38ACP.xml

@@ -4,21 +4,21 @@
   <!-- EN: make .38 ACP (AP) cartridge x500 -->
   <MakeAmmo_38ACP_AP.label>制作.38 ACP手枪弹 (穿甲弹) x500</MakeAmmo_38ACP_AP.label>
   <!-- EN: Craft 500 .38 ACP (AP) cartridges. -->
-  <MakeAmmo_38ACP_AP.description>制作500枚.38 ACP手枪弹 (穿甲弹)。</MakeAmmo_38ACP_AP.description>
+  <MakeAmmo_38ACP_AP.description>制作.38 ACP手枪弹 (穿甲弹) x500。</MakeAmmo_38ACP_AP.description>
   <!-- EN: Making .38 ACP (AP) cartridges. -->
   <MakeAmmo_38ACP_AP.jobString>正在制作.38 ACP手枪弹 (穿甲弹)。</MakeAmmo_38ACP_AP.jobString>
 
   <!-- EN: make .38 ACP cartridge x500 -->
   <MakeAmmo_38ACP_FMJ.label>制作.38 ACP手枪弹 (全金属被甲弹) x500</MakeAmmo_38ACP_FMJ.label>
   <!-- EN: Craft 500 .38 ACP cartridges. -->
-  <MakeAmmo_38ACP_FMJ.description>制作500枚.38 ACP手枪弹 (全金属被甲弹)。</MakeAmmo_38ACP_FMJ.description>
+  <MakeAmmo_38ACP_FMJ.description>制作.38 ACP手枪弹 (全金属被甲弹) x500。</MakeAmmo_38ACP_FMJ.description>
   <!-- EN: Making .38 ACP cartridges. -->
   <MakeAmmo_38ACP_FMJ.jobString>正在制作.38 ACP手枪弹 (全金属被甲弹)。</MakeAmmo_38ACP_FMJ.jobString>
 
   <!-- EN: make .38 ACP (HP) cartridge x500 -->
   <MakeAmmo_38ACP_HP.label>制作.38 ACP手枪弹 (空尖弹) x500</MakeAmmo_38ACP_HP.label>
   <!-- EN: Craft 500 .38 ACP (HP) cartridges. -->
-  <MakeAmmo_38ACP_HP.description>制作500枚.38 ACP手枪弹 (空尖弹)。</MakeAmmo_38ACP_HP.description>
+  <MakeAmmo_38ACP_HP.description>制作.38 ACP手枪弹 (空尖弹) x500。</MakeAmmo_38ACP_HP.description>
   <!-- EN: Making .38 ACP (HP) cartridges. -->
   <MakeAmmo_38ACP_HP.jobString>正在制作.38 ACP手枪弹 (空尖弹)。</MakeAmmo_38ACP_HP.jobString>
 

Languages/ChineseSimplified/DefInjected/RecipeDef/4570Gov.xml

@@ -8,7 +8,7 @@
   <!-- EN: Making .45-70 Government cartridge (AP) cartridges. -->
   <MakeAmmo_4570Gov_AP.jobString>正在制作.45-70  政府弹 (穿甲弹)。</MakeAmmo_4570Gov_AP.jobString>
 
-  <!-- EN: make .45-70 Government cartridge (FMJ) cartridge x400 -->
+  <!-- EN: make .45-70 Government cartridge (FMJ) cartridge x500 -->
   <MakeAmmo_4570Gov_FMJ.label>制作.45-70  政府弹 (全金属被甲弹) x500</MakeAmmo_4570Gov_FMJ.label>
   <!-- EN: Craft 500 .45-70 Government cartridge (FMJ) cartridges. -->
   <MakeAmmo_4570Gov_FMJ.description>制作500枚.45-70  政府弹 (全金属被甲弹)。</MakeAmmo_4570Gov_FMJ.description>