Merge branch 'Development' into GW-Talons

Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Grenades.xml

@@ -21,49 +21,34 @@
   <!-- EN: A cylindrical concussion grenade designed to produce casualties during close combat while minimizing danger to friendly personnel exposed in the open owing to minimal fragmentation. -->
   <Weapon_GrenadeConcussion.description>爆炸时，伴随著巨大的声响或者闪光，使爆炸范围内的敌人暂时失明和失去方向感，从而短暂丧失反抗能力。</Weapon_GrenadeConcussion.description>
   <!-- EN: Body -->
-  <Weapon_GrenadeConcussion.tools.Body.label>身体</Weapon_GrenadeConcussion.tools.Body.label>
-
-  <!-- UNUSED -->
-  <Weapon_GrenadeConcussion.verbs.0.label>投掷震撼手榴弹</Weapon_GrenadeConcussion.verbs.0.label>
+  <Weapon_GrenadeConcussion.tools.Body.label>弹体</Weapon_GrenadeConcussion.tools.Body.label>
 
   <!-- EN: firefoam grenade -->
   <Weapon_GrenadeFirefoam.label>泡沫手榴弹</Weapon_GrenadeFirefoam.label>
   <!-- EN: Special firefighting grenade. Releases a cloud of firefoam upon impact. -->
   <Weapon_GrenadeFirefoam.description>特种消防手榴弹，撞击时释放出一团灭火用泡沫。</Weapon_GrenadeFirefoam.description>
   <!-- EN: Body -->
-  <Weapon_GrenadeFirefoam.tools.Body.label>身体</Weapon_GrenadeFirefoam.tools.Body.label>
-
-  <!-- UNUSED -->
-  <Weapon_GrenadeFirefoam.verbs.0.label>投掷泡沫手榴弹</Weapon_GrenadeFirefoam.verbs.0.label>
+  <Weapon_GrenadeFirefoam.tools.Body.label>弹体</Weapon_GrenadeFirefoam.tools.Body.label>
 
   <!-- EN: flashbang grenade -->
   <Weapon_GrenadeFlashbang.label>闪光手榴弹</Weapon_GrenadeFlashbang.label>
   <!-- EN: Pyrotechnic charge designed to produce a blinding flash of light and loud noise, temporarily blinding and disorienting anyone nearby. -->
   <Weapon_GrenadeFlashbang.description>设计用于产生令人炫目致晕眩的强光，可以致使被攻击目标短暂失明。</Weapon_GrenadeFlashbang.description>
   <!-- EN: Body -->
-  <Weapon_GrenadeFlashbang.tools.Body.label>身体</Weapon_GrenadeFlashbang.tools.Body.label>
-
-  <!-- UNUSED -->
-  <Weapon_GrenadeFlashbang.verbs.0.label>投掷闪光手榴弹</Weapon_GrenadeFlashbang.verbs.0.label>
+  <Weapon_GrenadeFlashbang.tools.Body.label>弹体</Weapon_GrenadeFlashbang.tools.Body.label>
 
   <!-- EN: smoke grenade -->
   <Weapon_GrenadeSmoke.label>烟雾手榴弹</Weapon_GrenadeSmoke.label>
   <!-- EN: Releases a large cloud of defensive smoke, providing concealment against gunfire. -->
   <Weapon_GrenadeSmoke.description>释放大量烟雾，提供隐蔽性以防止被击中。</Weapon_GrenadeSmoke.description>
   <!-- EN: Body -->
-  <Weapon_GrenadeSmoke.tools.Body.label>身体</Weapon_GrenadeSmoke.tools.Body.label>
-
-  <!-- UNUSED -->
-  <Weapon_GrenadeSmoke.verbs.0.label>投掷烟雾手榴弹</Weapon_GrenadeSmoke.verbs.0.label>
+  <Weapon_GrenadeSmoke.tools.Body.label>弹体</Weapon_GrenadeSmoke.tools.Body.label>
 
   <!-- EN: stick bomb -->
   <Weapon_GrenadeStickBomb.label>棒状炸弹</Weapon_GrenadeStickBomb.label>
   <!-- EN: Primitive fuse-lit explosive. A favorite of tribals who use these to fight technologically advanced enemies with heavy armor. -->
   <Weapon_GrenadeStickBomb.description>一种原始的用导火索点燃的炸药，部落最爱使用这种炸弹重击身穿先进装甲的敌人。</Weapon_GrenadeStickBomb.description>
   <!-- EN: Body -->
