Skip to content

Commit 22bc315

Browse files
N7HuntsmanN7Huntsman
authored
Merge pull request #4491 from CombatExtended-Continued/Development
Dev to Master PR
2 parents c566c9e + f843f26 commit 22bc315

File tree

784 files changed

+129139
-45616
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

784 files changed

+129139
-45616
lines changed

‎.github/workflows/duplicates.yml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.github/workflows/validate-loadfolders-xml.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: LoadFolders.xml validation
2+
on:
3+
pull_request:
4+
branches: [ master, Development, backports-1.4 ]
5+
6+
# Restrict the permissions of the ephemeral GitHub token used by this workflow
7+
permissions:
8+
contents: read
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-24.04
13+
14+
steps:
15+
- uses: actions/checkout@v6
16+
with:
17+
fetch-depth: 0
18+
- uses: actions/setup-dotnet@v5
19+
with:
20+
# Note: Runners may have different, newer .NET SDKs preinstalled.
21+
# Use global.json to control the maximum acceptable version.
22+
dotnet-version: '9.x'
23+
- name: Validate LoadFolders.xml
24+
run: dotnet test Source/CombatExtended.sln

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ UnityEngine.dll
2626
.idea/
2727
__pycache__
2828
ModPatches/*/Assemblies/
29+
.vs/

‎About/About.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<li>1.6</li>
99
</supportedVersions>
1010
<packageId>CETeam.CombatExtended</packageId>
11-
<modVersion>16.7.1.0</modVersion>
11+
<modVersion>16.7.2.0</modVersion>
1212
<description>Extends combat mechanics to make them deeper and more tactical.</description>
1313
<modIconPath IgnoreIfNoMatchingField="True">UI/Icons/CE_ModIcon_JustHat</modIconPath>
1414
<modDependencies>
@@ -51,7 +51,8 @@
5151
<li>sarg.alphagenes</li>
5252
<li>sarg.alphabiomes</li>
5353
<li>accurex.medievalempireoverhaul</li>
54-
<li>BlackMarket420.Kerberos</li>
54+
<li>BlackMarket420.Kerberos</li>
55+
<li>van.beasts</li>
5556
</loadBefore>
5657
<loadAfter>
5758
<li>brrainz.harmony</li>
@@ -96,7 +97,11 @@
9697
<li>oskarpotocki.vfe.medieval2</li>
9798
<li>rooboid.faun</li>
9899
<li>rooboid.satyr</li>
100+
<li>det.spacerarsenal</li>
101+
<li>det.venators</li>
99102
<li>DankPyon.Medieval.Overhaul</li>
103+
<li>vanillaquestsexpanded.deadlife</li>
104+
<li>vanillaracesexpanded.android</li>
100105
</loadAfter>
101106

102-
</ModMetaData>
107+
</ModMetaData>

‎Biotech/Patches/Biotech/Bodies/Bodies_Mechanoid_Medium.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@
170170
<Operation Class="PatchOperationReplace">
171171
<xpath>Defs/BodyDef[defName="Scorcher"]/corePart/parts/li[def="FluidReprocessor"]/coverage</xpath>
172172
<value>
173-
<coverage>0.05</coverage>
174-
</value>
173+
<coverage>0.05</coverage>
174+
</value>
175175
</Operation>
176176

177177
<!-- ==================== Apocriton ==================== -->

‎Defs/Ammo/Advanced/12GaugeCharged.xml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
101101
<pelletCount>6</pelletCount>
102102
<spreadMult>8.9</spreadMult>
103+
<shieldDamageMultiplier>0.25</shieldDamageMultiplier>
103104
</projectile>
104105
</ThingDef>
105106

@@ -140,16 +141,17 @@
140141
<pelletCount>6</pelletCount>
141142
<spreadMult>8.9</spreadMult>
142143
<empShieldBreakChance>0.025</empShieldBreakChance>
144+
<shieldDamageMultiplier>0.25</shieldDamageMultiplier>
143145
</projectile>
144146
</ThingDef>
145147

146148
<!-- ==================== Recipes ========================== -->
147149

148150
<RecipeDef ParentName="ChargeAmmoRecipeBase">
149151
<defName>MakeAmmo_12GaugeCharged</defName>
150-
<label>make 12 gauge Charged shell x200</label>
151-
<description>Craft 200 12Gauge Charged shells.</description>
152-
<jobString>Making 12Gauge Charged shells.</jobString>
152+
<label>make 12 Gauge Charged shell x200</label>
153+
<description>Craft 200 12 Gauge Charged shells.</description>
154+
<jobString>Making 12 Gauge Charged shells.</jobString>
153155
<ingredients>
154156
<li>
155157
<filter>
@@ -191,9 +193,9 @@
191193

192194
<RecipeDef ParentName="ChargeAmmoRecipeBase">
193195
<defName>MakeAmmo_12GaugeCharged_Slug</defName>
194-
<label>make 12 gauge Charged (Slug) shell x200</label>
195-
<description>Craft 200 12 gauge Charged (Slug) shells.</description>
196-
<jobString>Making 12Gauge Charged (Slug) shells.</jobString>
196+
<label>make 12 Gauge Charged (Slug) shell x200</label>
197+
<description>Craft 200 12 Gauge Charged (Slug) shells.</description>
198+
<jobString>Making 12 Gauge Charged (Slug) shells.</jobString>
197199
<ingredients>
198200
<li>
199201
<filter>
@@ -235,9 +237,9 @@
235237

236238
<RecipeDef ParentName="ChargeAmmoRecipeBase">
237239
<defName>MakeAmmo_12GaugeCharged_Ion</defName>
238-
<label>make 12 gauge Charged (Ion Shot) shell x200</label>
239-
<description>Craft 200 12 gauge Charged (Ion Shot) shells.</description>
240-
<jobString>Making 12 gauge Charged (Ion Shot) shells.</jobString>
240+
<label>make 12 Gauge Charged (Ion Shot) shell x200</label>
241+
<description>Craft 200 12 Gauge Charged (Ion Shot) shells.</description>
242+
<jobString>Making 12 Gauge Charged (Ion Shot) shells.</jobString>
241243
<ingredients>
242244
<li>
243245
<filter>

‎Defs/Ammo/Advanced/12mmRailgun.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<li>CE_AutoEnableTrade</li>
3333
<li>CE_AutoEnableCrafting_FabricationBench</li>
3434
<li>CE_AutoEnableCrafting_TableMachining</li>
35-
<li>CE_40K_MediumAmmo</li>
35+
<li>CE_40K_MediumAmmo</li>
3636
<!-- Railgun ammo isn't handloaded because it contains no propellant, and the sabots must be precision-machined anyway -->
3737
</tradeTags>
3838
<thingCategories>

‎Defs/Ammo/Advanced/70mmMechanoidGrenade.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
<explosionRadius>5</explosionRadius>
107107
<damageDef>EMP</damageDef>
108108
<damageAmountBase>132</damageAmountBase>
109+
<empShieldBreakChance>1</empShieldBreakChance>
109110
</projectile>
110111
</ThingDef>
111112

‎Defs/Ammo/AmmoInjectorOptions.xml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Defs>
3+
4+
<!-- Automatically handles duplicating recipes from the specified workbench onto the modded workbench mentioned. -->
5+
<CombatExtended.AmmoInjectorOptions>
6+
<defName>ammoInjectorOptions</defName>
7+
<benchesByTag>
8+
9+
<CE_AutoEnableCrafting_FueledSmithy>
10+
<li MayRequire="vanillaexpanded.vfeproduction">VFE_TableSmithyLarge</li>
11+
<li MayRequire="vanillaexpanded.gravship">VGE_CompactSmithy</li>
12+
</CE_AutoEnableCrafting_FueledSmithy>
13+
14+
<CE_AutoEnableCrafting_ElectricSmithy>
15+
<li MayRequire="vanillaexpanded.vfeproduction">VFE_TableSmithyLarge</li>
16+
<li MayRequire="vanillaexpanded.gravship">VGE_CompactSmithy</li>
17+
</CE_AutoEnableCrafting_ElectricSmithy>
18+
19+
<CE_AutoEnableCrafting_DrugLab>
20+
<li MayRequire="vanillaexpanded.vfeproduction">VFE_TableDrugLabElectric</li>
21+
<li MayRequire="vanillaexpanded.gravship">VGE_CompactDrugLab</li>
22+
</CE_AutoEnableCrafting_DrugLab>
23+
24+
<CE_AutoEnableCrafting_TableMachining>
25+
<li MayRequire="vanillaexpanded.vfeproduction">VFE_TableMachiningLarge</li>
26+
<li MayRequire="vanillaexpanded.gravship">VGE_CompactMachiningTable</li>
27+
</CE_AutoEnableCrafting_TableMachining>
28+
29+
<CE_AutoEnableCrafting_FabricationBench>
30+
<li MayRequire="vanillaexpanded.gravship">VGE_CompactFabBench</li>
31+
</CE_AutoEnableCrafting_FabricationBench>
32+
33+
</benchesByTag>
34+
</CombatExtended.AmmoInjectorOptions>
35+
36+
</Defs>

‎Defs/Ammo/Grenade/40x46mmGrenade.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<tradeTags>
3535
<li>CE_AutoEnableTrade</li>
3636
<li>CE_AutoEnableCrafting_TableMachining</li>
37-
<li>CE_40K_HeavyAmmo</li>
37+
<li>CE_40K_HeavyAmmo</li>
3838
</tradeTags>
3939
<thingCategories>
4040
<li>Ammo40x46mmGrenades</li>

0 commit comments

Comments
 (0)