Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Halo UNSC Weapon Pack patch #3632

Merged
merged 5 commits into from
Jan 10, 2025
Merged

Update Halo UNSC Weapon Pack patch #3632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca98fba
Add files via upload
incorruptable Jan 9, 2025
0b3b1d4
Add files via upload
incorruptable Jan 9, 2025
459a3fa
Merge pull request #1 from incorruptable/Halo-UNSC-Weapon-Pack-Patch
incorruptable Jan 9, 2025
7a268bd
Housekeeping
N7Huntsman Jan 10, 2025
f5a5c44
Convert halo mod ammo
N7Huntsman Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...o Ammo/Defs/Halo Ammo/102mmM41Rockets.xml → Defs/Ammo/Modded/Halo/102mmM41Rockets.xml
View file
Open in desktop
File renamed without changes.
0 ...es/Halo Ammo/Defs/Halo Ammo/12.7x40mm.xml → Defs/Ammo/Modded/Halo/12.7x40mm.xml
View file
Open in desktop
File renamed without changes.
0 ...es/Halo Ammo/Defs/Halo Ammo/12.7x99mm.xml → Defs/Ammo/Modded/Halo/12.7x99mm.xml
View file
Open in desktop
File renamed without changes.
0 ...lo Ammo/Defs/Halo Ammo/14.5x114mmUNSC.xml → Defs/Ammo/Modded/Halo/14.5x114mmUNSC.xml
View file
Open in desktop
File renamed without changes.
0 ...ches/Halo Ammo/Defs/Halo Ammo/16x65mm.xml → Defs/Ammo/Modded/Halo/16x65mm.xml
View file
Open in desktop
File renamed without changes.
0 ...mo/Defs/Halo Ammo/40x46mmGrenadesUNSC.xml → .../Ammo/Modded/Halo/40x46mmGrenadesUNSC.xml
View file
Open in desktop
File renamed without changes.
0 ...lo Ammo/Defs/Halo Ammo/5x23mmCaseless.xml → Defs/Ammo/Modded/Halo/5x23mmCaseless.xml
View file
Open in desktop
File renamed without changes.
0 ...alo Ammo/Defs/Halo Ammo/7.62x51mmUNSC.xml → Defs/Ammo/Modded/Halo/7.62x51mmUNSC.xml
View file
Open in desktop
File renamed without changes.
0 ...ches/Halo Ammo/Defs/Halo Ammo/8 Gauge.xml → Defs/Ammo/Modded/Halo/8 Gauge.xml
View file
Open in desktop
File renamed without changes.
0 ...hes/Halo Ammo/Defs/Halo Ammo/9.5x40mm.xml → Defs/Ammo/Modded/Halo/9.5x40mm.xml
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...Ammo/Defs/Halo Ammo/Ammo_SpartanLaser.xml → Defs/Ammo/Modded/Halo/Ammo_SpartanLaser.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<defName>AmmoSet_SpartanLaser</defName>
<label>Spartan laser battery cell</label>
<ammoTypes>
<Ammo_HeavyLaserChargePack>Bullet_Laser_SpartanLaser</Ammo_HeavyLaserChargePack>
<Ammo_HeavyLaserChargePack>Bullet_Laser_SpartanLaserInf</Ammo_HeavyLaserChargePack>
</ammoTypes>
</CombatExtended.AmmoSetDef>

