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

Miho Patch Housekeeping #3188

Merged
merged 2 commits into from
Jun 13, 2024
Merged

Miho Patch Housekeeping #3188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a96a6e
Miho Housekeeping
N7Huntsman Jun 13, 2024
5d5f904
Remove trailing whitespace
N7Huntsman Jun 13, 2024
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
55 changes: 55 additions & 0 deletions ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Ammo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>
<!-- ========== Ammoset =========== -->

<Operation Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_8x22mmNambu"]/ammoTypes</xpath>
<value>
<Ammo_8x22mmNambu_Miho>Bullet_8x22mmNambu_Miho</Ammo_8x22mmNambu_Miho>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_65x50mmSRArisaka"]/ammoTypes</xpath>
<value>
<Ammo_65x50mmSRArisaka_Miho>Bullet_65x50mmSRArisaka_Miho</Ammo_65x50mmSRArisaka_Miho>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_77x58mmArisaka"]/ammoTypes</xpath>
<value>
<Ammo_77x58mmArisaka_Miho>Bullet_77x58mmArisaka_Miho</Ammo_77x58mmArisaka_Miho>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_132x92mmSRTuF"]/ammoTypes</xpath>
<value>
<Ammo_132x92mmSRTuF_Miho>Bullet_132x92mmSRTuF_Miho</Ammo_132x92mmSRTuF_Miho>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_20x42mmGrenade"]/ammoTypes</xpath>
<value>
<Ammo_20x42mm_Miho>Bullet_20x42mm_Miho</Ammo_20x42mm_Miho>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_47x398mmR"]/ammoTypes</xpath>
<value>
<Ammo_47x398mmR_Miho>Bullet_47x398mmR_Miho</Ammo_47x398mmR_Miho>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_57x280mmR"]/ammoTypes</xpath>
<value>
<Ammo_57x280mmR_Canister>Bullet_57x280mmR_Canister</Ammo_57x280mmR_Canister>
<Ammo_57x280mmR_Thermobaric>Bullet_57x280mmR_Thermobaric</Ammo_57x280mmR_Thermobaric>
</value>
</Operation>

</Patch>
52 changes: 37 additions & 15 deletions ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Miho_Apparel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_Regular" or
<xpath>Defs/ThingDef[
defName="Miho_Apparel_OnSkin_Regular" or
defName="Miho_Apparel_OnSkin_Hoodie" or
defName="Miho_Apparel_OnSkin_Maid"]/statBases/StuffEffectMultiplierArmor</xpath>
defName="Miho_Apparel_OnSkin_Maid"
]/statBases/StuffEffectMultiplierArmor</xpath>
<value>
<StuffEffectMultiplierArmor>1.75</StuffEffectMultiplierArmor>
<Bulk>2</Bulk>
Expand Down Expand Up @@ -56,7 +58,8 @@
defName="Miho_Apparel_Middle_Militia" or
defName="Miho_Apparel_Middle_Militia_Tan" or
defName="Miho_Apparel_Middle_MilitiaMedic" or
defName="Miho_Apparel_Middle_MilitiaMedic"]/statBases/StuffEffectMultiplierArmor </xpath>
defName="Miho_Apparel_Middle_MilitiaMedic"
]/statBases/StuffEffectMultiplierArmor </xpath>
<value>
<StuffEffectMultiplierArmor>8</StuffEffectMultiplierArmor>
<Bulk>6</Bulk>
Expand All @@ -68,7 +71,8 @@
<xpath>Defs/ThingDef[
defName="Miho_Apparel_Middle_Militia" or
defName="Miho_Apparel_Middle_Militia_Tan" or
defName="Miho_Apparel_Middle_MilitiaMedic"]/statBases/Mass </xpath>
defName="Miho_Apparel_Middle_MilitiaMedic"
]/statBases/Mass </xpath>
<value>
<Mass>10.5</Mass>
</value>
Expand All @@ -78,7 +82,8 @@
<xpath>Defs/ThingDef[
defName="Miho_Apparel_Middle_Militia" or
defName="Miho_Apparel_Middle_Militia_Tan" or
defName="Miho_Apparel_Middle_MilitiaMedic"]/statBases/ArmorRating_Sharp </xpath>
defName="Miho_Apparel_Middle_MilitiaMedic"
]/statBases/ArmorRating_Sharp </xpath>
</Operation>

