Merge branch 'Development' into pr/SamaelGray/3275

.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

.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: |

.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: |

.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

.gitignore

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

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,8 @@
 		<li>K4G.Sultanate</li>
 		<li>Argon.VMEu</li>
 		<li>Bonible.rimsenalfactions</li>
+		<li>kentington.saveourship2</li>
+		<li>oskarpotocki.vfe.mechanoid</li>
 	</loadAfter>
 
 </ModMetaData>

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 -->
@@ -162,7 +169,6 @@
 			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<range>10</range>
-			<minRange>3</minRange>
 			<warmupTime>0.8</warmupTime>
 			<noiseRadius>4</noiseRadius>
 			<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
@@ -187,4 +193,4 @@
 		<xpath>Defs/ThingDef[defName="Flamebow"]</xpath>
 	</Operation>
 
-</Patch>
+</Patch>

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>

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>
 

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/Generic/LauncherGrenade.xml

@@ -114,6 +114,21 @@
 		<detonateProjectile>Bullet_40x46mmGrenade_Smoke</detonateProjectile>
 	</ThingDef>
 
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoLauncherGrenadeBase" MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>Ammo_LauncherGrenade_Tox</defName>
+		<label>launcher grenade (Tox)</label>
+		<graphicData>
+			<texPath>Things/Ammo/GrenadeLauncher/Tox</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1.84</MarketValue>
+		</statBases>
+		<ammoClass>Toxic</ammoClass>
+		<generateAllowChance>0</generateAllowChance>
+		<detonateProjectile>Bullet_40x46mmGrenade_Tox</detonateProjectile>
+	</ThingDef>
+
 	<!-- ==================== Recipes ========================== -->
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
@@ -160,6 +175,51 @@
 		<workAmount>9000</workAmount>
 	</RecipeDef>
 
+	<RecipeDef ParentName="LauncherAmmoRecipeBase">
+		<defName>MakeAmmo_LauncherGrenade_HE_TFuzed</defName>
+		<label>make launcher HE Time-Fuzed grenades x100</label>
+		<description>Craft 100 launcher HE Time-Fuzed grenades.</description>
+		<jobString>Making launcher HE Time-Fuzed grenades.</jobString>
+		<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>8</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_LauncherGrenade_HE_TFuzed>100</Ammo_LauncherGrenade_HE_TFuzed>
+		</products>
+		<workAmount>11200</workAmount>
+	</RecipeDef>
+
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_LauncherGrenade_HEDP</defName>
 		<label>make launcher HEDP grenades x100</label>
@@ -287,4 +347,52 @@
 		<workAmount>7400</workAmount>
 	</RecipeDef>
 
+	<RecipeDef ParentName="LauncherAmmoRecipeBase" MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>MakeAmmo_LauncherGrenade_Tox</defName>
+		<label>make launcher tox grenades x100</label>
+		<description>Craft 100 launcher tox grenades.</description>
+		<jobString>Making launcher tox grenades.</jobString>
+		<researchPrerequisites>
+			<li>CE_Launchers</li>
+			<li>ToxGas</li>
+		</researchPrerequisites>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>3</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_LauncherGrenade_Tox>100</Ammo_LauncherGrenade_Tox>
+		</products>
+		<workAmount>7400</workAmount>
+	</RecipeDef>
+
 </Defs>

Defs/Ammo/Medieval/CannonBall.xml

@@ -305,9 +305,9 @@
 
 	<RecipeDef ParentName="AmmoRecipeBase">
 		<defName>MakeAmmo_CannonBall_Bursting</defName>
-		<label>make bursting shells cannon balls x5</label>
-		<description>Craft 5 bursting shells cannon balls.</description>
-		<jobString>Making bursting shells cannon balls.</jobString>
+		<label>make bursting cannon shells x5</label>
+		<description>Craft 5 bursting cannon shells.</description>
+		<jobString>Making bursting cannon shells.</jobString>
 		<researchPrerequisite>CE_Gunpowder</researchPrerequisite>
 		<ingredients>
 			<li>
@@ -341,9 +341,9 @@
 
 	<RecipeDef ParentName="AmmoRecipeBase">
 		<defName>MakeAmmo_CannonBall_Incendiary</defName>
-		<label>make incendiary shells cannon balls x5</label>
-		<description>Craft 5 incendiary shells cannon balls.</description>
-		<jobString>Making incendiary shells cannon balls.</jobString>
+		<label>make incendiary cannon shells x5</label>
+		<description>Craft 5 incendiary cannon shells.</description>
+		<jobString>Making incendiary cannon shells.</jobString>
 		<researchPrerequisite>CE_Gunpowder</researchPrerequisite>
 		<ingredients>
 			<li>