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

Moyo 2 patch #3215

Merged
merged 8 commits into from
Jun 27, 2024
Merged

Moyo 2 patch #3215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a9c903d
Add files via upload
Tostov Jun 26, 2024
f4534b5
Update LoadFolders.xml
Tostov Jun 26, 2024
67cd86f
Add files via upload
Tostov Jun 26, 2024
a338a92
Minor housekeeping
N7Huntsman Jun 27, 2024
1910b71
housekeeping
N7Huntsman Jun 27, 2024
91d827f
Ammo Fixes
Tostov Jun 27, 2024
f9266d3
Whitespace cleanup
N7Huntsman Jun 27, 2024
d4b15b1
Update modlist
N7Huntsman Jun 27, 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
1 change: 1 addition & 0 deletions LoadFolders.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,5 +598,6 @@
<li IfModActive="Neronix17.OuterRim.DroidDepot">ModPatches/Outer Rim - Droid Depot</li>
<li IfModActive="VAMV.MaruRaceMod">ModPatches/Maru Race</li>
<li IfModActive="det.boglegs">ModPatches/Det's Xenotypes - Boglegs</li>
<li IfModActive="Nemonian.MY2.Beta">ModPatches/Moyo 2</li>
</v1.5>
</loadFolders>
215 changes: 215 additions & 0 deletions ModPatches/Moyo 2/Defs/Moyo 2/Ammo/Ammo_Moyo_Industrial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<!-- ================== Harpoon ================== -->

<CombatExtended.AmmoCategoryDef>
<defName>MoyoHarpoon</defName>
<label>Harpoon</label>
<labelShort>Harpoon</labelShort>
<description>Metal rods converted for combat use.</description>
</CombatExtended.AmmoCategoryDef>

<ThingCategoryDef>
<defName>AmmoSmallMoyoHarpoon</defName>
<label>Spearjack</label>
<parent>AmmoAdvanced</parent>
<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
</ThingCategoryDef>

<ThingCategoryDef>
<defName>AmmoLargeMoyoHarpoon</defName>
<label>Heavy Spearjack</label>
<parent>AmmoAdvanced</parent>
<iconPath>UI/Icons/ThingCategories/CaliberChargeLarge</iconPath>
</ThingCategoryDef>

<!-- ==================== AmmoSet ========================== -->

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_SmallMoyoHarpoon</defName>
<label>Spearjack</label>
<ammoTypes>
<Ammo_SmallMoyoHarpoon>Bullet_SmallMoyoHarpoon</Ammo_SmallMoyoHarpoon>
</ammoTypes>
<similarTo>AmmoSet_ChargedRifle</similarTo>
</CombatExtended.AmmoSetDef>


<CombatExtended.AmmoSetDef>
<defName>AmmoSet_LargeMoyoHarpoon</defName>
<label>Heavy Spearjack</label>
<ammoTypes>
<Ammo_LargeMoyoHarpoon>Bullet_LargeMoyoHarpoon</Ammo_LargeMoyoHarpoon>
</ammoTypes>
<similarTo>AmmoSet_ChargedHeavy</similarTo>
</CombatExtended.AmmoSetDef>

<!-- ==================== Ammo ========================== -->

