Merge branch 'Development' into ListAmmoUser

CombatExtended-Continued · Aug 28, 2024 · c773f8a · c773f8a
2 parents 5748279 + d3129ed
commit c773f8a
Show file tree

Hide file tree

Showing 335 changed files with 52,102 additions and 41,004 deletions.
diff --git a/.github/workflows/duplicates.yml b/.github/workflows/duplicates.yml
@@ -0,0 +1,20 @@
+name: Check Patch Duplicates
+on:
+  pull_request:
+    branches: [ master, Development ]
+
+# Restrict the permissions of the ephemeral GitHub token used by this workflow
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Check for duplicate virtual file paths
+      run: |
+        python3 DupeFinder.py -c
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,12 +15,10 @@ jobs:
         rm -rf AssemblyPublicizer
         git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer
         mkdir -p Assemblies
-        mkdir -p AssembliesCore
-        mkdir -p AssembliesCompat
         mkdir -p ${{ runner.temp }}/downloads
-    - name: build loader
+    - name: remove loader
       run: |
-        TEMP=${{ runner.temp }}/ python Make.py --csproj Source/Loader/Loader.csproj --output Assemblies/0CombatExtendedLoader.dll --download-libs --all-libs
+        rm Assemblies/CombatExtendedLoader.dll
         
     - name: build core
       run: |
@@ -33,7 +31,7 @@ jobs:
     - name: package
       run: |
         mkdir CombatExtended
-        cp -r Source/ Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
+        cp -r Source/ Assemblies/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
         zip -9 -r build.zip CombatExtended
     - name: Upload to DO
       run: |

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
@@ -25,15 +25,13 @@ jobs:
         wget https://raw.githubusercontent.com/CombatExtended-Continued/CombatExtended/Development/Make.py -O Make.py
         wget https://raw.githubusercontent.com/CombatExtended-Continued/CombatExtended/Development/BuildCompat.py -O BuildCompat.py
         mkdir -p Assemblies
-        mkdir -p AssembliesCore
-        mkdir -p AssembliesCompat
         mkdir -p ${{ runner.temp }}/downloads
         rm -rf AssemblyPublicizer
         git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer
         
-    - name: build loader
+    - name: remove loader
       run: |
-        TEMP=${{ runner.temp }}/ python Make.py --csproj Source/Loader/Loader.csproj --output Assemblies/0CombatExtendedLoader.dll --download-libs --all-libs
+        rm Assemblies/CombatExtendedLoader.dll
         
     - name: build core
       run: |
@@ -46,7 +44,7 @@ jobs:
     - name: package
       run: |
         mkdir CombatExtended
-        cp -r Source/ Assemblies/ AssembliesCompat/ AssembliesCore/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
+        cp -r Source/ Assemblies/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
         zip -9 -r build.zip CombatExtended
     - name: Upload to DO
       run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,13 +16,11 @@ jobs:
         rm -rf AssemblyPublicizer
         git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer
         mkdir -p Assemblies
-        mkdir -p AssembliesCore
-        mkdir -p AssembliesCompat
         mkdir -p ${{ runner.temp }}/downloads
         
-    - name: build loader
+    - name: remove loader
       run: |
-        TEMP=${{ runner.temp }}/ python Make.py --csproj Source/Loader/Loader.csproj --output Assemblies/0CombatExtendedLoader.dll --download-libs --all-libs        
+        rm Assemblies/CombatExtendedLoader.dll
     - name: build core
       run: |
         TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer
@@ -32,7 +30,7 @@ jobs:
     - name: package
       run: |
         mkdir CombatExtended
-        cp -r Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
+        cp -r Assemblies/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
         zip -9 -r CombatExtended.zip CombatExtended
     - name: Upload Package
       id: upload-package

diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,5 @@ UnityEngine.dll
 
 
 .idea/
