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

Commit ba057da

Browse files
NoImageAvailableNoImageAvailable
authored
Merge pull request #846 from NoImageAvailable/Development
v1.6
2 parents 64ecfe7 + b1e2391 commit ba057da

File tree

323 files changed

+19102
-7403
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

323 files changed

+19102
-7403
lines changed

‎About/About.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
<li>1.0</li>
77
</supportedVersions>
88
<url>https://ludeon.com/forums/index.php?topic=33461.0</url>
9-
<description>Version: 1.0.1.5a\n\nExtends combat mechanics to make them deeper and more tactical.</description>
9+
<description>Version: 1.0.1.6\n\nExtends combat mechanics to make them deeper and more tactical.</description>
1010
</ModMetaData>

‎About/Manifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<Manifest>
33
<identifier>CombatExtended</identifier>
4-
<version>1.0.1.5a</version>
4+
<version>1.0.1.6</version>
55
<dependencies>
66
</dependencies>
77
<incompatibleWith>

‎About/ModSync.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ModSyncNinjaData>
33
<ID>32418f60-269c-4a70-ae6e-a51d7a34cb2f</ID>
44
<ModName>Combat Extended</ModName>
5-
<Version>1.0.1.5a</Version>
5+
<Version>1.0.1.6</Version>
66
<SaveBreaking>False</SaveBreaking>
77
<Host name="Github">
88
<Owner>NoImageAvailable</Owner>

‎Assemblies/CombatExtended.dll‎

46.5 KB
Binary file not shown.

‎Defs/Ammo/Advanced/12x64mmCharged.xml‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Defs>
33

4-
<ThingCategoryDef>
5-
<defName>Ammo12x64mmCharged</defName>
6-
<label>12x64mm Charged</label>
7-
<parent>AmmoAdvanced</parent>
8-
<iconPath>UI/Icons/ThingCategories/CaliberChargeLarge</iconPath>
9-
</ThingCategoryDef>
10-
11-
<!-- ==================== AmmoSet ========================== -->
4+
<ThingCategoryDef>
5+
<defName>Ammo12x64mmCharged</defName>
6+
<label>12x64mm Charged</label>
7+
<parent>AmmoAdvanced</parent>
8+
<iconPath>UI/Icons/ThingCategories/CaliberChargeLarge</iconPath>
9+
</ThingCategoryDef>
10+
11+
<!-- ==================== AmmoSet ========================== -->
1212

1313
<CombatExtended.AmmoSetDef>
1414
<defName>AmmoSet_12x64mmCharged</defName>
@@ -17,21 +17,22 @@
1717
<Ammo_12x64mmCharged>Bullet_12x64mmCharged</Ammo_12x64mmCharged>
1818
</ammoTypes>
1919
</CombatExtended.AmmoSetDef>
20-
21-
<!-- ==================== Ammo ========================== -->
20+
21+
<!-- ==================== Ammo ========================== -->
2222

2323
<ThingDef Class="CombatExtended.AmmoDef" Name="12x64mmChargedBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
2424
<description>Mechanoid-built high-caliber charged shot ammo used in heavy weapons.</description>
2525
<statBases>
26-
<Mass>0.1</Mass>
27-
<Bulk>0.14</Bulk>
26+
<Mass>0.1</Mass>
27+
<Bulk>0.14</Bulk>
2828
</statBases>
2929
<thingCategories>
3030
<li>Ammo12x64mmCharged</li>
3131
</thingCategories>
3232
<stackLimit>200</stackLimit>
33-
<tradeability>Sellable</tradeability>
34-
<destroyOnDrop>False</destroyOnDrop>
33+
<tradeTags>
34+
<li>CE_AutoEnableTrade_Sellable</li>
35+
</tradeTags>
3536
</ThingDef>
3637

3738
<ThingDef Class="CombatExtended.AmmoDef" ParentName="12x64mmChargedBase">
@@ -46,8 +47,8 @@
4647
</statBases>
4748
<ammoClass>Charged</ammoClass>
4849
</ThingDef>
49-
50-
<!-- ================== Projectiles ================== -->
50+
51+
<!-- ================== Projectiles ================== -->
5152

5253
<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBullet">
5354
<defName>Bullet_12x64mmCharged</defName>
@@ -59,18 +60,19 @@
5960
</graphicData>
6061
<projectile Class="CombatExtended.ProjectilePropertiesCE">
6162
<damageDef>Bullet</damageDef>
62-
<damageAmountBase>25</damageAmountBase>
63+
<damageAmountBase>39</damageAmountBase>
6364
<speed>180</speed>
6465
<secondaryDamage>
6566
<li>
6667
<def>Bomb_Secondary</def>
67-
<amount>15</amount>
68+
<amount>12</amount>
6869
</li>
6970
</secondaryDamage>
70-
<armorPenetrationBase>1.2</armorPenetrationBase>
71+
<armorPenetrationSharp>30</armorPenetrationSharp>
72+
<armorPenetrationBlunt>324</armorPenetrationBlunt>
7173
</projectile>
7274
</ThingDef>
73-
74-
<!-- ==================== Recipes ========================== -->
75-
75+
76+
<!-- ==================== Recipes ========================== -->
77+
7678
</Defs>

