Skip to content

Rimnosis patch, hopefully doesn't overwrite Gas Traps and Shells #2

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

Draft
Draconomial wants to merge 3 commits into
base: Development
Choose a base branch
from
Draft

Rimnosis patch, hopefully doesn't overwrite Gas Traps and Shells #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37ecca4
Add files via upload
Draconomial Feb 4, 2022
22d735a
Merge branch 'CombatExtended-Continued:Development' into Draconomial-…
Draconomial Feb 5, 2022
38a3da4
Add files via upload
Draconomial Feb 5, 2022
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
145 changes: 145 additions & 0 deletions Patches/Rimnosis/Patch_60mm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>
<Operation Class="PatchOperationFindMod">
<mods>
<li>Rimnosis - NSFW</li>
</mods>
<match Class="PatchOperationSequence">
<operations>

<!-- Add Shells to AmmoSet -->
<li Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_60mmMortarShell"]/ammoTypes</xpath>
<value>
<Shell_60mmMortar_LustGas>Bullet_60mmMortarShell_60mmMortar_LustGas</Shell_60mmMortar_LustGas>
</value>
</li>

<!-- Ammo -->

<li Class="PatchOperationAdd">
<xpath>Defs</xpath>
<value>
<ThingDef Class="CombatExtended.AmmoDef" ParentName="60mmMortarShellBaseCraftableBase">
<defName>Shell_60mmMortar_LustGas</defName>
<label>60mm mortar shell (Lust)</label>
<graphicData>
<texPath>ThirdParty/GasTraps/Mortar</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
<color>(252,134,232)</color>
<shaderType>CutoutComplex</shaderType>
</graphicData>
<statBases>
<MarketValue>22.20</MarketValue>
<Mass>4.1</Mass>
<Bulk>10.01</Bulk>
</statBases>
<ammoClass>Lust</ammoClass>
<detonateProjectile>Bullet_60mmMortarShell_60mmMortar_LustGas</detonateProjectile>
<comps>
<!-- Vanilla values -->
<li Class="CompProperties_Explosive">
<explosiveRadius>4.5</explosiveRadius>
<explosiveDamageType>Bomb</explosiveDamageType>
<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
<postExplosionSpawnThingDef>Gas_Aphrodisiac</postExplosionSpawnThingDef>
<preExplosionSpawnChance>1</preExplosionSpawnChance>
<explodeOnKilled>True</explodeOnKilled>
<wickTicks>30~3000</wickTicks>
</li>
</comps>
</ThingDef>
</value>
</li>

<!-- Projectile -->

<li Class="PatchOperationAdd">
<xpath>Defs</xpath>
<value>
<ThingDef ParentName="Base60mmMortarShell">
<defName>Bullet_60mmMortarShell_60mmMortar_LustGas</defName>
<label>60mm mortar shell (Lust)</label>
<graphicData>
<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
<graphicClass>Graphic_Single</graphicClass>
<color>(252,134,232)</color>
<shaderType>CutoutComplex</shaderType>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bomb</damageDef>
<damageAmountBase>5</damageAmountBase>
<armorPenetrationSharp>0</armorPenetrationSharp>
<armorPenetrationBlunt>0</armorPenetrationBlunt>
<explosionRadius>4.5</explosionRadius>
<flyOverhead>true</flyOverhead>
<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
<soundExplode>Explosion_EMP</soundExplode>
<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
<soundAmbient>MortarRound_Ambient</soundAmbient>
<postExplosionSpawnThingDef>Gas_Aphrodisiac</postExplosionSpawnThingDef>
<preExplosionSpawnChance>1</preExplosionSpawnChance>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
<explosionEffect>ExtinguisherExplosion</explosionEffect>
</projectile>
</ThingDef>
</value>
</li>

<!-- Recipes -->

<li Class="PatchOperationAdd">
<xpath>Defs</xpath>
<value>

<RecipeDef ParentName="AmmoRecipeBase">
<defName>MakeShell_60mmMortar_LustGas</defName>
<label>make 60mm lust gas mortar shells x5</label>
<description>Craft 5 60mm lust gas mortar shells.</description>
<jobString>Making 60mm lust gas mortar shells.</jobString>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>20</count>
</li>
<li>
<filter>
<thingDefs>
<li>ComponentIndustrial</li>
</thingDefs>
</filter>
<count>1</count>
</li>
<li>
<filter>
<thingDefs>
<li>Canister_LustGas</li>
</thingDefs>
</filter>
<count>1</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
<li>ComponentIndustrial</li>
<li>Canister_LustGas</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Shell_60mmMortar_LustGas>5</Shell_60mmMortar_LustGas>
</products>
</RecipeDef>


</value>
</li>

</operations>
</match>
</Operation>
</Patch>
156 changes: 156 additions & 0 deletions Patches/Rimnosis/Patch_81mm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>
<Operation Class="PatchOperationFindMod">
<mods>
<li>Rimnosis - NSFW</li>
</mods>
<match Class="PatchOperationSequence">
<operations>

<!-- Add Shell Recipes -->

