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

Clean up some PatchOpAdd Defs #3181

Merged
merged 3 commits into from
Jun 25, 2024
Merged

Clean up some PatchOpAdd Defs #3181

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
9ce4890
Initial pass
N7Huntsman Jun 9, 2024
e97a540
Clean up VFE-F addon ammo
N7Huntsman Jun 9, 2024
9df8b75
Prevent autopatching mechanite apparel
N7Huntsman Jun 25, 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
76 changes: 76 additions & 0 deletions ModPatches/Big and Small Genes/Defs/Big and Small Genes/Weapons/ThingDef_Ammo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,4 +196,80 @@
<corpseDamageFactor>0.1</corpseDamageFactor>
</DamageDef>

<!-- === Thrown Rock === -->
<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseWeaponAndAmmoNeolithic">
<defName>BS_OgreThrowinRock</defName>
<label>Throwing Chunks</label>
<description>These large rocks have been crudely chiseled for throwing at enemies.\n\nCan be wielded by giant, herculean, or warcasket pawns.</description>
<graphicData>
<texPath>Item/BS_ThrowableChunk_projectile</texPath>
<graphicClass>Graphic_Single</graphicClass>
<drawSize>1.4</drawSize>
</graphicData>
<soundInteract>Interact_BeatFire</soundInteract>
<relicChance>0</relicChance>
<statBases>
<MarketValue>50</MarketValue>
<SightsEfficiency>1.0</SightsEfficiency>
<ShotSpread>1.5</ShotSpread>
<SwayFactor>2.5</SwayFactor>
<Bulk>5</Bulk>
<Mass>20</Mass>
<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
</statBases>
<equippedAngleOffset>30</equippedAngleOffset>
<stackLimit>25</stackLimit>
<weaponClasses Inherit="False">
<li>BS_GiantWeapon</li>
</weaponClasses>
<weaponTags Inherit="False">
<li>RangedMedievalGiant</li>
</weaponTags>
<tradeability>All</tradeability>
<verbs>
<li Class="CombatExtended.VerbPropertiesCE">
<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Rock_GiantThrown</defaultProjectile>
<soundCast>BS_JotunJavelinThrow_Sound</soundCast>
<warmupTime>3</warmupTime>
<range>12</range>
<!--<soundCast>Interact_BeatFire</soundCast>-->
</li>
</verbs>
<tools>
<li Class="CombatExtended.ToolCE">
<label>rock</label>
<capacities>
<li>Demolish</li>
</capacities>
<power>13.4</power>
<cooldownTime>2.95</cooldownTime>
<armorPenetrationBlunt>10</armorPenetrationBlunt>
</li>
</tools>
<ammoClass>Javelin</ammoClass>
</ThingDef>

<ThingDef ParentName="BasePilumProjectile">
<defName>Rock_GiantThrown</defName>
<label>rock (thrown)</label>
<graphicData>
<texPath>Item/BS_ThrowableChunk_projectile</texPath>
<graphicClass>Graphic_Single</graphicClass>
<drawSize>1.4</drawSize>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Demolish</damageDef>
<damageAmountBase>30</damageAmountBase>
<speed>25</speed>
<armorPenetrationBlunt>60</armorPenetrationBlunt>
<armorPenetrationSharp>0</armorPenetrationSharp>
<arcHeightFactor>1.5</arcHeightFactor>
<explosionRadius>0.9</explosionRadius>
<soundExplode>BuildingDestroyed_Stone_Medium</soundExplode>
<preExplosionSpawnThingDef>Filth_RubbleRock</preExplosionSpawnThingDef>
</projectile>
</ThingDef>

</Defs>
83 changes: 0 additions & 83 deletions ...ches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,89 +99,6 @@
</value>
</Operation>

<!-- Big Rock Chuck -->
<Operation Class="PatchOperationAdd">
<xpath>Defs</xpath>
<value>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseWeaponAndAmmoNeolithic">
<defName>BS_OgreThrowinRock</defName>
<label>Throwing Chunks</label>
<description>These large rocks have been crudely chiseled for throwing at enemies.\n\nCan be wielded by giant, herculean, or warcasket pawns.</description>
<graphicData>
<texPath>Item/BS_ThrowableChunk_projectile</texPath>
<graphicClass>Graphic_Single</graphicClass>
<drawSize>1.4</drawSize>
</graphicData>
<soundInteract>Interact_BeatFire</soundInteract>
<relicChance>0</relicChance>
<statBases>
<MarketValue>50</MarketValue>
<SightsEfficiency>1.0</SightsEfficiency>
<ShotSpread>1.5</ShotSpread>
<SwayFactor>2.5</SwayFactor>
<Bulk>5</Bulk>
<Mass>20</Mass>
<RangedWeapon_Cooldown>2</RangedWeapon_Cooldown>
</statBases>
<equippedAngleOffset>30</equippedAngleOffset>
<stackLimit>25</stackLimit>
<weaponClasses Inherit="False">
<li>BS_GiantWeapon</li>
</weaponClasses>
<weaponTags Inherit="False">
<li>RangedMedievalGiant</li>
</weaponTags>
<tradeability>All</tradeability>
<verbs>
<li Class="CombatExtended.VerbPropertiesCE">
<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<defaultProjectile>Rock_GiantThrown</defaultProjectile>
<soundCast>BS_JotunJavelinThrow_Sound</soundCast>
<warmupTime>3</warmupTime>
<range>12</range>
<!--<soundCast>Interact_BeatFire</soundCast>-->
</li>
</verbs>
<tools>
<li Class="CombatExtended.ToolCE">
<label>rock</label>
<capacities>
<li>Demolish</li>
</capacities>
<power>13.4</power>
<cooldownTime>2.95</cooldownTime>
<armorPenetrationBlunt>10</armorPenetrationBlunt>
</li>
</tools>
<ammoClass>Javelin</ammoClass>
</ThingDef>