‎Defs/Ammo/Advanced/30x64mmFuelCell.xml‎

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Defs>
33

4-
<ThingCategoryDef>
5-
<defName>Ammo30x64mmFuelCell</defName>
6-
<label>30x64mm Fuel Cell</label>
7-
<parent>AmmoAdvanced</parent>
8-
<iconPath>UI/Icons/ThingCategories/CaliberFuel</iconPath>
9-
</ThingCategoryDef>
10-
11-
<!-- ==================== AmmoSet ========================== -->
4+
<ThingCategoryDef>
5+
<defName>Ammo30x64mmFuelCell</defName>
6+
<label>30x64mm Fuel Cell</label>
7+
<parent>AmmoAdvanced</parent>
8+
<iconPath>UI/Icons/ThingCategories/CaliberFuel</iconPath>
9+
</ThingCategoryDef>
10+
11+
<!-- ==================== AmmoSet ========================== -->
1212

1313
<CombatExtended.AmmoSetDef>
1414
<defName>AmmoSet_30x64mmFuel</defName>
@@ -19,19 +19,19 @@
1919
<Ammo_30x64mmFuel_Foam>Bullet_30x64mmFuel_Foam</Ammo_30x64mmFuel_Foam>
2020
</ammoTypes>
2121
</CombatExtended.AmmoSetDef>
22-
23-
<!-- ==================== Ammo ========================== -->
22+
23+
<!-- ==================== Ammo ========================== -->
2424

2525
<ThingDef Class="CombatExtended.AmmoDef" Name="30x64mmFuelBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
2626
<description>Container holding fuel for incendiary shot firearms.</description>
2727
<statBases>
28-
<Mass>0.3</Mass>
29-
<Bulk>0.5</Bulk>
28+
<Mass>0.3</Mass>
29+
<Bulk>0.5</Bulk>
3030
</statBases>
31-
<tradeTags>
32-
<li>CE_AutoEnableTrade</li>
33-
<li>CE_AutoEnableCrafting</li>
34-
</tradeTags>
31+
<tradeTags>
32+
<li>CE_AutoEnableTrade</li>
33+
<li>CE_AutoEnableCrafting</li>
34+
</tradeTags>
3535
<thingCategories>
3636
<li>Ammo30x64mmFuelCell</li>
3737
</thingCategories>
@@ -75,10 +75,10 @@
7575
<MarketValue>0.61</MarketValue>
7676
</statBases>
7777
<ammoClass>FoamFuel</ammoClass>
78-
<generateAllowChance>0</generateAllowChance>
78+
<generateAllowChance>0</generateAllowChance>
7979
</ThingDef>
80-
81-
<!-- ================== Projectiles ================== -->
80+
81+
<!-- ================== Projectiles ================== -->
8282

8383
<ThingDef Class="CombatExtended.AmmoDef" Name="Base30x64mmFuelBullet" ParentName="BaseBullet" Abstract="true">
8484
<graphicData>
@@ -98,9 +98,12 @@
9898
<label>incendiary bolt</label>
9999
<projectile Class="CombatExtended.ProjectilePropertiesCE">
100100
<damageDef>PrometheumFlame</damageDef>
101-
<damageAmountBase>15</damageAmountBase>
102-
<explosionRadius>1.5</explosionRadius>
101+
<damageAmountBase>0</damageAmountBase>
102+
<armorPenetrationSharp>0</armorPenetrationSharp>
103+
<armorPenetrationBlunt>14.047</armorPenetrationBlunt>
104+
<explosionRadius>3.5</explosionRadius>
103105
<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
106+
<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
104107
<ai_IsIncendiary>true</ai_IsIncendiary>
105108
</projectile>
106109
</ThingDef>
@@ -110,9 +113,11 @@
110113
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
111114
<label>thermobaric bolt</label>
112115
<projectile Class="CombatExtended.ProjectilePropertiesCE">
113-
<explosionRadius>2.5</explosionRadius>
116+
<explosionRadius>2.0</explosionRadius>
114117
<damageDef>Thermobaric</damageDef>
115-
<damageAmountBase>50</damageAmountBase>
118+
<damageAmountBase>136</damageAmountBase>
119+
<armorPenetrationSharp>0</armorPenetrationSharp>
120+
<armorPenetrationBlunt>25.526</armorPenetrationBlunt>
116121
<soundExplode>MortarBomb_Explode</soundExplode>
117122
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
118123
<ai_IsIncendiary>true</ai_IsIncendiary>
@@ -125,14 +130,15 @@
125130
<label>foam bolt</label>
126131
<projectile Class="CombatExtended.ProjectilePropertiesCE">
127132
<damageDef>Extinguish</damageDef>
128-
<damageAmountBase>50</damageAmountBase>
129133
<explosionRadius>5.0</explosionRadius>
134+
<armorPenetrationSharp>0</armorPenetrationSharp>
135+
<armorPenetrationBlunt>14.047</armorPenetrationBlunt>
130136
<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
131137
<preExplosionSpawnChance>1</preExplosionSpawnChance>
132138
</projectile>
133139
</ThingDef>
134-
135-
<!-- ==================== Recipes ========================== -->
140+
141+
<!-- ==================== Recipes ========================== -->
136142