Expand All @@ -58,8 +58,8 @@
<Bulk>1</Bulk>
</statBases>
<tradeTags>
<li>CE_AutoEnableTrade_Sellable</li>
<li>CE_AutoEnableCrafting_FabricationBench</li>
<li>CE_AutoEnableTrade</li>
<li>CE_AutoEnableCrafting</li>
</tradeTags>
<thingCategories>
<li>AmmoHeavyLaserChargePack</li>
Expand Down
0 ...lo Ammo/Defs/Halo Ammo/Ammo_UNSC_Misc.xml → Defs/Ammo/Modded/Halo/Ammo_UNSC_Misc.xml
View file
Open in desktop
File renamed without changes.
6 changes: 2 additions & 4 deletions LoadFolders.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,7 @@
<li IfModActive="pphhyy.Gulden">ModPatches/Gulden Mod</li>
<li IfModActive="Monti.HalfDragons">ModPatches/Half Dragons</li>
<li IfModActive="HLX.RimworldUNSCArmoury">ModPatches/Halo - UNSC Armoury</li>
<li IfModActive="TheInfinityIQ.Halo.UNSC_copy">ModPatches/Halo Ammo</li>
<li IfModActive="TheInfinityIQ.Halo.UNSC_copy">ModPatches/Halo UNSC Weapon Pack</li>
<li IfModActive="TheInfinityIQ.Halo.UNSC">ModPatches/Halo UNSC Weapon Pack</li>
<li IfModActive="PitchStone.HeavyMeleeWeapons, Mlie.HeavyMeleeWeapons">ModPatches/Heavy Melee Weapons</li>
<li IfModActive="Bando.Heyrathehorned">ModPatches/Heyra the Horned</li>
<li IfModActive="zal.highcaliber">ModPatches/High Caliber</li>
Expand Down Expand Up @@ -405,7 +404,7 @@
<li IfModActive="arquebus.psyblasters">ModPatches/PsyBlasters</li>
<li IfModActive="detvisor.pulseweaponry">ModPatches/Pulse Weaponry</li>
<li IfModActive="Mlie.PulsefireTurret">ModPatches/Pulsefire Turret</li>
<li IfModActive="Rah.RBSE,Rah.RBSEHC">ModPatches/RBSE</li>
<li IfModActive="Rah.RBSE">ModPatches/RBSE</li>
<li IfModActive="RH.DOOM">ModPatches/RH2 DOOM</li>
<li IfModActive="RH2.Faction.Bounty.Hunters">ModPatches/RH2 Faction - Bounty Hunters</li>
<li IfModActive="RH2.Faction.Gruppa.Krovi">ModPatches/RH2 Faction - Gruppa Krovi</li>
Expand All @@ -432,7 +431,6 @@
<li IfModActive="ReGrowth.BOTR.Core">ModPatches/ReGrowth - Core</li>
<li IfModActive="ReGrowth.BOTR.ExtinctAnimalsPack">ModPatches/ReGrowth - Extinct Animals</li>
<li IfModActive="ReGrowth.BOTR.Wastelands">ModPatches/ReGrowth - Wastelands</li>
<li IfModActive="mlie.reinforcedmechanoid2">ModPatches/Reinforced Mechanoid 2</li>
<li IfModActive="Bonible.ReconMech">ModPatches/Recon Mechanoid</li>
<li IfModActive="Mlie.RedArmy">ModPatches/Red Army</li>
<li IfModActive="vonschtirlitz.RCA">ModPatches/Redcoat Apparel</li>
Expand Down
63 changes: 42 additions & 21 deletions ModPatches/Halo UNSC Weapon Pack/Patches/Halo UNSC Weapon Pack/UNSC_CE.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>

<!-- ========== Research ========== -->
<Operation Class="PatchOperationReplace">
<xpath>Defs/ResearchProjectDef[defName="UNSC_RocketLauncher"]/prerequisites</xpath>
<value>
Expand All @@ -13,7 +14,7 @@