+__pycache__
+ModPatches/*/Assemblies/
diff --git a/About/About.xml b/About/About.xml
@@ -69,12 +69,10 @@
 		<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>
 		<li>JGH.MechanoidBench3</li>
-		<li>VanillaExpanded.VTEXE.SOS2</li>
 		<li>sarg.alphaanimals</li>
 		<li>sarg.magicalmenagerie</li>
 		<li>ObsidiaExpansion.Xenos.Mothoids</li>
@@ -88,6 +86,7 @@
 		<li>K4G.Sultanate</li>
 		<li>Argon.VMEu</li>
 		<li>Bonible.rimsenalfactions</li>
+		<li>kentington.saveourship2</li>
 	</loadAfter>
 
 </ModMetaData>
diff --git a/Anomaly/Patches/CreepjoinderDefs/Forms.xml b/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>
diff --git a/Anomaly/Patches/DamageDefs/Damages_Misc.xml → ...tches/DamageDefs/Anomaly_Damages_Misc.xml b/Anomaly/Patches/DamageDefs/Damages_Misc.xml → ...tches/DamageDefs/Anomaly_Damages_Misc.xml
diff --git a/Assemblies/0CombatExtendedLoader.dll b/Assemblies/0CombatExtendedLoader.dll
diff --git a/Assemblies/CombatExtendedLoader.dll b/Assemblies/CombatExtendedLoader.dll
diff --git a/Biotech/Patches/AbilityDefs/Abilities_Biotech.xml b/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>

diff --git a/Biotech/Patches/ThingDefs_Misc/Weapons/RangedIndustrial_Biotech.xml b/Biotech/Patches/ThingDefs_Misc/Weapons/RangedIndustrial_Biotech.xml
@@ -16,6 +16,13 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_LauncherGrenade"]/ammoTypes</xpath>
+		<value>
+			<Ammo_LauncherGrenade_Tox>Bullet_40x46mmGrenade_Tox</Ammo_LauncherGrenade_Tox>
+		</value>
+	</Operation>
+
 	<!-- ========== Tox Grenades ========== -->
 
 	<!-- Kill recipe maker -->

diff --git a/Biotech/Patches/ThingDefs_Misc/Weapons/RangedMechanoid_Light.xml b/Biotech/Patches/ThingDefs_Misc/Weapons/RangedMechanoid_Light.xml
@@ -44,7 +44,7 @@
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>Gun_MiniShotgun</defName>
 		<statBases>
-			<RangedWeapon_Cooldown>0.4</RangedWeapon_Cooldown>
+			<RangedWeapon_Cooldown>0.6</RangedWeapon_Cooldown>
 			<SightsEfficiency>1</SightsEfficiency>
 			<ShotSpread>0.15</ShotSpread>
 			<SwayFactor>0.53</SwayFactor>
@@ -62,7 +62,7 @@
 			<muzzleFlashScale>6</muzzleFlashScale>
 		</Properties>
 		<AmmoUser>
-			<magazineSize>8</magazineSize>
+			<magazineSize>6</magazineSize>
 			<reloadTime>4.9</reloadTime>
 			<ammoSet>AmmoSet_410Bore</ammoSet>
 		</AmmoUser>

diff --git a/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Light.xml b/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Light.xml
@@ -164,12 +164,13 @@
 		<value>
 			<ArmorRating_Blunt>4</ArmorRating_Blunt>
 			<ArmorRating_Sharp>2.5</ArmorRating_Sharp>
-			<AimingAccuracy>1.0</AimingAccuracy>
-			<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+			<AimingAccuracy>0.6</AimingAccuracy>
+			<ShootingAccuracyPawn>0.769</ShootingAccuracyPawn> <!-- Equivalent to a Level 5 Shooter -->
 			<MeleeDodgeChance>0.13</MeleeDodgeChance>
 			<MeleeCritChance>0.05</MeleeCritChance>
 			<MeleeParryChance>0.05</MeleeParryChance>
 			<MaxHitPoints>150</MaxHitPoints>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
 		</value>
 	</Operation>
 

diff --git a/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml b/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>

diff --git a/BuildCompat.py b/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:

diff --git a/Defs/Ammo/Advanced/164x284mmDemoShell.xml b/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>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,3 +24,5 @@ UnityEngine.dll


		.idea/
		__pycache__
		ModPatches/*/Assemblies/