Merge branch 'Development' into SamaelGray-NaturalArmorTweaks

CombatExtended-Continued · Sep 18, 2024 · 8e1ede3 · 8e1ede3
2 parents 4bae453 + 13c4b5b
commit 8e1ede3
Show file tree

Hide file tree

Showing 621 changed files with 68,615 additions and 39,440 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <ModMetaData>
 
 	<name>Combat Extended</name>
@@ -55,7 +55,7 @@
 		<li>TheKingInYellow.Lope</li>
 		<li>Ludeon.RimWorld</li>
 		<li>Ludeon.RimWorld.Royalty</li>
-    <li>Ludeon.RimWorld.Anomaly</li>
+		<li>Ludeon.RimWorld.Anomaly</li>
 		<li>RunneLatki.RabbieRaceMod</li>
 		<li>HC.GiantRace</li>
 		<li>neronix17.fr.compilation</li>
@@ -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,9 @@
 		<li>K4G.Sultanate</li>
 		<li>Argon.VMEu</li>
 		<li>Bonible.rimsenalfactions</li>
+		<li>kentington.saveourship2</li>
+		<li>botchjob.profaned</li>
+		<li>oskarpotocki.vfe.mechanoid</li>
 	</loadAfter>
 
-</ModMetaData>
+</ModMetaData>
diff --git a/Anomaly/Defs/Ammo/Flamethrower_Burst.xml b/Anomaly/Defs/Ammo/Flamethrower_Burst.xml
@@ -9,7 +9,7 @@
 		<ammoTypes>
 			<Ammo_Flamethrower_Napalm>Bullet_Incinerator_Burst_Napalm</Ammo_Flamethrower_Napalm>
 			<Ammo_Flamethrower_Prometheum>Bullet_Incinerator_Burst_Prometheum</Ammo_Flamethrower_Prometheum>
-			<Ammo_Flamethrower_Bioferrite>Bullet_Incinerator_Burst_Bioferrite</Ammo_Flamethrower_Bioferrite>			
+			<Ammo_Flamethrower_Bioferrite>Bullet_Incinerator_Burst_Bioferrite</Ammo_Flamethrower_Bioferrite>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
@@ -20,7 +20,7 @@
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<label>jellied chemfuel stream</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<pelletCount>20</pelletCount>	
+			<pelletCount>20</pelletCount>
 			<damageDef>Flame</damageDef>
 			<damageAmountBase>3</damageAmountBase>
 			<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>

diff --git a/Anomaly/Defs/Ammo/NerveSpikerBolt.xml b/Anomaly/Defs/Ammo/NerveSpikerBolt.xml
@@ -23,7 +23,7 @@
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoCrossbowBoltBase">
 		<defName>Ammo_NerveSpikerBolt</defName>
 		<label>nerve spiker bolt</label>
-		<description>A heavy bioferrite bolt, shaped to be fired from a nerve spiker.\n\nThough simple to make, these bolts are brittle and tend to deform or break on impact.</description>		
+		<description>A heavy bioferrite bolt, shaped to be fired from a nerve spiker.\n\nThough simple to make, these bolts are brittle and tend to deform or break on impact.</description>
 		<graphicData>
 			<texPath>Things/Ammo/Medieval/Bolt/Bioferrite</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -55,7 +55,7 @@
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>NerveBioferrite</damageDef>
-			<speed>34</speed>			
+			<speed>34</speed>
 			<damageAmountBase>11</damageAmountBase>
 			<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
 			<armorPenetrationSharp>5</armorPenetrationSharp>

diff --git a/Anomaly/Defs/DamageDefs/DamageDefs_Anomaly.xml b/Anomaly/Defs/DamageDefs/DamageDefs_Anomaly.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
 
+	<DamageDef ParentName="Scratch">
+		<defName>DemolishScratch</defName>
+		<buildingDamageFactorImpassable>2</buildingDamageFactorImpassable>
+	</DamageDef>
+
 	<DamageDef ParentName="Nerve">
 		<defName>NerveBioferrite</defName>
 		<additionalHediffs>

diff --git a/Anomaly/Defs/HediffDefs/Hediffs_Anomaly.xml b/Anomaly/Defs/HediffDefs/Hediffs_Anomaly.xml
@@ -3,7 +3,7 @@
 
 	<!-- Global -->
 
- 	<!-- It would be preferable to apply the regen modifier is a factor, but that's not currently possible. -->
+	<!-- It would be preferable to apply the regen modifier is a factor, but that's not currently possible. -->
 
 	<HediffDef>
 		<defName>BioferriteToxicity</defName>
@@ -56,7 +56,7 @@
 					<IncomingDamageFactor>1.40</IncomingDamageFactor>
 				</statFactors>
 				<regeneration>-350</regeneration> <!-- Offsets impossible regeneration. -->
-			</li>			
+			</li>
 		</stages>
 	</HediffDef>
 

