Merge branch 'Development' into pr/Tostov/3139

CombatExtended-Continued · May 21, 2024 · 47aac32 · 47aac32
2 parents 112721e + d3f9df6
commit 47aac32
Show file tree

Hide file tree

Showing 12 changed files with 359 additions and 83 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -9,7 +9,7 @@
 	</supportedVersions>
 	<packageId>CETeam.CombatExtended</packageId>
 	<description>Version: 15.6.0.0\n\nExtends combat mechanics to make them deeper and more tactical.</description>
-	<modIconPath>UI/Icons/CE_ModIcon_JustHat</modIconPath>
+	<modIconPath IgnoreIfNoMatchingField="True">UI/Icons/CE_ModIcon_JustHat</modIconPath>
 	<modDependencies>
 		<li>
 			<packageId>brrainz.harmony</packageId>

diff --git a/Languages/ChineseSimplified/Keyed/Misc_Gameplay.xml b/Languages/ChineseSimplified/Keyed/Misc_Gameplay.xml
@@ -5,7 +5,7 @@
 	<CE_MeleeTargetting_CurHeight>近战攻击部位</CE_MeleeTargetting_CurHeight>
 	<CE_NoBP>未启用</CE_NoBP>
 	<CE_Yes>是</CE_Yes>
-	<CE_GiveAmmoToThing>将弹药交给</CE_GiveAmmoToThing>
+	<CE_GiveAmmoToThing>将弹药交给{0}</CE_GiveAmmoToThing>
 	<CE_Give>交给</CE_Give>
 	<CE_NoAmmoToGive>没有合适的弹药</CE_NoAmmoToGive>
 	<CE_AmmoAmount>交给的弹药数量：</CE_AmmoAmount>

diff --git a/Languages/English/Keyed/Misc_Gameplay.xml b/Languages/English/Keyed/Misc_Gameplay.xml
@@ -7,7 +7,7 @@
 	<CE_NoBP>None</CE_NoBP>
 	<CE_Yes>Yes</CE_Yes>
 	<CE_No>No</CE_No>
-	<CE_GiveAmmoToThing>Give ammo to</CE_GiveAmmoToThing>
+	<CE_GiveAmmoToThing>Give ammo to {0}</CE_GiveAmmoToThing>
 	<CE_Give>Give</CE_Give>
 	<CE_NoAmmoToGive>No compatible ammo</CE_NoAmmoToGive>
 	<CE_AmmoAmount>Amount of ammo to give:</CE_AmmoAmount>

diff --git a/Languages/PortugueseBrazilian/Keyed/Misc_Gameplay.xml b/Languages/PortugueseBrazilian/Keyed/Misc_Gameplay.xml
@@ -7,7 +7,7 @@
 	<CE_NoBP>Nenhuma</CE_NoBP>
 	<CE_Yes>Sim</CE_Yes>
 	<CE_No>Não</CE_No>
-	<CE_GiveAmmoToThing>Dar munição para</CE_GiveAmmoToThing>
+	<CE_GiveAmmoToThing>Dar munição para {0}</CE_GiveAmmoToThing>
 	<CE_Give>Dar</CE_Give>
 	<CE_NoAmmoToGive>Sem munição compatível</CE_NoAmmoToGive>
 	<CE_AmmoAmount>Quantidade de munição a dar:</CE_AmmoAmount>

diff --git a/LoadFolders.xml b/LoadFolders.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <loadFolders>
-	<v1.4>
+	<v1.5>
 		<!-- Core Files -->
 		<li>/</li>
 		<!-- DLC -->
@@ -106,6 +106,7 @@
 		<li IfModActive="Dumbs.DumbsDachshunds">ModPatches/Dumbs&apos; Dachshunds</li>
 		<li IfModActive="Harkon.DF.Dusk">ModPatches/Dusk Armory</li>
 		<li IfModActive="Rabbit.EdgeOfDescension">ModPatches/Edge of Descension - Monoblades</li>
+		<li IfModActive="Rabbit.EoDVanguard">ModPatches/Edge of Descension - Vanguard</li>
 		<li IfModActive="Nazgul.EisenhansPowerArmor">ModPatches/Eisenhans Power Armor</li>
 		<li IfModActive="Macca.eltexsuit">ModPatches/Eltex Bodysuit</li>
 		<li IfModActive="Ykara.EPOE">ModPatches/EPOE</li>
@@ -414,7 +415,7 @@
 		<li IfModActive="VanillaExpanded.VAPPE">ModPatches/Vanilla Apparel Expanded</li>
 		<li IfModActive="VanillaExpanded.VAEAccessories">ModPatches/Vanilla Apparel Expanded - Accessories</li>
 		<li IfModActive="VanillaExpanded.VARME">ModPatches/Vanilla Armour Expanded</li>
