Skip to content

Commit

Permalink
Added CE integration to 1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zeracronius
Zeracronius committed Sep 8, 2024
1 parent fe5189f commit 2c5dcc1
Show file tree
Hide file tree
Showing 15 changed files with 4,206 additions and 0 deletions.
75 changes: 75 additions & 0 deletions 1.5/Mods/CombatExtended/Defs/Ammo/40x46mmGrenade.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<!-- ==================== Ammo ========================== -->
<ThingDef Class="CombatExtended.AmmoDef" ParentName="40x46mmGrenadeBase">
<defName>Ammo_40x46mmGrenade_Mutagenic</defName>
<label>40x46mm grenade (Mutagenic)</label>
<graphicData>
<texPath>Things/Ammo/GrenadeLauncher/Mutagenic</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>2.16</MarketValue>
</statBases>
<ammoClass>GrenadeMutagenic</ammoClass>
<generateAllowChance>0</generateAllowChance>
<detonateProjectile>Bullet_40x46mmGrenade_Mutagenic</detonateProjectile>
</ThingDef>
<!-- ================== Projectiles ================== -->
<ThingDef ParentName="Base40x46mmGrenadeBullet">
<defName>Bullet_40x46mmGrenade_Mutagenic</defName>
<label>40x46mm grenade (Mutagenic)</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<explosionRadius>2</explosionRadius>
<damageDef>MutagenCloud</damageDef>
<preExplosionSpawnThingDef>Gas_Mutagen</preExplosionSpawnThingDef>
<preExplosionSpawnChance>1</preExplosionSpawnChance>
<postExplosionSpawnThingDef>PM_Filth_Slurry</postExplosionSpawnThingDef>
<postExplosionSpawnChance>0.8</postExplosionSpawnChance>
</projectile>
</ThingDef>
<!-- ==================== Recipes ========================== -->
<RecipeDef ParentName="LauncherAmmoRecipeBase">
<defName>MakeAmmo_40x46mmGrenade_Mutagenic</defName>
<label>make 40x46mm mutagenic grenades x100</label>
<description>Craft 100 40x46mm mutagenic grenades.</description>
<jobString>Making 40x46mm mutagenic grenades.</jobString>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>50</count>
</li>
<li>
<filter>
<thingDefs>
<li>MechaniteSlurry</li>
</thingDefs>
</filter>
<count>3</count>
</li>
<li>
<filter>
<thingDefs>
<li>ComponentIndustrial</li>
</thingDefs>
</filter>
<count>2</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
<li>MechaniteSlurry</li>
<li>ComponentIndustrial</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_40x46mmGrenade_Mutagenic>100</Ammo_40x46mmGrenade_Mutagenic>
</products>
<workAmount>7400</workAmount>
</RecipeDef>
</Defs>
107 changes: 107 additions & 0 deletions 1.5/Mods/CombatExtended/Defs/Ammo/68Mutagel.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<!--Based on real life paintballs containing chemical agents.-->
<!-- ==================== AmmoSet ========================== -->
<CombatExtended.AmmoSetDef>
<defName>PM_AmmoSet_MutagenCapsule</defName>
<label>.68 mutagel balls</label>
<ammoTypes>
<PM_Ammo_68Mutagen_Ball>PM_Bullet_68Mutagen_Ball</PM_Ammo_68Mutagen_Ball>
</ammoTypes>
</CombatExtended.AmmoSetDef>
<!-- ==================== Ammo ========================== -->
<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
<defName>PM_Ammo_68Mutagen_Ball</defName>
<label>.68 mutagel ball</label>
<description>Small capsules that contain jellied mutanite surrounded by a thin membrane that bursts on impact, intended for use in low pressure airguns.</description>
<statBases>
<Mass>0.003</Mass>
<Bulk>0.02</Bulk>
<MarketValue>0.28</MarketValue>
</statBases>
<tradeTags>
<li>CE_AutoEnableTrade</li>
<li>CE_AutoEnableCrafting_DrugLab</li>
</tradeTags>
<thingCategories>
<li>AmmoAdvanced</li>
</thingCategories>
<graphicData>
<texPath>Things/Ammo/LowPressureMCapsule/Ball</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<ammoClass>PM_Mutagenic</ammoClass>
<ingestible>
<foodType>Processed, Fluid</foodType>
<preferability>NeverForNutrition</preferability>
<ingestSound>Meal_Eat</ingestSound>
<chairSearchRadius>0</chairSearchRadius>
<outcomeDoers>
<li Class="IngestionOutcomeDoer_GiveHediff">
<hediffDef>MutagenicBuildup_Weapon</hediffDef>
<severity>0.2</severity>
</li>
</outcomeDoers>
</ingestible>
<comps>
<li Class="CombatExtended.CompProperties_ExplosiveCE">
<damageAmountBase>3</damageAmountBase>
<explosiveDamageType>MutagenCloud_Tiny</explosiveDamageType>
<explosiveRadius>0.5</explosiveRadius>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
</li>
</comps>
<socialPropernessMatters>false</socialPropernessMatters>
</ThingDef>
<!-- ================== Projectiles ================== -->
<ThingDef ParentName="Base6x24mmChargedBullet">
<defName>PM_Bullet_68Mutagen_Ball</defName>
<label>.68 mutagel ball</label>
<graphicData>
<texPath>Things/Projectiles/MutagenBullet_Small</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>MutagenicBulletDamage</damageDef>
<speed>28</speed>
<damageAmountBase>5</damageAmountBase>
<armorPenetrationSharp>0</armorPenetrationSharp>
<armorPenetrationBlunt>0.56</armorPenetrationBlunt>
</projectile>
</ThingDef>
<!-- ==================== Recipes ========================== -->
<RecipeDef ParentName="FlamethrowerAmmoRecipeBase">
<defName>MakePM_Ammo_68Mutagen_Ball</defName>
<label>make .68 mutagel ball x500</label>
<description>Craft 500 .68 mutagel balls.</description>
<jobString>Making .68 mutagel balls.</jobString>
<workAmount>3600</workAmount>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Mutanite</li>
</thingDefs>
</filter>
<count>5</count>
</li>
<li>
<filter>
<thingDefs>
<li>Neutroamine</li>
</thingDefs>
</filter>
<count>10</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Mutanite</li>
<li>Neutroamine</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<PM_Ammo_68Mutagen_Ball>500</PM_Ammo_68Mutagen_Ball>
</products>
</RecipeDef>
</Defs>
85 changes: 85 additions & 0 deletions 1.5/Mods/CombatExtended/Defs/Ammo/Arrows.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<!-- ==================== Ammo ========================== -->
<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoArrowBase">
<defName>Ammo_Arrow_Mutanite</defName>
<label>arrow (mutanite)</label>
<graphicData>
<texPath>Things/Ammo/Neolithic/Arrow/Venom</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>2.58</MarketValue>
</statBases>
<ammoClass>MutaniteArrow</ammoClass>
<generateAllowChance>0</generateAllowChance>
</ThingDef>
<!-- ================== Projectiles ================== -->
<ThingDef ParentName="BaseArrowProjectile">
<defName>Projectile_Arrow_Mutanite</defName>
<label>arrow (mutanite)</label>
<graphicData>
<texPath>Things/Projectiles/MutagenArrow</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>MutagenicArrowDamage</damageDef>
<damageAmountBase>7</damageAmountBase>
<armorPenetrationSharp>0.5</armorPenetrationSharp>
<armorPenetrationBlunt>3.02</armorPenetrationBlunt>
<preExplosionSpawnChance>0.666</preExplosionSpawnChance>
<preExplosionSpawnThingDef>Ammo_Arrow_Mutanite</preExplosionSpawnThingDef>
</projectile>
</ThingDef>
<ThingDef ParentName="BaseStreamlinedArrowProjectile">
<defName>Projectile_StreamlinedArrow_Mutanite</defName>
<label>streamlined arrow (mutanite)</label>
<graphicData>
<texPath>Things/Projectiles/MutagenArrow</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>MutagenicArrowDamage</damageDef>
<damageAmountBase>9</damageAmountBase>
<armorPenetrationSharp>1.0</armorPenetrationSharp>
<armorPenetrationBlunt>5.9</armorPenetrationBlunt>
<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
<preExplosionSpawnThingDef>Ammo_Arrow_Mutanite</preExplosionSpawnThingDef>
</projectile>
</ThingDef>
<!-- ==================== Recipes ========================== -->
<RecipeDef ParentName="AmmoRecipeNeolithicBase">
<defName>MakeAmmo_Arrow_Mutanite</defName>
<label>make mutanite arrows x10</label>
<description>Craft 10 mutanite arrows.</description>
<jobString>Making mutanite arrows.</jobString>
<workAmount>300</workAmount>
<ingredients>
<li>
<filter>
<thingDefs>
<li>WoodLog</li>
</thingDefs>
</filter>
<count>1</count>
</li>
<li>
<filter>
<thingDefs>
<li>Mutanite</li>
</thingDefs>
</filter>
<count>2</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>WoodLog</li>
<li>Mutanite</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_Arrow_Mutanite>10</Ammo_Arrow_Mutanite>
</products>
</RecipeDef>
</Defs>
69 changes: 69 additions & 0 deletions 1.5/Mods/CombatExtended/Defs/Ammo/GreatArrows.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<!-- ==================== Ammo ========================== -->
<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoGreatArrowBase">
<defName>Ammo_GreatArrow_Mutanite</defName>
<label>great arrow (mutanite)</label>
<graphicData>
<texPath>Things/Ammo/Neolithic/Arrow/Venom</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>4.76</MarketValue>
</statBases>
<ammoClass>MutaniteArrow</ammoClass>
<generateAllowChance>0</generateAllowChance>
</ThingDef>
<!-- ================== Projectiles ================== -->
<ThingDef ParentName="BaseGreatArrowProjectile">
<defName>Projectile_GreatArrow_Mutanite</defName>
<label>great arrow (mutanite)</label>
<graphicData>
<texPath>Things/Projectiles/MutagenArrow</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>MutagenicArrowDamage</damageDef>
<damageAmountBase>10</damageAmountBase>
<armorPenetrationBlunt>3.18</armorPenetrationBlunt>
<armorPenetrationSharp>2</armorPenetrationSharp>
<preExplosionSpawnChance>0.6</preExplosionSpawnChance>
<preExplosionSpawnThingDef>Ammo_GreatArrow_Mutanite</preExplosionSpawnThingDef>
</projectile>
</ThingDef>
<!-- ==================== Recipes ========================== -->
<RecipeDef ParentName="AmmoRecipeNeolithicBase">
<defName>MakeAmmo_GreatArrow_Mutanite</defName>
<label>make mutanite great arrows x10</label>
<description>Craft 10 mutanite great arrows.</description>
<jobString>Making mutanite great arrows.</jobString>
<workAmount>400</workAmount>
<ingredients>
<li>
<filter>
<thingDefs>
<li>WoodLog</li>
</thingDefs>
</filter>
<count>2</count>
</li>
<li>
<filter>
<thingDefs>
<li>Mutanite</li>
</thingDefs>
</filter>
<count>2</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>WoodLog</li>
<li>Mutanite</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_GreatArrow_Mutanite>10</Ammo_GreatArrow_Mutanite>
</products>
</RecipeDef>
</Defs>
22 changes: 22 additions & 0 deletions 1.5/Mods/CombatExtended/Defs/AmmoCategories_Mutagenic.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<CombatExtended.AmmoCategoryDef>
<defName>PM_Mutagenic</defName>
<label>mutagenic</label>
<labelShort>mutagen</labelShort>
<description>Mutates organic targets on contact.</description>
</CombatExtended.AmmoCategoryDef>
<CombatExtended.AmmoCategoryDef>
<defName>GrenadeMutagenic</defName>
<label>Mutagenic</label>
<labelShort>mutagen</labelShort>
<description>Filled with a chaotic mix of DNA and mechanites that aerosolizes on impact. The mist can mutate any organics caught in it.</description>
</CombatExtended.AmmoCategoryDef>
<CombatExtended.AmmoCategoryDef>
<defName>MutaniteArrow</defName>
<label>mutanite arrow</label>
<labelShort>mutanite</labelShort>
<description>The arrow head is made from mutanite which mutates the victim.</description>
<advanced>true</advanced>
</CombatExtended.AmmoCategoryDef>
</Defs>
Loading

0 comments on commit 2c5dcc1

Please sign in to comment.