-  <Weapon_GrenadeStickBomb.tools.Body.label>身体</Weapon_GrenadeStickBomb.tools.Body.label>
-
-  <!-- UNUSED -->
-  <Weapon_GrenadeStickBomb.verbs.0.label>投掷棒状炸弹</Weapon_GrenadeStickBomb.verbs.0.label>
+  <Weapon_GrenadeStickBomb.tools.Body.label>弹体</Weapon_GrenadeStickBomb.tools.Body.label>
 
 </LanguageData>

Languages/English/Keyed/Messages.xml

@@ -12,6 +12,6 @@
 	<CE_Message_CounterRaid_Desc>A group of fighters from {0} have arrived nearby.\n\nThey are preparing to attack in retaliation for the shelling of {1}.</CE_Message_CounterRaid_Desc>
 
 	<CE_Message_CounterShelling>Artillery fire incoming from {0} ({1}).</CE_Message_CounterShelling>
-	<CE_Message_CounterRaid>A group from {0} is planning to raid {1} soon in retaliation for recent events.</CE_Message_CounterRaid>
+	<CE_Message_CounterRaid>A group from {0} is planning to raid {1} at {2} soon in retaliation for recent events.</CE_Message_CounterRaid>
 
 </LanguageData>

LoadFolders.xml

@@ -66,7 +66,7 @@
 		<li IfModActive="Odz.40k.ImperialGuard.DKOK">ModPatches/Astra Militarum Regimentum - Krieg</li>
 		<li IfModActive="Knorke.40k.ImperialGuard.DKOK.OfficerHelmet">ModPatches/Astra Militarum Regimentum - Krieg Officer Helmet</li>
 		<li IfModActive="Flyingstar.AutoMortarsUnofficial">ModPatches/Auto-Mortars</li>
-    <li IfModActive="veltaris.mechqueen">ModPatches/AV Work Queen</li>
+		<li IfModActive="veltaris.mechqueen">ModPatches/AV Work Queen</li>
 		<li IfModActive="automatic.autocleaner">ModPatches/Autocleaner</li>
 		<li IfModActive="Heymyteamrules.BeastManTribes">ModPatches/Beast Man Tribes</li>
 		<li IfModActive="Mlem.beeralope">ModPatches/Beeralope Squad</li>
@@ -102,7 +102,7 @@
 		<li IfModActive="Bonible.Charge.Lee.Enfield">ModPatches/Charge-Loading Lee-Enfield</li>
 		<li IfModActive="JangoDsoul.TierArmor.Civil">ModPatches/Civilization Beyond Earth Armor Sets</li>
 		<li IfModActive="Taranchuk.ClaySoldeirs">ModPatches/Clay Soldier Race</li>
-    <li IfModActive="awgv.colonialshuttle">ModPatches/Colonial Shuttle</li>
+		<li IfModActive="awgv.colonialshuttle">ModPatches/Colonial Shuttle</li>
 		<li IfModActive="Mckay.ColonyLeadership.11">ModPatches/Colony Leadership</li>
 		<li IfModActive="CEC.CombatEnthuCore, Mlie.CombatEnthusiastsCollection">ModPatches/Combat Enthusiast's Collection</li>
 		<li IfModActive="ComigoGames.Water.Turrets">ModPatches/Comigo's Fancy Floating Turrets</li>
@@ -144,7 +144,7 @@
 		<li IfModActive="Nazgul.EisenhansPowerArmor">ModPatches/Eisenhans Power Armor</li>
 		<li IfModActive="Macca.eltexsuit">ModPatches/Eltex Bodysuit</li>
 		<li IfModActive="BlackMarket420.EnchantedSword">ModPatches/Enchanted Sword</li>
-		<li IfModActive="det.epochspyrinth">ModPatches/Epochs - Pyrinth</li>		
+		<li IfModActive="det.epochspyrinth">ModPatches/Epochs - Pyrinth</li>
 		<li IfModActive="Outremer.Epona">ModPatches/Epona Race</li>
 		<li IfModActive="Hauvega.EquiumsSeries.Equiums">ModPatches/Equium</li>
 		<li IfModActive="Erin.AuRa">ModPatches/Erin's Au Ra</li>
