Merge branch 'Development' into pr/SamaelGray/3417

CombatExtended-Continued · Nov 30, 2024 · 3a92dae · 3a92dae
2 parents 63f41f0 + fb38321
commit 3a92dae
Show file tree

Hide file tree

Showing 857 changed files with 29,663 additions and 7,524 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,21 +12,23 @@ jobs:
     - uses: actions/checkout@v3
     - name: prebuild
       run: |
-        rm -rf AssemblyPublicizer
+        rm -rf AssemblyPublicizer csc.zip csc
         git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer
         mkdir -p Assemblies
         mkdir -p ${{ runner.temp }}/downloads
+        wget https://github.com/CombatExtended-Continued/roslyn/releases/download/CSC-13/csc.zip
+        unzip csc.zip
     - name: remove loader
       run: |
         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
+        TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer --csc $PWD/csc
         
     - name: build compat
       run: |
-        TEMP=${{ runner.temp }}/ python BuildCompat.py
+        TEMP=${{ runner.temp }}/ python BuildCompat.py --csc $PWD/csc
         
     - name: package
       run: |

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
@@ -22,24 +22,27 @@ jobs:
         git config --global user.name "GitHub Actions"
         git pull --no-ff --no-commit --allow-unrelated-histories -X theirs origin pull/${{ github.event.pull_request.number }}${{ github.event.inputs.PR }}/head:
         git status
+        rm -rf *.py *.so ./*/*.py ./*/*.so
         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 ${{ runner.temp }}/downloads
-        rm -rf AssemblyPublicizer
+        rm -rf AssemblyPublicizer csc.zip csc
         git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer
+        wget https://github.com/CombatExtended-Continued/roslyn/releases/download/CSC-13/csc.zip
+        unzip csc.zip
         
     - name: remove loader
       run: |
         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
+        TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer --csc $PWD/csc
 
     - name: build compat
       run: |
-        TEMP=${{ runner.temp }}/ python BuildCompat.py
+        TEMP=${{ runner.temp }}/ python BuildCompat.py --csc $PWD/csc
         
     - name: package
       run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,20 +13,21 @@ jobs:
     - uses: actions/checkout@v2
     - name: prebuild
       run: |
-        rm -rf AssemblyPublicizer
+        rm -rf AssemblyPublicizer csc csc.zip
         git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer
         mkdir -p Assemblies
         mkdir -p ${{ runner.temp }}/downloads
-        
+        wget https://github.com/CombatExtended-Continued/roslyn/releases/download/CSC-13/csc.zip
+        unzip csc.zip
     - name: remove loader
       run: |
         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
+        TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer --csc $PWD/csc
     - name: build compat
       run: |
-        TEMP=${{ runner.temp }}/ python BuildCompat.py
+        TEMP=${{ runner.temp }}/ python BuildCompat.py --csc $PWD/csc
     - name: package
       run: |
         mkdir CombatExtended

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>
@@ -8,7 +8,7 @@
 		<li>1.5</li>
 	</supportedVersions>
 	<packageId>CETeam.CombatExtended</packageId>
-	<description>Version: 15.6.0.0\n\nExtends combat mechanics to make them deeper and more tactical.</description>
+	<description>Version: 15.6.1.0\n\nExtends combat mechanics to make them deeper and more tactical.</description>
 	<modIconPath IgnoreIfNoMatchingField="True">UI/Icons/CE_ModIcon_JustHat</modIconPath>
 	<modDependencies>
 		<li>
@@ -24,6 +24,7 @@
 		<li>jelly.ProperShotguns</li>
 		<li>swedishmask.ProperShotgunsPatch</li>
 		<li>me.samboycoding.betterloading</li>
+		<li>me.samboycoding.betterloading.dev</li>
 		<li>majorhoff.rimthreaded</li>
 		<li>falconne.AFF</li>
 		<li>Sk.FlankingBonus</li>
@@ -55,7 +56,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>

diff --git a/Anomaly/Patches/Hediffs/Hediffs_Misc.xml b/Anomaly/Patches/Hediffs/Hediffs_Misc.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Patch>
+
+	<!-- ========== Inhumanization ========== -->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/HediffDef[defName="Inhumanized"]/stages/li/statFactors</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/HediffDef[defName="Inhumanized"]/stages/li</xpath>
+			<value>
+				<statFactors />
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="Inhumanized"]/stages/li/statFactors</xpath>
+		<value>
+			<Suppressability>0.5</Suppressability>
+		</value>
+	</Operation>
+
+</Patch>
diff --git a/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml b/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml
@@ -131,6 +131,13 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_HellcatRifle"]/graphicData</xpath>
+		<value>
+			<drawSize>(1.25,1.25)</drawSize>
+		</value>
+	</Operation>
+
 	<!-- ========== Incinerator ========== -->
 
 	<Operation Class="PatchOperationReplace">
