Skip to content
This repository has been archived by the owner on Apr 14, 2020. It is now read-only.

Commit

Permalink
Merge pull request #846 from NoImageAvailable/Development
Browse files Browse the repository at this point in the history 
v1.6
  • Loading branch information
@NoImageAvailable
NoImageAvailable authored Nov 1, 2019
2 parents 64ecfe7 + b1e2391 commit ba057da
Show file tree
Hide file tree
Showing 323 changed files with 19,102 additions and 7,403 deletions.
2 changes: 1 addition & 1 deletion About/About.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
<li>1.0</li>
</supportedVersions>
<url>https://ludeon.com/forums/index.php?topic=33461.0</url>
<description>Version: 1.0.1.5a\n\nExtends combat mechanics to make them deeper and more tactical.</description>
<description>Version: 1.0.1.6\n\nExtends combat mechanics to make them deeper and more tactical.</description>
</ModMetaData>
2 changes: 1 addition & 1 deletion About/Manifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest>
<identifier>CombatExtended</identifier>
<version>1.0.1.5a</version>
<version>1.0.1.6</version>
<dependencies>
</dependencies>
<incompatibleWith>
Expand Down
2 changes: 1 addition & 1 deletion About/ModSync.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ModSyncNinjaData>
<ID>32418f60-269c-4a70-ae6e-a51d7a34cb2f</ID>
<ModName>Combat Extended</ModName>
<Version>1.0.1.5a</Version>
<Version>1.0.1.6</Version>
<SaveBreaking>False</SaveBreaking>
<Host name="Github">
<Owner>NoImageAvailable</Owner>
Expand Down
Binary file modified Assemblies/CombatExtended.dll
View file
Binary file not shown.
46 changes: 24 additions & 22 deletions Defs/Ammo/Advanced/12x64mmCharged.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<ThingCategoryDef>
<defName>Ammo12x64mmCharged</defName>
<label>12x64mm Charged</label>
<parent>AmmoAdvanced</parent>
<iconPath>UI/Icons/ThingCategories/CaliberChargeLarge</iconPath>
</ThingCategoryDef>
<!-- ==================== AmmoSet ========================== -->
<ThingCategoryDef>
<defName>Ammo12x64mmCharged</defName>
<label>12x64mm Charged</label>
<parent>AmmoAdvanced</parent>
<iconPath>UI/Icons/ThingCategories/CaliberChargeLarge</iconPath>
</ThingCategoryDef>

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

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_12x64mmCharged</defName>
Expand All @@ -17,21 +17,22 @@
<Ammo_12x64mmCharged>Bullet_12x64mmCharged</Ammo_12x64mmCharged>
</ammoTypes>
</CombatExtended.AmmoSetDef>
<!-- ==================== Ammo ========================== -->

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

<ThingDef Class="CombatExtended.AmmoDef" Name="12x64mmChargedBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
<description>Mechanoid-built high-caliber charged shot ammo used in heavy weapons.</description>
<statBases>
<Mass>0.1</Mass>
<Bulk>0.14</Bulk>
<Mass>0.1</Mass>
<Bulk>0.14</Bulk>
</statBases>
<thingCategories>
<li>Ammo12x64mmCharged</li>
</thingCategories>
<stackLimit>200</stackLimit>
<tradeability>Sellable</tradeability>
<destroyOnDrop>False</destroyOnDrop>
<tradeTags>
<li>CE_AutoEnableTrade_Sellable</li>
</tradeTags>
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="12x64mmChargedBase">
Expand All @@ -46,8 +47,8 @@
</statBases>
<ammoClass>Charged</ammoClass>
</ThingDef>
<!-- ================== Projectiles ================== -->

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

<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBullet">
<defName>Bullet_12x64mmCharged</defName>
Expand All @@ -59,18 +60,19 @@
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bullet</damageDef>
<damageAmountBase>25</damageAmountBase>
<damageAmountBase>39</damageAmountBase>
<speed>180</speed>
<secondaryDamage>
<li>
<def>Bomb_Secondary</def>
<amount>15</amount>
<amount>12</amount>
</li>
</secondaryDamage>
<armorPenetrationBase>1.2</armorPenetrationBase>
<armorPenetrationSharp>30</armorPenetrationSharp>
<armorPenetrationBlunt>324</armorPenetrationBlunt>
</projectile>
</ThingDef>
<!-- ==================== Recipes ========================== -->

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

</Defs>
60 changes: 33 additions & 27 deletions Defs/Ammo/Advanced/30x64mmFuelCell.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<ThingCategoryDef>
<defName>Ammo30x64mmFuelCell</defName>
<label>30x64mm Fuel Cell</label>
<parent>AmmoAdvanced</parent>
<iconPath>UI/Icons/ThingCategories/CaliberFuel</iconPath>
</ThingCategoryDef>
<!-- ==================== AmmoSet ========================== -->
<ThingCategoryDef>
<defName>Ammo30x64mmFuelCell</defName>
<label>30x64mm Fuel Cell</label>
<parent>AmmoAdvanced</parent>
<iconPath>UI/Icons/ThingCategories/CaliberFuel</iconPath>
</ThingCategoryDef>

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

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_30x64mmFuel</defName>
Expand All @@ -19,19 +19,19 @@
<Ammo_30x64mmFuel_Foam>Bullet_30x64mmFuel_Foam</Ammo_30x64mmFuel_Foam>
</ammoTypes>
</CombatExtended.AmmoSetDef>
<!-- ==================== Ammo ========================== -->

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