@@ -165,7 +165,7 @@
 		<li IfModActive="Erin.Wildlife">ModPatches/Erin's Wildlife</li>
 		<li IfModActive="StatistNo1.EvolvedOrgansRedux">ModPatches/EvolvedOrgansRedux</li>
 		<li IfModActive="xedos.arsenalexotic">ModPatches/Exotic Arsenal</li>
-    	<li IfModActive="Argon.ExpandedMaterials.Metals">ModPatches/Expanded Materials - Metals</li>
+		<li IfModActive="Argon.ExpandedMaterials.Metals">ModPatches/Expanded Materials - Metals</li>
 		<li IfModActive="Argon.VMEuP">ModPatches/Expanded Materials - Plastics</li>
 		<li IfModActive="Adventurer.ExpandWoodwork">ModPatches/Expanded Woodworking</li>
 		<li IfModActive="Skullywag.ExtendedStorage, Mlie.ExtendedStorage">ModPatches/Extended Storage</li>
@@ -177,7 +177,7 @@
 		<li IfModActive="FrozenSnowFox.VanillaBionicsExpansion">ModPatches/FSF Vanilla Bionics Expansion</li>
 		<li IfModActive="Qux.factionmafia">ModPatches/Faction - Mafia</li>
 		<li IfModActive="zal.fnveliteriotgear">ModPatches/Fallout New Vegas - Elite Riot Gear</li>
-		<li IfModActive="Phaneron.Vault111Startpack">ModPatches/Fallout Vault 111 Starter Pack</li>		
+		<li IfModActive="Phaneron.Vault111Startpack">ModPatches/Fallout Vault 111 Starter Pack</li>
 		<li IfModActive="mercurydoll.fantasymetals">ModPatches/Fantasy Metals Reforged</li>
 		<li IfModActive="Mlie.FarmingExpansion">ModPatches/Farming Expansion</li>
 		<li IfModActive="spoonshortage.fashionrimsta">ModPatches/FashionRIMsta</li>
@@ -245,7 +245,7 @@
 		<li IfModActive="Mlie.JinRohKerberosPanzerCopArmor">ModPatches/Jin-Roh Kerberos Panzer Cop Armor</li>
 		<li IfModActive="K4G.Core">ModPatches/K4G Empires of Old - Core</li>
 		<li IfModActive="K4G.Guild">ModPatches/K4G Empires of Old - Engineers Institute</li>
-		<li IfModActive="K4G.K4G.Fellowship">ModPatches/K4G Empires of Old - The Alekeepers</li>		
+		<li IfModActive="K4G.Fellowship">ModPatches/K4G Empires of Old - The Alekeepers</li>		
 		<li IfModActive="K4G.Sultanate">ModPatches/K4G Empires of Old - The Faceless Sultainate</li>
 		<li IfModActive="K4G.Legion">ModPatches/K4G Empires of Old - The Polluted Legion</li>
 		<li IfModActive="K4G.Dynasty">ModPatches/K4G Empires of Old - The Rising Sun</li>
@@ -471,6 +471,7 @@
 		<li IfModActive="Rimsenal.Askbarn">ModPatches/Rimsenal Xenotype Pack - Askbarn</li>
 		<li IfModActive="SirMashedPotato.DarkDescent">ModPatches/Rimworld - The Dark Descent</li>
 		<li IfModActive="Mlie.RRUESContactLightArmory">ModPatches/Risk of Rain UES Contact Light Armory</li>
+		<li IfModActive="Ghastly.RoboticServitude">ModPatches/Robotic Servitude</li>
 		<li IfModActive="goudaquiche.LtfRockmenRace">ModPatches/Rockmen Race</li>
 		<li IfModActive="polonium.RorenRaceMod">ModPatches/Roren Race</li>
 		<li IfModActive="Bucko.RoyalArsenal">ModPatches/Royal Arsenal</li>
@@ -491,7 +492,7 @@
 		<li IfModActive="Rottweiler.SimplyMoreMelee, Mlie.SimplyMoreMelee">ModPatches/Simply More Melee</li>
 		<li IfModActive="PunkyRoo.SlimeRancher">ModPatches/Slime Rancher</li>
 		<li IfModActive="Ayameduki.HARSolark">ModPatches/Solark Race</li>