<Operation Class="PatchOperationRemove">
Expand Down Expand Up @@ -448,7 +453,11 @@
<!-- Milita Helmet -->

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Militia" or defName="Miho_Apparel_Hat_MilitiaShoot" or defName="Miho_Apparel_Hat_MilitiaMedic"]/statBases/StuffEffectMultiplierArmor</xpath>
<xpath>Defs/ThingDef[
defName="Miho_Apparel_Hat_Militia" or
defName="Miho_Apparel_Hat_MilitiaShoot" or
defName="Miho_Apparel_Hat_MilitiaMedic"
]/statBases/StuffEffectMultiplierArmor</xpath>
<value>
<StuffEffectMultiplierArmor>5</StuffEffectMultiplierArmor>
<Bulk>3</Bulk>
Expand All @@ -457,20 +466,26 @@
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Militia" or defName="Miho_Apparel_Hat_MilitiaShoot" or defName="Miho_Apparel_Hat_MilitiaMedic"]/statBases/ArmorRating_Sharp</xpath>
<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Militia" or
defName="Miho_Apparel_Hat_MilitiaShoot" or
defName="Miho_Apparel_Hat_MilitiaMedic"
]/statBases/ArmorRating_Sharp</xpath>
<value>
<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Militia" or defName="Miho_Apparel_Hat_MilitiaShoot" or defName="Miho_Apparel_Hat_MilitiaMedic"]/statBases/Mass</xpath>
<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_Militia" or
defName="Miho_Apparel_Hat_MilitiaShoot" or
defName="Miho_Apparel_Hat_MilitiaMedic"
]/statBases/Mass</xpath>
<value>
<Mass>2</Mass>
</value>
</Operation>

<!-- Miho_Apparel_Hat_MilitiaEar little better protectin than other Militia series-->
<!-- Miho_Apparel_Hat_MilitiaEar - little better protectin than other Militia series-->

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Miho_Apparel_Hat_MilitiaEar" or defName="Miho_Apparel_Hat_MilitiaVegi"]/statBases/StuffEffectMultiplierArmor</xpath>
Expand Down Expand Up @@ -526,28 +541,34 @@
<!--Ornated-->

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedOne" or
<xpath>Defs/ThingDef[
defName="Miho_Apparel_OnSkin_OrnatedOne" or
defName="Miho_Apparel_OnSkin_OrnatedTwo" or
defName="Miho_Apparel_OnSkin_OrnatedMiho"]/statBases</xpath>
defName="Miho_Apparel_OnSkin_OrnatedMiho"
]/statBases</xpath>
<value>
<Bulk>2</Bulk>
<WornBulk>0</WornBulk>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedOne" or
<xpath>Defs/ThingDef[
defName="Miho_Apparel_OnSkin_OrnatedOne" or
defName="Miho_Apparel_OnSkin_OrnatedTwo" or
defName="Miho_Apparel_OnSkin_OrnatedMiho"]/statBases/ArmorRating_Sharp</xpath>
defName="Miho_Apparel_OnSkin_OrnatedMiho"
]/statBases/ArmorRating_Sharp</xpath>
<value>
<ArmorRating_Sharp>2</ArmorRating_Sharp>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Miho_Apparel_OnSkin_OrnatedOne" or
<xpath>Defs/ThingDef[
defName="Miho_Apparel_OnSkin_OrnatedOne" or
defName="Miho_Apparel_OnSkin_OrnatedTwo" or
defName="Miho_Apparel_OnSkin_OrnatedMiho"]/statBases/ArmorRating_Blunt</xpath>
defName="Miho_Apparel_OnSkin_OrnatedMiho"
]/statBases/ArmorRating_Blunt</xpath>
<value>
<ArmorRating_Blunt>6</ArmorRating_Blunt>
</value>
Expand Down Expand Up @@ -693,4 +714,5 @@
<ArmorRating_Blunt>1</ArmorRating_Blunt>
</value>
</Operation>

</Patch>
21 changes: 1 addition & 20 deletions ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Mechanoid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>

<!-- ========== Ammotypes =========== -->

<Operation Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_47x398mmR"]/ammoTypes</xpath>
<value>
<Ammo_47x398mmR_Miho>Bullet_47x398mmR_Miho</Ammo_47x398mmR_Miho>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_57x280mmR"]/ammoTypes</xpath>
<value>
<Ammo_57x280mmR_Canister>Bullet_57x280mmR_Canister</Ammo_57x280mmR_Canister>
<Ammo_57x280mmR_Thermobaric>Bullet_57x280mmR_Thermobaric</Ammo_57x280mmR_Thermobaric>
</value>
</Operation>

<!-- ========== Remove other verbs =========== -->

<Operation Class="PatchOperationRemove">
<xpath>Defs/ThingDef[
defName="Miho_MechWeapon_Heavygrenade"
]/verbs/li[@Class="TorgueMiho.Verb_Properties_ShotGun"] </xpath>
<xpath>Defs/ThingDef[defName="Miho_MechWeapon_Heavygrenade"]/verbs/li[@Class="TorgueMiho.Verb_Properties_ShotGun"] </xpath>
</Operation>