-		<li IfModActive="VanillaExpanded.BaseGeneration">ModPatches/Vanilla Base Generation Expanded</li>
+		<li IfModActive="VanillaExpanded.BaseGenerationExpanded">ModPatches/Vanilla Base Generation Expanded</li>
 		<li IfModActive="VanillaExpanded.VBrewE">ModPatches/Vanilla Brewing Expanded</li>
 		<li IfModActive="VanillaExpanded.VChemfuelE">ModPatches/Vanilla Chemfuel Expanded</li>
 		<li IfModActive="VanillaExpanded.VFEA">ModPatches/Vanilla Factions Expanded - Ancients</li>
@@ -590,6 +591,7 @@
 		<li IfModActive="840.Tach.GWarCasket">ModPatches/WarCasket Barbatos Gundam Addon</li>
 		<li IfModActive="Mlie.XennRace">ModPatches/Xenn</li>
 		<li IfModActive="Neronix17.OuterRim.DroidDepot">ModPatches/Outer Rim - Droid Depot</li>
-    <li IfModActive="VAMV.MaruRaceMod">ModPatches/Maru Race</li>
-	</v1.4>
+    	<li IfModActive="VAMV.MaruRaceMod">ModPatches/Maru Race</li>
+	</v1.5>
 </loadFolders>
+
diff --git a/ModPatches/Alpha Biomes/Patches/Alpha Biomes/Items_Resource_Stuff.xml b/ModPatches/Alpha Biomes/Patches/Alpha Biomes/Items_Resource_Stuff.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
+
 	<!-- ======== Psychotropic Fungus ======== -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="AB_PsychotropicFungus"]/statBases</xpath>
@@ -8,6 +9,14 @@
 		</value>
 	</Operation>
 
+	<!-- ======== Propane Fuel Tank ======== -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AB_Propane"]/statBases</xpath>
+		<value>
+			<Bulk>0.05</Bulk>
+		</value>
+	</Operation>
+
 	<!-- ======== Alcyonite Chunk ======== -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="AB_AlcyoniteChunk"]/statBases</xpath>
@@ -56,85 +65,46 @@
 	</Operation>
 
 	<Operation Class="PatchOperationAddModExtension">
-		<xpath>Defs/ThingDef[defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]</xpath>
+		<xpath>Defs/ThingDef[defName="AB_MushroomWoodLog" or defName="AB_CrystalWood" or defName="GU_RedWood"]</xpath>
 		<value>
 			<li Class="CombatExtended.StuffToughnessMultiplierExtensionCE">
 				<toughnessMultiplier>4</toughnessMultiplier>
 			</li>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Alpha Animals</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/equippedStatOffsets</xpath>
-					<value>
-						<equippedStatOffsets>
-							<MeleeCritChance>0.2</MeleeCritChance>
-							<MeleeParryChance>1</MeleeParryChance>
-							<MeleeDodgeChance>0.13</MeleeDodgeChance>
-						</equippedStatOffsets>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<Bulk>0.07</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-						<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-					</value>
-				</li>
-
-			</operations>
-		</match>
-
-		<nomatch Class="PatchOperationSequence">
-			<operations>
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Sharp</xpath>
-					<value>
-						<Bulk>0.07</Bulk>
-						<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
-						<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
-					</value>
-				</li>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>0.2</MeleeCritChance>
+				<MeleeParryChance>1</MeleeParryChance>
+				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
 
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Blunt</xpath>
-					<value>
-						<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
-					</value>
-				</li>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AB_MushroomWoodLog" or defName="AB_CrystalWood" or defName="GU_RedWood"]/statBases/StuffPower_Armor_Sharp</xpath>
+		<value>
+			<Bulk>0.07</Bulk>
+			<MeleeCounterParryBonus>1.33</MeleeCounterParryBonus>
+			<StuffPower_Armor_Sharp>0.1</StuffPower_Armor_Sharp>
+		</value>
+	</Operation>
 
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Heat</xpath>
-					<value>
-						<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
-					</value>
-				</li>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Blunt</xpath>
+		<value>
+			<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
+		</value>
+	</Operation>
 
-			</operations>
-		</nomatch>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="GU_RedWood" or defName="AB_MushroomWoodLog" or defName="AB_CrystalWood"]/statBases/StuffPower_Armor_Heat</xpath>
+		<value>
+			<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
+		</value>
 	</Operation>
+
 </Patch>