<ThingDef Class="CombatExtended.AmmoDef" Name="30x64mmFuelBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
<description>Container holding fuel for incendiary shot firearms.</description>
<statBases>
<Mass>0.3</Mass>
<Bulk>0.5</Bulk>
<Mass>0.3</Mass>
<Bulk>0.5</Bulk>
</statBases>
<tradeTags>
<li>CE_AutoEnableTrade</li>
<li>CE_AutoEnableCrafting</li>
</tradeTags>
<tradeTags>
<li>CE_AutoEnableTrade</li>
<li>CE_AutoEnableCrafting</li>
</tradeTags>
<thingCategories>
<li>Ammo30x64mmFuelCell</li>
</thingCategories>
Expand Down Expand Up @@ -75,10 +75,10 @@
<MarketValue>0.61</MarketValue>
</statBases>
<ammoClass>FoamFuel</ammoClass>
<generateAllowChance>0</generateAllowChance>
<generateAllowChance>0</generateAllowChance>
</ThingDef>
<!-- ================== Projectiles ================== -->

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

<ThingDef Class="CombatExtended.AmmoDef" Name="Base30x64mmFuelBullet" ParentName="BaseBullet" Abstract="true">
<graphicData>
Expand All @@ -98,9 +98,12 @@
<label>incendiary bolt</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>PrometheumFlame</damageDef>
<damageAmountBase>15</damageAmountBase>
<explosionRadius>1.5</explosionRadius>
<damageAmountBase>0</damageAmountBase>
<armorPenetrationSharp>0</armorPenetrationSharp>
<armorPenetrationBlunt>14.047</armorPenetrationBlunt>
<explosionRadius>3.5</explosionRadius>
<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
<ai_IsIncendiary>true</ai_IsIncendiary>
</projectile>
</ThingDef>
Expand All @@ -110,9 +113,11 @@
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
<label>thermobaric bolt</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<explosionRadius>2.5</explosionRadius>
<explosionRadius>2.0</explosionRadius>
<damageDef>Thermobaric</damageDef>
<damageAmountBase>50</damageAmountBase>
<damageAmountBase>136</damageAmountBase>
<armorPenetrationSharp>0</armorPenetrationSharp>
<armorPenetrationBlunt>25.526</armorPenetrationBlunt>
<soundExplode>MortarBomb_Explode</soundExplode>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
<ai_IsIncendiary>true</ai_IsIncendiary>
Expand All @@ -125,14 +130,15 @@
<label>foam bolt</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Extinguish</damageDef>
<damageAmountBase>50</damageAmountBase>
<explosionRadius>5.0</explosionRadius>
<armorPenetrationSharp>0</armorPenetrationSharp>
<armorPenetrationBlunt>14.047</armorPenetrationBlunt>
<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
<preExplosionSpawnChance>1</preExplosionSpawnChance>
</projectile>
</ThingDef>
<!-- ==================== Recipes ========================== -->

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

<RecipeDef ParentName="AmmoRecipeBase">
<defName>MakeAmmo_30x64mmFuel_Incendiary</defName>
Expand Down Expand Up @@ -237,5 +243,5 @@
<Ammo_30x64mmFuel_Foam>50</Ammo_30x64mmFuel_Foam>
</products>
</RecipeDef>

</Defs>
48 changes: 25 additions & 23 deletions Defs/Ammo/Advanced/5x35mmCharged.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<ThingCategoryDef>
<defName>Ammo5x35mmCharged</defName>
<label>5x35mm Charged</label>
<parent>AmmoAdvanced</parent>
<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
</ThingCategoryDef>
<!-- ==================== AmmoSet ========================== -->
<ThingCategoryDef>
<defName>Ammo5x35mmCharged</defName>
<label>5x35mm Charged</label>
<parent>AmmoAdvanced</parent>
<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
</ThingCategoryDef>

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

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_5x35mmCharged</defName>
Expand All @@ -17,20 +17,21 @@
<Ammo_5x35mmCharged>Bullet_5x35mmCharged</Ammo_5x35mmCharged>
</ammoTypes>
</CombatExtended.AmmoSetDef>
<!-- ==================== Ammo ========================== -->

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

<ThingDef Class="CombatExtended.AmmoDef" Name="5x35mmChargedBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
<description>Mechanoid-built charged shot ammo designed for high-velocity fire and armor penetration.</description>
<statBases>
<Mass>0.012</Mass>
<Bulk>0.01</Bulk>
<Mass>0.012</Mass>
<Bulk>0.01</Bulk>
</statBases>
<thingCategories>
<li>Ammo5x35mmCharged</li>
</thingCategories>
<tradeability>Sellable</tradeability>
<destroyOnDrop>False</destroyOnDrop>
<tradeTags>
<li>CE_AutoEnableTrade_Sellable</li>
</tradeTags>
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="5x35mmChargedBase">
Expand All @@ -43,10 +44,10 @@
<statBases>
<MarketValue>1.28</MarketValue>
</statBases>
<ammoClass>Charged</ammoClass>
<ammoClass>Charged</ammoClass>
</ThingDef>
<!-- ================== Projectiles ================== -->

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

<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBullet">
<defName>Bullet_5x35mmCharged</defName>
Expand All @@ -59,18 +60,19 @@
</graphicData>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>Bullet</damageDef>
<damageAmountBase>10</damageAmountBase>
<damageAmountBase>11</damageAmountBase>
<speed>200</speed>
<secondaryDamage>
<li>
<def>Bomb_Secondary</def>
<amount>3</amount>
<amount>2</amount>
</li>
</secondaryDamage>
<armorPenetrationBase>0.95</armorPenetrationBase>
<armorPenetrationSharp>30</armorPenetrationSharp>
<armorPenetrationBlunt>70</armorPenetrationBlunt>
</projectile>
</ThingDef>
<!-- ==================== Recipes ========================== -->

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

</Defs>
Loading

0 comments on commit ba057da

Please sign in to comment.