<!-- ========== Melee Tools ========== -->
<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="M7_SubmachineGun" or defName="M6D_Personal_Defense_Weapon_System"]/tools</xpath>
<xpath>Defs/ThingDef[defName="VULCAN_UNSC_M7_SubmachineGun" or defName="VULCAN_UNSC_M6D_Personal_Defense_Weapon_System"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
Expand Down Expand Up @@ -42,8 +43,16 @@
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="MA5D_ICWS" or defName="BR85_Service_Rifle" or defName="M90-CAWS_Shotgun"
or defName="SRS99C-S2_AM" or defName="M392_Designated_Marksman_Rifle" or defName="M41_SSR_MAV_AW" or defName="M319_Individual_Grenade_Launcher" or defName="M739_SAW" or defName="Asymmetric_Recoilless_Carbine" or defName="W-AV_M6_G-NR"]/tools </xpath>
<xpath>Defs/ThingDef[defName="VULCAN_UNSC_MA5D_ICWS" or
defName="VULCAN_UNSC_BR85_Service_Rifle" or
defName="VULCAN_UNSC_M90-CAWS_Shotgun" or
defName="VULCAN_UNSC_SRS99C-S2_AM" or
defName="VULCAN_UNSC_M392_Designated_Marksman_Rifle" or
defName="VULCAN_UNSC_M41_SSR_MAV_AW" or
defName="VULCAN_UNSC_M319_Individual_Grenade_Launcher" or
defName="VULCAN_UNSC_M739_SAW" or
defName="VULCAN_UNSC_Asymmetric_Recoilless_Carbine" or
defName="VULCAN_UNSC_W-AV_M6_G-NR"]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
Expand Down Expand Up @@ -82,7 +91,7 @@
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName='M6D_Personal_Defense_Weapon_System' or defName='M7_SubmachineGun' or defName='M319_Individual_Grenade_Launcher']/recipeMaker/skillRequirements</xpath>
<xpath>Defs/ThingDef[defName="VULCAN_UNSC_M6D_Personal_Defense_Weapon_System" or defName="VULCAN_UNSC_M7_SubmachineGun" or defName="VULCAN_UNSC_M319_Individual_Grenade_Launcher"]/recipeMaker/skillRequirements</xpath>
<value>
<skillRequirements>
<Crafting>5</Crafting>
Expand All @@ -91,7 +100,7 @@
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName='MA5D_ICWS' or defName='BR85_Service_Rifle' or defName='M392_Designated_Marksman_Rifle']/recipeMaker/skillRequirements</xpath>
<xpath>Defs/ThingDef[defName="VULCAN_UNSC_MA5D_ICWS" or defName="VULCAN_UNSC_BR85_Service_Rifle" or defName="VULCAN_UNSC_M392_Designated_Marksman_Rifle"]/recipeMaker/skillRequirements</xpath>
<value>
<skillRequirements>
<Crafting>6</Crafting>
Expand All @@ -100,7 +109,7 @@
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName='SRS99C-S2_AM' or defName='M739_SAW' or defName='Asymmetric_Recoilless_Carbine']/recipeMaker/skillRequirements</xpath>
<xpath>Defs/ThingDef[defName="VULCAN_UNSC_SRS99C-S2_AM" or defName="VULCAN_UNSC_M739_SAW" or defName="VULCAN_UNSC_Asymmetric_Recoilless_Carbine"]/recipeMaker/skillRequirements</xpath>
<value>
<skillRequirements>
<Crafting>7</Crafting>
Expand All @@ -109,7 +118,7 @@
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName='W-AV_M6_G-NR']/recipeMaker/skillRequirements</xpath>
<xpath>Defs/ThingDef[defName="VULCAN_UNSC_W-AV_M6_G-NR"]/recipeMaker/skillRequirements</xpath>
<value>
<skillRequirements>
<Crafting>8</Crafting>
Expand All @@ -118,12 +127,24 @@
</Operation>

<Operation Class="PatchOperationRemove">
<xpath>Defs/ThingDef[defName='SRS99C-S2_AM' or defName='M739_SAW' or defName='Asymmetric_Recoilless_Carbine' or defName='MA5D_ICWS' or defName='BR85_Service_Rifle' or defName='M392_Designated_Marksman_Rifle' or defName='W-AV_M6_G-NR' or defName='M6D_Personal_Defense_Weapon_System' or defName='M7_SubmachineGun' or defName='M319_Individual_Grenade_Launcher' or defName='M41_SSR_MAV_AW'or defName='M90-CAWS_Shotgun']/statBases/MarketValue</xpath>
<xpath>Defs/ThingDef[defName="VULCAN_UNSC_SRS99C-S2_AM" or
defName="VULCAN_UNSC_M739_SAW" or
defName="VULCAN_UNSC_Asymmetric_Recoilless_Carbine" or
defName="VULCAN_UNSC_MA5D_ICWS" or
defName="VULCAN_UNSC_BR85_Service_Rifle" or
defName="VULCAN_UNSC_M392_Designated_Marksman_Rifle" or
defName="VULCAN_UNSC_W-AV_M6_G-NR" or
defName="VULCAN_UNSC_M6D_Personal_Defense_Weapon_System" or
defName="VULCAN_UNSC_M7_SubmachineGun" or
defName="VULCAN_UNSC_M319_Individual_Grenade_Launcher" or
defName="VULCAN_UNSC_M41_SSR_MAV_AW" or
defName="VULCAN_UNSC_M90-CAWS_Shotgun"]/statBases/MarketValue
</xpath>
</Operation>