@@ -246,4 +253,20 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Gun_Incinerator"]/graphicData</xpath>
+		<value>
+			<drawSize>(1.16,1.16)</drawSize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Gun_Incinerator"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawOffset>0.04,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
 </Patch>
diff --git a/Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml b/Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml
@@ -254,7 +254,7 @@
 		<value>
 			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
 			<ArmorRating_Blunt>1</ArmorRating_Blunt>
-			<PainShockThreshold>90</PainShockThreshold>
+			<PainShockThreshold>0.90</PainShockThreshold>
 			<MeleeDodgeChance>0.17</MeleeDodgeChance>
 			<MeleeCritChance>0.08</MeleeCritChance>
 			<MeleeParryChance>0.06</MeleeParryChance>
@@ -377,7 +377,7 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Noctol"]/statBases</xpath>
 		<value>
-			<PainShockThreshold>90</PainShockThreshold>
+			<PainShockThreshold>0.90</PainShockThreshold>
 			<MeleeDodgeChance>0.23</MeleeDodgeChance>
 			<MeleeCritChance>0.28</MeleeCritChance>
 			<MeleeParryChance>0.09</MeleeParryChance>
@@ -505,7 +505,7 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Gorehulk"]/statBases</xpath>
 		<value>
-			<PainShockThreshold>90</PainShockThreshold>
+			<PainShockThreshold>0.90</PainShockThreshold>
 			<MeleeDodgeChance>0.11</MeleeDodgeChance>
 			<MeleeCritChance>0.07</MeleeCritChance>
 			<MeleeParryChance>0.14</MeleeParryChance>
@@ -606,7 +606,7 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Devourer"]/statBases</xpath>
 		<value>
-			<PainShockThreshold>90</PainShockThreshold>
+			<PainShockThreshold>0.90</PainShockThreshold>
 			<MeleeDodgeChance>0.06</MeleeDodgeChance>
 			<MeleeCritChance>0.46</MeleeCritChance>
 			<MeleeParryChance>0.51</MeleeParryChance>
@@ -699,7 +699,7 @@
 			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
 			<ArmorRating_Blunt>5</ArmorRating_Blunt>
 			<IncomingDamageFactor>0.7</IncomingDamageFactor>
-			<PainShockThreshold>90</PainShockThreshold>
+			<PainShockThreshold>0.90</PainShockThreshold>
 			<MeleeDodgeChance>0.06</MeleeDodgeChance>
 			<MeleeCritChance>0.11</MeleeCritChance>
 			<MeleeParryChance>0.23</MeleeParryChance>

diff --git a/Anomaly/Patches/ThingDefs_Races/Races_Fleshbeasts.xml b/Anomaly/Patches/ThingDefs_Races/Races_Fleshbeasts.xml
@@ -5,7 +5,7 @@
 		<xpath>Defs/ThingDef[@Name="BaseFleshbeast"]/statBases</xpath>
 		<value>
 			<SmokeSensitivity>0.5</SmokeSensitivity>
-			<PainShockThreshold>99</PainShockThreshold>
+			<PainShockThreshold>0.99</PainShockThreshold>
 		</value>
 	</Operation>
 

diff --git a/Assemblies/CombatExtendedLoader.dll b/Assemblies/CombatExtendedLoader.dll
diff --git a/Biotech/Patches/Bodies/Bodies_Mechanoid_Heavy.xml b/Biotech/Patches/Bodies/Bodies_Mechanoid_Heavy.xml
@@ -35,6 +35,36 @@
 		</nomatch>
 	</Operation>
 
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]</xpath>
+			<value>
+				<groups />
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
+			<value>
+				<groups />
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]</xpath>
+			<value>
+				<groups />
+			</value>
+		</nomatch>
+	</Operation>
+
 	<Operation Class="PatchOperationConditional">
 		<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
 		<nomatch Class="PatchOperationAdd">
@@ -108,6 +138,27 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
 		<value>

diff --git a/Biotech/Patches/Bodies/Bodies_Mechanoid_Light.xml b/Biotech/Patches/Bodies/Bodies_Mechanoid_Light.xml
@@ -35,6 +35,36 @@
 		</nomatch>
 	</Operation>
 
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]</xpath>
+			<value>
+				<groups />
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
+			<value>
+				<groups />
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]</xpath>
+			<value>
+				<groups />
+			</value>
+		</nomatch>
+	</Operation>
+
 	<Operation Class="PatchOperationConditional">
 		<xpath>Defs/BodyDef[defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
 		<nomatch Class="PatchOperationAdd">
@@ -108,6 +138,27 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/BodyDef[defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
 		<value>