diff --git a/Anomaly/Defs/ToolCapacityDefs/ToolCapacity.xml b/Anomaly/Defs/ToolCapacityDefs/ToolCapacity.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ToolCapacityDef>
+		<defName>DemolishScratch</defName>
+		<label>scratch</label>
+	</ToolCapacityDef>
+
+</Defs>
diff --git a/Anomaly/Patches/AbilityDefs/Abilities_Anomaly.xml b/Anomaly/Patches/AbilityDefs/Abilities_Anomaly.xml
@@ -39,8 +39,8 @@
 		<value>
 			<projectile Class="CombatExtended.ProjectilePropertiesCE">
 				<damageAmountBase>11</damageAmountBase>
-				<armorPenetrationSharp>7.5</armorPenetrationSharp>
-				<armorPenetrationBlunt>8.2</armorPenetrationBlunt>
+				<armorPenetrationSharp>12</armorPenetrationSharp>
+				<armorPenetrationBlunt>16</armorPenetrationBlunt>
 			</projectile>
 		</value>
 	</Operation>
@@ -51,7 +51,7 @@
 		<xpath>Defs/AbilityDef[defName="SpikeLaunch_Fingerspike"]/verbProperties</xpath>
 		<value>
 			<verbProperties Class="CombatExtended.VerbPropertiesCE">
-				<range>18.9</range>
+				<range>12.9</range>
 				<defaultProjectile>Spike_Fingerspike</defaultProjectile>
 			</verbProperties>
 		</value>
@@ -62,8 +62,8 @@
 		<value>
 			<projectile Class="CombatExtended.ProjectilePropertiesCE">
 				<damageAmountBase>8</damageAmountBase>
-				<armorPenetrationSharp>3.85</armorPenetrationSharp>
-				<armorPenetrationBlunt>4.22</armorPenetrationBlunt>
+				<armorPenetrationSharp>9</armorPenetrationSharp>
+				<armorPenetrationBlunt>12</armorPenetrationBlunt>
 			</projectile>
 		</value>
 	</Operation>
@@ -73,11 +73,11 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/AbilityDef[defName="SpineLaunch_Gorehulk"]/verbProperties</xpath>
 		<value>
-			<verbProperties Class="CombatExtended.VerbPropertiesCE">		
+			<verbProperties Class="CombatExtended.VerbPropertiesCE">
 				<soundCast>Gorehulk_Spine_Launch</soundCast>
 				<range>27.9</range>
 				<defaultProjectile>Spine_Gorehulk</defaultProjectile>
-			</verbProperties>	
+			</verbProperties>
 		</value>
 	</Operation>
 
@@ -86,8 +86,8 @@
 		<value>
 			<projectile Class="CombatExtended.ProjectilePropertiesCE">
 				<damageAmountBase>15</damageAmountBase>
-				<armorPenetrationSharp>14.75</armorPenetrationSharp>
-				<armorPenetrationBlunt>16.16</armorPenetrationBlunt>
+				<armorPenetrationSharp>6</armorPenetrationSharp>
+				<armorPenetrationBlunt>8</armorPenetrationBlunt>
 			</projectile>
 		</value>
 	</Operation>
@@ -106,25 +106,25 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/AbilityDef[defName="Heatspikes"]/verbProperties</xpath>
 		<value>
-			<verbProperties Class="CombatExtended.VerbPropertiesCE">		
+			<verbProperties Class="CombatExtended.VerbPropertiesCE">
 				<soundCast>Heatspikes_Shot</soundCast>
-				<verbClass>CombatExtended.Verb_AbilityShootCE</verbClass>				
+				<verbClass>CombatExtended.Verb_AbilityShootCE</verbClass>
 				<soundCastTail>Heatspikes_Tail</soundCastTail>
-				<range>44.9</range>
+				<range>44</range>
 				<defaultProjectile>Bullet_Heatspike</defaultProjectile>
 				<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
 				<warmupTime>0</warmupTime>
-				<burstShotCount>12</burstShotCount>
+				<burstShotCount>10</burstShotCount>
 				<stopBurstWithoutLos>false</stopBurstWithoutLos>
 				<recoilAmount>3</recoilAmount> <!-- Abilities can't use ShotSpread, so give high recoil. -->
-			</verbProperties>	
+			</verbProperties>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Bullet_Heatspike"]/projectile</xpath>
 		<value>
-			<thingClass>CombatExtended.BulletCE</thingClass>	
+			<thingClass>CombatExtended.BulletCE</thingClass>
 			<projectile Class="CombatExtended.ProjectilePropertiesCE">
 				<damageDef>EnergyBolt</damageDef>
 				<damageAmountBase>18</damageAmountBase>
@@ -141,7 +141,7 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/AbilityDef[defName="FleshmelterBolt"]/verbProperties/range</xpath>
 		<value>
-			<range>44.9</range>
+			<range>44</range>
 		</value>
 	</Operation>
 

diff --git a/Anomaly/Patches/Bodies/Devourer.xml b/Anomaly/Patches/Bodies/Devourer.xml
@@ -10,7 +10,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Devourer"]/corePart</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -20,7 +20,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Neck"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -30,7 +30,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Fin"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -40,7 +40,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -50,7 +50,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -78,6 +78,13 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
 		<value>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,3 +24,5 @@ UnityEngine.dll


		.idea/
		__pycache__
		ModPatches/*/Assemblies/