<li Class="PatchOperationAdd">
<xpath>Defs</xpath>
<value>
<RecipeDef ParentName="AmmoRecipeBase">
<defName>MakeShell_GasLust</defName>
<label>make 81mm lust gas mortar shells x5</label>
<description>Craft 5 81mm lust gas mortar shells.</description>
<jobString>Making 81mm lust gas mortar shells.</jobString>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>20</count>
</li>
<li>
<filter>
<thingDefs>
<li>ComponentIndustrial</li>
</thingDefs>
</filter>
<count>1</count>
</li>
<li>
<filter>
<thingDefs>
<li>Canister_LustGas</li>
</thingDefs>
</filter>
<count>1</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
<li>ComponentIndustrial</li>
<li>Canister_LustGas</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Shell_GasLust>5</Shell_GasLust>
</products>
</RecipeDef>

<!-- Add Shells to AmmoSet -->

<li Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
<value>
<Shell_GasToxic>Bullet_Shell_GasLust</Shell_GasToxic>
</value>
</li>

<!-- Add CE Ammo.Def to Shells & Ammo-->

<li Class="PatchOperationAttributeAdd">
<xpath>Defs/ThingDef[defName="Shell_GasLust"]</xpath>
<attribute>Class</attribute>
<value>CombatExtended.AmmoDef</value>
</li>

<!-- Add New Shell Base-->

<li Class="PatchOperationAttributeSet">
<xpath>Defs/ThingDef[defName="Shell_GasLust"]</xpath>
<attribute>ParentName</attribute>
<value>81mmMortarShellBaseCraftableBase</value>
</li>

<!-- Remove Stuff -->

<li Class="PatchOperationRemove">
<xpath>Defs/ThingDef[defName="Shell_GasLust"]/projectileWhenLoaded</xpath>
</li>

<!-- Add Shell Mass-->

<li Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="Shell_GasLust"]</xpath>
<value>
<statBases>
<Mass>4.3</Mass>
<Bulk>5</Bulk>
</statBases>
</value>
</li>

<!-- Add Shell Ammo Type-->

<li Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="Shell_GasLust"]</xpath>
<value>
<ammoClass>GasLust</ammoClass>
</value>
</li>

<!-- Add CE Explosives Comps to Shells -->

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Shell_GasLust"]/comps</xpath>
<value>
<comps>
<li Class="CompProperties_Explosive">
<explosiveRadius>5.9</explosiveRadius>
<explosiveDamageType>Smoke</explosiveDamageType>
<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
<postExplosionSpawnThingDef>Gas_Aphrodisiac</postExplosionSpawnThingDef>
<postExplosionSpawnChance>1.0</postExplosionSpawnChance>
<wickTicks>
<min>10</min>
<max>30</max>
</wickTicks>
</li>
</comps>
</value>
</li>

<!-- Add New Bullet Base-->
<li Class="PatchOperationAttributeSet">
<xpath>Defs/ThingDef[defName="Bullet_Shell_GasLust"]</xpath>
<attribute>ParentName</attribute>
<value>Base81mmMortarShell</value>
</li>

<!-- Projectiles -->
<li Class="PatchOperationAttributeAdd">
<xpath>Defs/ThingDef[defName="Bullet_Shell_GasLust""]/projectile</xpath>
<attribute>Class</attribute>
<value>CombatExtended.ProjectilePropertiesCE</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Bullet_Shell_GasLust"]/thingClass</xpath>
<value>
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
</value>
</li>

</operations>
</match>
</Operation>
</Patch>
58 changes: 58 additions & 0 deletions Patches/Rimnosis/Patch_AmmoCategories_Gas.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>
<Operation Class="PatchOperationFindMod">
<mods>
<li>Rimnosis - NSFW</li>
</mods>
<match Class="PatchOperationSequence">
<operations>

<!-- Change gas colors to better fit gaz type/texture colors... -->

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="LustGas"]/graphicData/color</xpath>
<value>
<color>(0.8,0.3,0.9,0.3)</color>
</value>
</li>

<!-- Change shell textures -->

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Shell_GasLust"]/graphicData</xpath>
<value>
<graphicData>
<texPath>ThirdParty/GasTraps/Mortar</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
<shaderType>CutoutComplex</shaderType>
<color>(252,134,232)</color>
</graphicData>
</value>
</li>

<!-- Change projectile textures -->

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Bullet_Shell_GasLust"]/graphicData</xpath>
<value>
<graphicData>
<texPath>ThirdParty/GasTraps/gas_mortar_projectile</texPath>
<graphicClass>Graphic_Single</graphicClass>
<shaderType>CutoutComplex</shaderType>
<color>(252,134,232)</color>
</graphicData>
</value>
</li>

<!-- Change shell names to better fit Combat Extended -->

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="Shell_GasLust"]/label</xpath>
<value>
<label>81mm mortar shell (Lust)</label>
</value>
</li>
</operations>
</match>
</Operation>
</Patch>
24 changes: 24 additions & 0 deletions Patches/Rimnosis/Patch_AmmoCategories_Grenades.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>
<Operation Class="PatchOperationFindMod">
<mods>
<li>Rimnosis - NSFW</li>
</mods>
<match Class="PatchOperationSequence">
<operations>

<li Class="PatchOperationAdd">
<xpath>Defs</xpath>
<value>
<CombatExtended.AmmoCategoryDef>
<defName>Lust</defName>
<label>Lust gas</label>
<description>Filled with a potent aphrodisiac that causes pawns to get horny fast.</description>
<advanced>true</advanced>
</CombatExtended.AmmoCategoryDef>
</value>
</li>
</operations>
</match>
</Operation>
</Patch>
Loading