Merge branch 'Development' into GrimWorld-Patch-Integration

.gitignore

@@ -24,3 +24,5 @@ UnityEngine.dll
 
 
 .idea/
+__pycache__
+ModPatches/*/Assemblies/

About/About.xml

@@ -48,15 +48,14 @@
 		<li>miho.fortifiedoutremer</li>
 		<li>co.uk.epicguru.whatsthatmod</li>
 		<li>sarg.alphagenes</li>
-		<li>OskarPotocki.VFE.Classical</li>	
-		<li>OskarPotocki.VFE.Tribals</li>
 	</loadBefore>
 	<loadAfter>
 		<li>brrainz.harmony</li>
 		<li>TheInfinityIQ.Halo.UNSC</li>
 		<li>TheKingInYellow.Lope</li>
 		<li>Ludeon.RimWorld</li>
 		<li>Ludeon.RimWorld.Royalty</li>
+    <li>Ludeon.RimWorld.Anomaly</li>
 		<li>RunneLatki.RabbieRaceMod</li>
 		<li>HC.GiantRace</li>
 		<li>neronix17.fr.compilation</li>
@@ -70,7 +69,6 @@
 		<li>AveryTheKitty.XenohumansAnthromorphs</li>
 		<li>PRF.Materials</li>
 		<li>Ryflamer.Rimcraft.Scenarios</li>
-		<li>DankPyon.Medieval.Overhaul</li>
 		<li>RimOfMadness.Vampires</li>
 		<li>sgc.moreutilitypacks</li>
 		<li>OskarPotocki.VFE.Pirates</li>

Anomaly/Patches/CreepjoinderDefs/Forms.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Creepjoiner inventory fixes ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CreepJoinerFormKindDef[defName="LeatheryStranger"]/fixedInventory</xpath>
+		<value>
+			<CE_Apparel_Backpack>
+				<stuff>WoolBison</stuff>
+				<quality>Poor</quality>
+			</CE_Apparel_Backpack>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CreepJoinerFormKindDef[defName="LeatheryStranger"]</xpath>
+		<value>
+			<inventoryOptions>
+				<subOptionsChooseOne>
+					<li>
+						<thingDef>Ammo_303British_FMJ</thingDef>
+						<countRange>20~40</countRange>
+					</li>
+					<li>
+						<thingDef>Ammo_303British_AP</thingDef>
+						<countRange>20~40</countRange>
+					</li>
+					<li>
+						<thingDef>Ammo_303British_HP</thingDef>
+						<countRange>20~40</countRange>
+					</li>										
+				</subOptionsChooseOne>
+			</inventoryOptions>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CreepJoinerFormKindDef[defName="DealMaker"]/fixedInventory</xpath>
+		<value>
+			<CE_Apparel_Backpack>
+				<stuff>Cloth</stuff>
+				<quality>Normal</quality>
+			</CE_Apparel_Backpack>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CreepJoinerFormKindDef[defName="DealMaker"]</xpath>
+		<value>
+			<inventoryOptions>
+				<subOptionsChooseOne>
+					<li>
+						<thingDef>Ammo_44Magnum_FMJ</thingDef>
+						<countRange>12~24</countRange>
+					</li>
+					<li>
+						<thingDef>Ammo_44Magnum_AP</thingDef>
+						<countRange>12~24</countRange>
+					</li>
+					<li>
+						<thingDef>Ammo_44Magnum_HP</thingDef>
+						<countRange>12~24</countRange>
+					</li>										
+				</subOptionsChooseOne>
+			</inventoryOptions>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CreepJoinerFormKindDef[defName="LoneGenius"]/fixedInventory</xpath>
+		<value>
+			<CE_Apparel_Backpack>
+				<stuff>Cloth</stuff>
+				<quality>Good</quality>
+			</CE_Apparel_Backpack>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/CreepJoinerFormKindDef[defName="LoneGenius"]/fixedInventory/Gun_ChargeLance</xpath>
+		<value>
+			<Gun_ChargeRifle />
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CreepJoinerFormKindDef[defName="LoneGenius"]</xpath>
+		<value>
+			<inventoryOptions>
+				<subOptionsChooseOne>
+					<li>
+						<thingDef>Ammo_6x24mmCharged</thingDef>
+						<countRange>60~120</countRange>
+					</li>
+					<li>
+						<thingDef>Ammo_6x24mmCharged_AP</thingDef>
+						<countRange>60~120</countRange>
+					</li>					
+				</subOptionsChooseOne>
+			</inventoryOptions>
+		</value>
+	</Operation>
+
+</Patch>

Biotech/Patches/AbilityDefs/Abilities_Biotech.xml

@@ -16,9 +16,9 @@
 			<projectile Class="CombatExtended.ProjectilePropertiesCE">
 				<damageDef>RangedStab</damageDef>
 				<speed>30</speed>
-				<damageAmountBase>20</damageAmountBase>
-				<armorPenetrationSharp>6</armorPenetrationSharp>
-				<armorPenetrationBlunt>8</armorPenetrationBlunt>
+				<damageAmountBase>15</damageAmountBase>
+				<armorPenetrationSharp>14</armorPenetrationSharp>
+				<armorPenetrationBlunt>21</armorPenetrationBlunt>
 			</projectile>
 		</value>
 	</Operation>

Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml

@@ -211,7 +211,7 @@
 		<xpath>Defs/ThingDef[defName="Mech_Scorcher"]/comps</xpath>
 		<value>
 			<li Class="CombatExtended.CompProperties_ArmorDurability">
-				<Durability>850</Durability>
+				<Durability>1000</Durability>
 				<Regenerates>true</Regenerates>
 				<RegenInterval>1250</RegenInterval>
 				<RegenValue>5</RegenValue>
@@ -223,7 +223,7 @@
 				<RepairTime>300</RepairTime>
 				<RepairValue>200</RepairValue>
 				<CanOverHeal>true</CanOverHeal>
-				<MaxOverHeal>85</MaxOverHeal>
+				<MaxOverHeal>100</MaxOverHeal>
 				<MinArmorPct>0.75</MinArmorPct>
 			</li>
 		</value>

BuildCompat.py

@@ -4,6 +4,7 @@
 from subprocess import Popen
 import re
 import sys
+from xml.dom.minidom import parse as XMLOpen
 
 tm = '-m' in sys.argv
 
@@ -37,8 +38,20 @@ def system(*cmd):
             if tm and name not in sys.argv: continue
             csproj = csproj.replace('\\', '/').split('/')
             csproj = FilePath("Source").descendant(csproj)
-            print(f"Building {name}")
             output = FilePath("AssembliesCompat").child(name+".dll")
+            with XMLOpen(csproj.path) as cpath:
+                op = cpath.getElementsByTagName("OutputPath")
+                if op:
+                    op = op[0].firstChild.data
+                    if 'ModPatches' in op:
+                        op = op.rsplit("..\\ModPatches", 1)[-1].replace('\\', '/').split('/')
+                        if op:
+                            od = FilePath("ModPatches").descendant(op)
+                            if not od.exists():
+                                od.makedirs()
+                            output = od.child(name+".dll")
+
+            print(f"Building {name}")
             system("python3", "Make.py", "--csproj", csproj.path, "--output", output.path, DOWNLOAD_LIBS, "--all-libs", "--publicizer", PUBLICIZER, "--", "-r:Assemblies/CombatExtended.dll")
 
 for t in tasks:

Defs/Ammo/Advanced/164x284mmDemoShell.xml

@@ -53,7 +53,7 @@
 				<explosiveRadius>1</explosiveRadius>
 				<damageAmountBase>18</damageAmountBase>
 				<explosiveDamageType>Thermobaric</explosiveDamageType>
-				<explosiveExpandPerStackcount>0.10</explosiveExpandPerStackcount>
+				<explosiveExpandPerStackcount>0.25</explosiveExpandPerStackcount>
 				<startWickHitPointsPercent>0.33</startWickHitPointsPercent>
 				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 				<explodeOnKilled>True</explodeOnKilled>

Defs/Ammo/Generic/Mech.xml

@@ -135,7 +135,7 @@
 				<explosiveRadius>1</explosiveRadius>
 				<damageAmountBase>18</damageAmountBase>
 				<explosiveDamageType>Thermobaric</explosiveDamageType>
-				<explosiveExpandPerStackcount>0.10</explosiveExpandPerStackcount>
+				<explosiveExpandPerStackcount>0.25</explosiveExpandPerStackcount>
 				<startWickHitPointsPercent>0.33</startWickHitPointsPercent>
 				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 				<explodeOnKilled>True</explodeOnKilled>

Defs/Ammo/Medieval/CannonBall.xml

@@ -115,7 +115,7 @@
 				<damageAmountBase>25</damageAmountBase>
 				<explosiveRadius>1.0</explosiveRadius>
 				<explosiveDamageType>Bomb</explosiveDamageType>
-				<explosiveExpandPerStackcount>0.033</explosiveExpandPerStackcount>
+				<explosiveExpandPerStackcount>1.0</explosiveExpandPerStackcount>
 				<startWickOnDamageTaken>
 					<li>Bomb</li>
 					<li>Flame</li>

Defs/Ammo/Modded/Warhammer 40k/PlasmaCannon.xml

@@ -95,7 +95,7 @@
 			<li Class="CompProperties_Explosive">
 				<explosiveRadius>0.5</explosiveRadius>
 				<explosiveDamageType>Bomb</explosiveDamageType>
-				<explosiveExpandPerStackcount>0.033</explosiveExpandPerStackcount>
+				<explosiveExpandPerStackcount>1.0</explosiveExpandPerStackcount>
 				<startWickHitPointsPercent>0.33</startWickHitPointsPercent>
 				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 				<explodeOnKilled>True</explodeOnKilled>

Defs/Ammo/Other/Flamethrower.xml

@@ -251,7 +251,7 @@
 
 	<RecipeDef ParentName="FlamethrowerAmmoRecipeBase" MayRequire="Ludeon.Rimworld.Anomaly">
 		<defName>MakeAmmo_Flamethrower_Bioferrite</defName>
-		<label>make bioferrite-infused x100</label>
+		<label>make bioferrite-infused chemfuel x100</label>
 		<description>Craft 100 units of bioferrite-infused chemfuel.</description>
 		<jobString>Making bioferrite-infused chemfuel.</jobString>
 		<ingredients>

Defs/Ammo/Rocket/84x246mmR.xml

@@ -122,7 +122,7 @@
 			<Mass>3.3</Mass>
 			<Bulk>8.35</Bulk>
 		</statBases>
-		<ammoClass>GrenadeHE</ammoClass>
+		<ammoClass>GrenadeHEDP</ammoClass>
 		<detonateProjectile>Bullet_84x246mmR_HEDP</detonateProjectile>
 	</ThingDef>
 
@@ -155,12 +155,13 @@
 			<Bulk>7.31</Bulk>
 		</statBases>
 		<ammoClass>BuckShot</ammoClass>
+		<generateAllowChance>0.5</generateAllowChance>
 		<comps>
 			<li Class="CompProperties_Explosive">
 				<damageAmountBase>20</damageAmountBase>
 				<explosiveRadius>1.0</explosiveRadius>
 				<explosiveDamageType>Bomb</explosiveDamageType>
-				<explosiveExpandPerStackcount>0.033</explosiveExpandPerStackcount>
+				<explosiveExpandPerStackcount>1.0</explosiveExpandPerStackcount>
 				<startWickOnDamageTaken>
 					<li>Bomb</li>
 				</startWickOnDamageTaken>
@@ -430,8 +431,8 @@
 			<!-- Originally 1100 flechettes are present, changed to 50 buffed projectile -->
 			<armorPenetrationSharp>5</armorPenetrationSharp>
 			<armorPenetrationBlunt>18</armorPenetrationBlunt>
-			<spreadMult>26.7</spreadMult>
-			<!-- x3 the normal spread -->
+			<spreadMult>17.8</spreadMult>
+			<!-- x2 the normal spread -->
 		</projectile>
 	</ThingDef>
 
@@ -581,7 +582,7 @@
 			</thingDefs>
 		</fixedIngredientFilter>
 		<products>
-			<Ammo_84x246mmR_HEAT>5</Ammo_84x246mmR_HEAT>
+			<Ammo_84x246mmR_Thermobaric>5</Ammo_84x246mmR_Thermobaric>
 		</products>
 	</RecipeDef>
 

Defs/Ammo/Rocket/90mmRecoilless.xml

@@ -72,7 +72,7 @@
 				<damageAmountBase>25</damageAmountBase>
 				<explosiveRadius>1.0</explosiveRadius>
 				<explosiveDamageType>Bomb</explosiveDamageType>
-				<explosiveExpandPerStackcount>0.033</explosiveExpandPerStackcount>
+				<explosiveExpandPerStackcount>1.0</explosiveExpandPerStackcount>
 				<startWickOnDamageTaken>
 					<li>Bomb</li>
 				</startWickOnDamageTaken>

Defs/Ammo/Shell/105mmHowitzer.xml

@@ -219,7 +219,7 @@
 			<li Class="CombatExtended.CompProperties_Fragments">
 				<fragments>
 					<Fragment_Large>40</Fragment_Large>
-					<Fragment_Small>44</Fragment_Small>
+					<Fragment_Small>65</Fragment_Small>
 				</fragments>
 				<fragAngleRange>-90~-40</fragAngleRange>
 			</li>