<ThingDef Class="CombatExtended.AmmoDef" Name="SmallMoyoHarpoonBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
<description>Metal harpoons modified for launching in a spearjack.</description>
<statBases>
<Mass>0.25</Mass>
<Bulk>0.09</Bulk>
</statBases>
<tradeTags>
<li>CE_AutoEnableTrade</li>
<li>CE_AutoEnableCrafting_FabricationBench</li>
</tradeTags>
<thingCategories>
<li>AmmoSmallMoyoHarpoon</li>
</thingCategories>
<stackLimit>5000</stackLimit>
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="SmallMoyoHarpoonBase">
<defName>Ammo_SmallMoyoHarpoon</defName>
<label>Spearjack</label>
<graphicData>
<texPath>Things/Ammo/Railgun/HighCaliber</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>0.97</MarketValue>
</statBases>
<ammoClass>MoyoHarpoon</ammoClass>
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" Name="LargeMoyoHarpoonBase" ParentName="SpacerMediumAmmoBase" Abstract="True">
<description>Metal harpoons modified for launching in a spearjack.</description>
<statBases>
<Mass>2</Mass>
<Bulk>1.21</Bulk>
</statBases>
<tradeTags>
<li>CE_AutoEnableTrade</li>
<li>CE_AutoEnableCrafting_FabricationBench</li>
</tradeTags>
<thingCategories>
<li>AmmoLargeMoyoHarpoon</li>
</thingCategories>
<stackLimit>250</stackLimit>
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="LargeMoyoHarpoonBase">
<defName>Ammo_LargeMoyoHarpoon</defName>
<label>Heavy Spearjack</label>
<graphicData>
<texPath>Things/Ammo/Railgun/HighCaliber</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>7.94</MarketValue>
</statBases>
<ammoClass>MoyoHarpoon</ammoClass>
</ThingDef>

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

<ThingDef Name="BaseSmallMoyoHarpoonBullet" ParentName="BaseBulletCE" Abstract="true">
<graphicData>
<texPath>Weapon/MoyoSpear</texPath>
<graphicClass>Graphic_Single</graphicClass>
<drawSize>(1.0,1.0)</drawSize>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bullet</damageDef>
<speed>40</speed>
</projectile>
</ThingDef>

<ThingDef ParentName="BaseSmallMoyoHarpoonBullet">
<defName>Bullet_SmallMoyoHarpoon</defName>
<label>Spearjack harpoon</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageAmountBase>26</damageAmountBase>
<armorPenetrationSharp>9</armorPenetrationSharp>
<armorPenetrationBlunt>100</armorPenetrationBlunt>
</projectile>
</ThingDef>

<ThingDef Name="BaseLargeMoyoHarpoonBullet" ParentName="BaseBulletCE" Abstract="true">
<graphicData>
<texPath>Weapon/MoyoHarpoon</texPath>
<graphicClass>Graphic_Single</graphicClass>
<drawSize>(1.5,1.5)</drawSize>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bullet</damageDef>
<speed>40</speed>
</projectile>
</ThingDef>

<ThingDef ParentName="BaseLargeMoyoHarpoonBullet">
<defName>Bullet_LargeMoyoHarpoon</defName>
<label>Heavy Spearjack harpoon</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageAmountBase>75</damageAmountBase>
<armorPenetrationSharp>18</armorPenetrationSharp>
<armorPenetrationBlunt>800</armorPenetrationBlunt>
</projectile>
</ThingDef>

<!-- ==================== Recipes ========================== -->

<RecipeDef ParentName="AmmoRecipeBase">
<defName>MakeAmmo_SmallMoyoHarpoon</defName>
<label>make Spearjack x100</label>
<description>Craft 100 Spearjack.</description>
<jobString>Making Spearjack.</jobString>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>50</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_SmallMoyoHarpoon>100</Ammo_SmallMoyoHarpoon>
</products>
<workAmount>5000</workAmount>
<recipeUsers Inherit="False">
<li>Moyo2_FabricationBench</li>
<li>TableMachining</li>
</recipeUsers>
</RecipeDef>

<RecipeDef ParentName="AmmoRecipeBase">
<defName>MakeAmmo_LargeMoyoHarpoon</defName>
<label>make Heavy Spearjack x25</label>
<description>Craft 25 Heavy Spearjack.</description>
<jobString>Making Heavy Spearjack.</jobString>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>100</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_LargeMoyoHarpoon>25</Ammo_LargeMoyoHarpoon>
</products>
<workAmount>10000</workAmount>
<recipeUsers Inherit="False">
<li>Moyo2_FabricationBench</li>
<li>TableMachining</li>
</recipeUsers>
</RecipeDef>

</Defs>
Loading
Loading