-    <li IfModActive="notdvd.spacerpack">ModPatches/Spacer Pack</li>
+		<li IfModActive="notdvd.spacerpack">ModPatches/Spacer Pack</li>
 		<li IfModActive="LTS.PS">ModPatches/Spacer Shields</li>
 		<li IfModActive="Mlie.SpaceWorms">ModPatches/Spaceworm</li>
 		<li IfModActive="HALO.RSF, Mlie.RimworldSpartanFoundry">ModPatches/Spartan Foundry</li>
@@ -565,6 +566,7 @@
 		<li IfModActive="VanillaExpanded.VPlantsEMushrooms">ModPatches/Vanilla Plants Expanded - Mushrooms</li>
 		<li IfModActive="VanillaExpanded.VPsycastsE">ModPatches/Vanilla Psycasts Expanded</li>
 		<li IfModActive="VanillaExpanded.VPE.Hemosage">ModPatches/Vanilla Psycasts Expanded - Hemosage</li>
+		<li IfModActive="Chairheir.VPERunesmith">ModPatches/Vanilla Psycasts Expanded - Runesmith</li>
 		<li IfModActive="vanillaracesexpanded.android">ModPatches/Vanilla Races Expanded - Android</li>
 		<li IfModActive="vanillaracesexpanded.archon">ModPatches/Vanilla Races Expanded - Archon</li>
 		<li IfModActive="vanillaracesexpanded.fungoid">ModPatches/Vanilla Races Expanded - Fungoid</li>
@@ -609,7 +611,8 @@
 		<li IfModActive="Kompadt.Warhammer.Dryad">ModPatches/Warhammer - Dryad</li>
 		<li IfModActive="flangopink.GF40KMaterials">ModPatches/Warhammer 40.000 - Imperium Materials</li>
 		<li IfModActive="GF40K.IoM.Weaponry">ModPatches/Warhammer 40.000 - Imperium Weaponry</li>
-		<li IfModActive="Phonicmas.BiotechExpansionWarhammer40k">ModPatches/Warhammer 40k - Genes and Psycasts</li>
+		<li IfModActive="Phonicmas.40kGenes">ModPatches/Warhammer 40k Genes</li>
+		<li IfModActive="Phonicmas.40kFactions">ModPatches/Warhammer 40k Factions</li>
 		<li IfModActive="Thek.WTB">ModPatches/Waster Toxic Breather</li>
 		<li IfModActive="Kyrrisayo.WeaponsPlus">ModPatches/Weapons+</li>
 		<li IfModActive="Owlchemist.Windows">ModPatches/Windows</li>
@@ -626,7 +629,8 @@
 		<li IfModActive="pphhyy.SanguinaryAnimals">ModPatches/pphhyy Sanguinary Animals</li>
 		<li IfModActive="pphhyy.LightlessEmpyrean">ModPatches/pphhyy's Lightless Empyrean</li>
 		<li IfModActive="heis.edo.themed.expansion">ModPatches/EdoThemedExpansion</li>
-		<!-- Mod Patches (Assemblies) -->		
+    <li IfModActive="ElSov.Beliar">ModPatches/Beliar Xenotype</li>
+		<!-- Mod Patches (Assemblies) -->
 		<li IfModActive="rwmt.Multiplayer">ModPatches/Multiplayer</li>
 		<li IfModActive="smashphil.neceros.srtsexpanded">ModPatches/SRTS</li>
 		<li IfModActive="SmashPhil.VehicleFramework">ModPatches/VehicleFramework</li>

ModPatches/Beliar Xenotype/Patches/Beliar Xenotype/Weapons.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BX_BloodletterBlade"]/statBases</xpath>
+		<value>
+			<Bulk>4</Bulk>
+			<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="BX_BloodletterBlade"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.00</MeleeCritChance>
+				<MeleeParryChance>0.40</MeleeParryChance>
+				<MeleeDodgeChance>0.27</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="BX_BloodletterBlade"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<chanceFactor>0.1</chanceFactor>
+					<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>GS_BleedDamage</li>
+					</capacities>
+					<power>14</power>
+					<cooldownTime>0.94</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>23</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Point</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>GS_BleedDamage</li>
+					</capacities>
+					<power>32</power>
+					<cooldownTime>0.83</cooldownTime>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>14</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>