<!-- === Spartan Laser === -->
<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>W-AV_M6_G-NR</defName>
<defName>VULCAN_UNSC_W-AV_M6_G-NR</defName>
<statBases>
<WorkToMake>100000</WorkToMake>
<Mass>19.07</Mass>
Expand All @@ -142,7 +163,7 @@
<Properties>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>True</hasStandardCommand>
<defaultProjectile>Bullet_Laser_SpartanLaser</defaultProjectile>
<defaultProjectile>Bullet_Laser_SpartanLaserInf</defaultProjectile>
<warmupTime>2.6</warmupTime>
<range>86</range>
<soundCast>Shot_SpartanLaser</soundCast>
Expand All @@ -161,7 +182,7 @@

<!-- ========== MA5C ========== -->
<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>MA5D_ICWS</defName>
<defName>VULCAN_UNSC_MA5D_ICWS</defName>
<statBases>
<WorkToMake>31000</WorkToMake>
<SightsEfficiency>1.1</SightsEfficiency>
Expand Down Expand Up @@ -204,7 +225,7 @@

<!-- ========== BR85 ========== -->
<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>BR85_Service_Rifle</defName>
<defName>VULCAN_UNSC_BR85_Service_Rifle</defName>
<statBases>
<WorkToMake>35000</WorkToMake>
<SightsEfficiency>1.5</SightsEfficiency>
Expand Down Expand Up @@ -246,7 +267,7 @@

<!-- ========== SAW ========== -->
<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>M739_SAW</defName>
<defName>VULCAN_UNSC_M739_SAW</defName>
<statBases>
<WorkToMake>56000</WorkToMake>
<SightsEfficiency>1.1</SightsEfficiency>
Expand Down Expand Up @@ -289,7 +310,7 @@

<!-- ========== M-7 ========== -->
<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>M7_SubmachineGun</defName>
<defName>VULCAN_UNSC_M7_SubmachineGun</defName>
<statBases>
<WorkToMake>18000</WorkToMake>
<SightsEfficiency>1</SightsEfficiency>
Expand Down Expand Up @@ -334,7 +355,7 @@

<!-- ========== SRS99 ========== -->
<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>SRS99C-S2_AM</defName>
<defName>VULCAN_UNSC_SRS99C-S2_AM</defName>
<statBases>
<WorkToMake>56000</WorkToMake>
<SightsEfficiency>3.5</SightsEfficiency>
Expand Down Expand Up @@ -373,7 +394,7 @@

<!-- ========== Shotgun ========== -->
<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>M90-CAWS_Shotgun</defName>
<defName>VULCAN_UNSC_M90-CAWS_Shotgun</defName>
<statBases>
<WorkToMake>25000</WorkToMake>
<SightsEfficiency>1</SightsEfficiency>
Expand Down Expand Up @@ -411,7 +432,7 @@

<!-- ==========heavy Magnum ========== -->
<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>M6D_Personal_Defense_Weapon_System</defName>
<defName>VULCAN_UNSC_M6D_Personal_Defense_Weapon_System</defName>
<statBases>
<WorkToMake>13000</WorkToMake>
<SightsEfficiency>0.75</SightsEfficiency>
Expand Down Expand Up @@ -451,7 +472,7 @@

<!-- === Grenadier === -->
<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>M319_Individual_Grenade_Launcher</defName>
<defName>VULCAN_UNSC_M319_Individual_Grenade_Launcher</defName>
<statBases>
<WorkToMake>12000</WorkToMake>
<Mass>3</Mass>
Expand Down Expand Up @@ -497,7 +518,7 @@

<!-- === Railgun === -->
<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>Asymmetric_Recoilless_Carbine</defName>
<defName>VULCAN_UNSC_Asymmetric_Recoilless_Carbine</defName>
<statBases>
<WorkToMake>60000</WorkToMake>
<Mass>14.9</Mass>
Expand Down Expand Up @@ -542,7 +563,7 @@

<!-- === Rocket Launcher === -->
<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>M41_SSR_MAV_AW</defName>
<defName>VULCAN_UNSC_M41_SSR_MAV_AW</defName>
<statBases>
<WorkToMake>45000</WorkToMake>
<Mass>8</Mass>
Expand Down Expand Up @@ -590,7 +611,7 @@

<!-- ========== M392 DMR========== -->
<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>M392_Designated_Marksman_Rifle</defName>
<defName>VULCAN_UNSC_M392_Designated_Marksman_Rifle</defName>
<statBases>
<WorkToMake>35000</WorkToMake>
<SightsEfficiency>2.4</SightsEfficiency>
Expand Down
Loading