<!-- ========== Rifle =========== -->
Expand Down
1 change: 1 addition & 0 deletions ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Melee.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,4 +453,5 @@
<MeleeDodgeChance>0.47</MeleeDodgeChance>
</value>
</Operation>

</Patch>
14 changes: 4 additions & 10 deletions ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Other.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,14 @@
<Patch>
<!-- ========== Common to all Defensive Turrets ========== -->
<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[
@Name="Miho_DeployableHMG" or
@Name="Miho_DeployableMissile"
]/thingClass </xpath>
<xpath>Defs/ThingDef[@Name="Miho_DeployableHMG" or @Name="Miho_DeployableMissile"]/thingClass </xpath>
<value>
<thingClass>CombatExtended.Building_TurretGunCE</thingClass>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[
defName="Miho_Turret_Machinegun" or
defName="Miho_Turret_Missile"
]/statBases </xpath>
<xpath>Defs/ThingDef[defName="Miho_Turret_Machinegun" or defName="Miho_Turret_Missile"]/statBases</xpath>
<value>
<AimingAccuracy>0.5</AimingAccuracy>
</value>
Expand Down Expand Up @@ -62,11 +56,11 @@

<!-- ========== Missile ========== -->
<Operation Class="PatchOperationRemove">
<xpath>Defs/ThingDef[defName = "Miho_Turret_Missile"]/inspectorTabs</xpath>
<xpath>Defs/ThingDef[defName="Miho_Turret_Missile"]/inspectorTabs</xpath>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[ defName="Miho_Turret_Missile"]/building/turretBurstCooldownTime </xpath>
<xpath>Defs/ThingDef[defName="Miho_Turret_Missile"]/building/turretBurstCooldownTime </xpath>
<value>
<turretBurstCooldownTime>1.5</turretBurstCooldownTime>
</value>
Expand Down
48 changes: 6 additions & 42 deletions ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Misc/Weapons_Ranged.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>
<!-- ========== Ammoset =========== -->

<Operation Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_8x22mmNambu"]/ammoTypes</xpath>
<value>
<Ammo_8x22mmNambu_Miho>Bullet_8x22mmNambu_Miho</Ammo_8x22mmNambu_Miho>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_65x50mmSRArisaka"]/ammoTypes</xpath>
<value>
<Ammo_65x50mmSRArisaka_Miho>Bullet_65x50mmSRArisaka_Miho</Ammo_65x50mmSRArisaka_Miho>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_77x58mmArisaka"]/ammoTypes</xpath>
<value>
<Ammo_77x58mmArisaka_Miho>Bullet_77x58mmArisaka_Miho</Ammo_77x58mmArisaka_Miho>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_132x92mmSRTuF"]/ammoTypes</xpath>
<value>
<Ammo_132x92mmSRTuF_Miho>Bullet_132x92mmSRTuF_Miho</Ammo_132x92mmSRTuF_Miho>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_20x42mmGrenade"]/ammoTypes</xpath>
<value>
<Ammo_20x42mm_Miho>Bullet_20x42mm_Miho</Ammo_20x42mm_Miho>
</value>
</Operation>

<!-- ========== Remove other verbs =========== -->

Expand Down Expand Up @@ -527,6 +491,7 @@
<aiAimMode>Snapshot</aiAimMode>
</FireModes>
</Operation>

<!-- ========== Miho_Weapon_Pistol =========== -->
<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>Miho_Weapon_Pistol</defName>
Expand Down Expand Up @@ -618,12 +583,12 @@
<li Class="CompProperties_Styleable"/>
<li Class="CompProperties_Biocodable"/>
<li>
<compClass>CompQuality</compClass>
<compClass>CompQuality</compClass>
</li>
<li Class="CompProperties_Art">
<nameMaker>NamerArtWeaponGun</nameMaker>
<descriptionMaker>ArtDescription_WeaponGun</descriptionMaker>
<minQualityForArtistic>Excellent</minQualityForArtistic>
<nameMaker>NamerArtWeaponGun</nameMaker>
<descriptionMaker>ArtDescription_WeaponGun</descriptionMaker>
<minQualityForArtistic>Excellent</minQualityForArtistic>
</li>
</comps>
</value>
Expand Down Expand Up @@ -661,13 +626,11 @@
<canTargetLocations>true</canTargetLocations>
</targetParams>
</Properties>

<AmmoUser>
<magazineSize>1</magazineSize>
<reloadTime>9.1</reloadTime>
<ammoSet>AmmoSet_MihoMissile_S</ammoSet>
</AmmoUser>

<FireModes>
<aiUseBurstMode>FALSE</aiUseBurstMode>
<aiAimMode>AimedShot</aiAimMode>
Expand Down Expand Up @@ -762,4 +725,5 @@
</tools>
</value>
</Operation>

</Patch>
Loading