<ThingDef ParentName="BasePilumProjectile">
<defName>Rock_GiantThrown</defName>
<label>rock (thrown)</label>
<graphicData>
<texPath>Item/BS_ThrowableChunk_projectile</texPath>
<graphicClass>Graphic_Single</graphicClass>
<drawSize>1.4</drawSize>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Demolish</damageDef>
<damageAmountBase>30</damageAmountBase>
<speed>25</speed>
<armorPenetrationBlunt>60</armorPenetrationBlunt>
<armorPenetrationSharp>0</armorPenetrationSharp>
<arcHeightFactor>1.5</arcHeightFactor>
<explosionRadius>0.9</explosionRadius>
<soundExplode>BuildingDestroyed_Stone_Medium</soundExplode>
<preExplosionSpawnThingDef>Filth_RubbleRock</preExplosionSpawnThingDef>
</projectile>
</ThingDef>

</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/RecipeDef[defName="BS_OgreThrowinRockRecipe"]/workAmount</xpath>
<value>
Expand Down
113 changes: 113 additions & 0 deletions ModPatches/MorrowRim - Bloodmoon/Defs/MorrowRim - Bloodmoon/Hunter_Grenades.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>

<!-- ================== Item ================== -->

<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseGrenadeEquipment">
<defName>Weapon_GrenadeWolfBane</defName>
<equipmentType>Primary</equipmentType>
<label>wolfsbane vessel</label>
<description>Glass vessels filled with a potent mixture of wolfsbane extract. Shatters upon impact, releasing a short lived cloud of gas that burns any werewolves within.</description>
<graphicData>
<texPath>Things/Projectile/MorrowRim_WolfsBaneBombThrown</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<soundInteract>Interact_Grenade</soundInteract>
<techLevel>Medieval</techLevel>
<stackLimit>50</stackLimit>
<statBases>
<Mass>0.436</Mass>
<Bulk>1.55</Bulk>
<MarketValue>12.4</MarketValue>
<SightsEfficiency>1.0</SightsEfficiency>
<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
</statBases>
<generateCommonality>2.0</generateCommonality>
<weaponTags>
<li>CE_AI_AOE</li>
<li>GrenadeDestructive</li>
</weaponTags>
<thingCategories>
<li>Grenades</li>
</thingCategories>
<verbs>
<li Class="CombatExtended.VerbPropertiesCE">
<label>throw wolfsbane vessel</label>
<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
<hasStandardCommand>true</hasStandardCommand>
<range>12.9</range>
<minRange>2.9</minRange>
<warmupTime>0.8</warmupTime>
<noiseRadius>4</noiseRadius>
<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
<soundCast>ThrowGrenade</soundCast>
<targetParams>
<canTargetLocations>true</canTargetLocations>
</targetParams>
<defaultProjectile>Proj_GrenadeWolfBane</defaultProjectile>
<onlyManualCast>true</onlyManualCast>
<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
<ai_AvoidFriendlyFireRadius>6</ai_AvoidFriendlyFireRadius>
</li>
</verbs>
</ThingDef>

<!-- ================== Projectiles ================== -->

<ThingDef ParentName="BaseGrenadeProjectile">
<defName>Proj_GrenadeWolfBane</defName>
<label>wolfsbane vessel</label>
<graphicData>
<texPath>Things/Projectile/MorrowRim_WolfsBaneBombThrown</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<explosionRadius>3.5</explosionRadius>
<damageDef>Burn</damageDef>
<damageAmountBase>0</damageAmountBase>
<explosionDelay>0</explosionDelay>
<postExplosionSpawnThingDef>MorrowRim_Gas_Wolfsbane</postExplosionSpawnThingDef>
<postExplosionSpawnChance>1</postExplosionSpawnChance>
<speed>10</speed>
</projectile>
</ThingDef>

<!-- ================== Recipe ================== -->

<RecipeDef ParentName="GrenadeRecipeBase">
<defName>MakeGrenadeWolfBane</defName>
<label>make wolfsbane vessel x5</label>
<description>Craft 10 wolfsbane vessels.</description>
<jobString>Making wolfsbane vessels.</jobString>
<researchPrerequisite>MorrowRim_LycanthropicElixirs</researchPrerequisite>
<workAmount>2100</workAmount>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>10</count>
</li>
<li>
<filter>
<thingDefs>
<li>MorrowRim_WolfsbaneExtract</li>
</thingDefs>
</filter>
<count>60</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
<li>MorrowRim_WolfsbaneExtract</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Weapon_GrenadeWolfBane>5</Weapon_GrenadeWolfBane>
</products>
</RecipeDef>

</Defs>
Loading
Loading