137143
<RecipeDef ParentName="AmmoRecipeBase">
138144
<defName>MakeAmmo_30x64mmFuel_Incendiary</defName>
@@ -237,5 +243,5 @@
237243
<Ammo_30x64mmFuel_Foam>50</Ammo_30x64mmFuel_Foam>
238244
</products>
239245
</RecipeDef>
240-
246+
241247
</Defs>

‎Defs/Ammo/Advanced/5x35mmCharged.xml‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Defs>
33

4-
<ThingCategoryDef>
5-
<defName>Ammo5x35mmCharged</defName>
6-
<label>5x35mm Charged</label>
7-
<parent>AmmoAdvanced</parent>
8-
<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
9-
</ThingCategoryDef>
10-
11-
<!-- ==================== AmmoSet ========================== -->
4+
<ThingCategoryDef>
5+
<defName>Ammo5x35mmCharged</defName>
6+
<label>5x35mm Charged</label>
7+
<parent>AmmoAdvanced</parent>
8+
<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
9+
</ThingCategoryDef>
10+
11+
<!-- ==================== AmmoSet ========================== -->
1212

1313
<CombatExtended.AmmoSetDef>
1414
<defName>AmmoSet_5x35mmCharged</defName>
@@ -17,20 +17,21 @@
1717
<Ammo_5x35mmCharged>Bullet_5x35mmCharged</Ammo_5x35mmCharged>
1818
</ammoTypes>
1919
</CombatExtended.AmmoSetDef>
20-
21-
<!-- ==================== Ammo ========================== -->
20+
21+
<!-- ==================== Ammo ========================== -->
2222

2323
<ThingDef Class="CombatExtended.AmmoDef" Name="5x35mmChargedBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
2424
<description>Mechanoid-built charged shot ammo designed for high-velocity fire and armor penetration.</description>
2525
<statBases>
26-
<Mass>0.012</Mass>
27-
<Bulk>0.01</Bulk>
26+
<Mass>0.012</Mass>
27+
<Bulk>0.01</Bulk>
2828
</statBases>
2929
<thingCategories>
3030
<li>Ammo5x35mmCharged</li>
3131
</thingCategories>
32-
<tradeability>Sellable</tradeability>
33-
<destroyOnDrop>False</destroyOnDrop>
32+
<tradeTags>
33+
<li>CE_AutoEnableTrade_Sellable</li>
34+
</tradeTags>
3435
</ThingDef>
3536

3637
<ThingDef Class="CombatExtended.AmmoDef" ParentName="5x35mmChargedBase">
@@ -43,10 +44,10 @@
4344
<statBases>
4445
<MarketValue>1.28</MarketValue>
4546
</statBases>
46-
<ammoClass>Charged</ammoClass>
47+
<ammoClass>Charged</ammoClass>
4748
</ThingDef>
48-
49-
<!-- ================== Projectiles ================== -->
49+
50+
<!-- ================== Projectiles ================== -->
5051

5152
<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBullet">
5253
<defName>Bullet_5x35mmCharged</defName>
@@ -59,18 +60,19 @@
5960
</graphicData>
6061
<projectile Class="CombatExtended.ProjectilePropertiesCE">
6162
<damageDef>Bullet</damageDef>
62-
<damageAmountBase>10</damageAmountBase>
63+
<damageAmountBase>11</damageAmountBase>
6364
<speed>200</speed>
6465
<secondaryDamage>
6566
<li>
6667
<def>Bomb_Secondary</def>
67-
<amount>3</amount>
68+
<amount>2</amount>
6869
</li>
6970
</secondaryDamage>
70-
<armorPenetrationBase>0.95</armorPenetrationBase>
71+
<armorPenetrationSharp>30</armorPenetrationSharp>
72+
<armorPenetrationBlunt>70</armorPenetrationBlunt>
7173
</projectile>
7274
</ThingDef>
73-
74-
<!-- ==================== Recipes ========================== -->
75-
75+
76+
<!-- ==================== Recipes ========================== -->
77+
7678
</Defs>

0 commit comments

Comments
 (0)