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

Commit c53db79

Browse files
NoImageAvailableNoImageAvailable
authored
Merge pull request #263 from NoImageAvailable/Development
Development
2 parents a638254 + 0c692c9 commit c53db79

File tree

195 files changed

+4963
-1408
lines changed

Some content is hidden

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

195 files changed

+4963
-1408
lines changed

‎About/About.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
<author>CE Team</author>
55
<targetVersion>0.17.1557</targetVersion>
66
<url>https://ludeon.com/forums/index.php?topic=33461.0</url>
7-
<description>Version: 0.17.1.1\n\nExtends combat mechanics to make them deeper and more tactical.</description>
7+
<description>Version: 0.17.1.2\n\nExtends combat mechanics to make them deeper and more tactical.</description>
88
</ModMetaData>

‎Assemblies/CombatExtended.dll‎

11.5 KB
Binary file not shown.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<defName>Ammo12x64mmCharged</defName>
66
<label>12x64mm Charged</label>
77
<parent>AmmoAdvanced</parent>
8+
<iconPath>UI/Icons/ThingCategories/CaliberChargeLarge</iconPath>
89
</ThingCategoryDef>
910

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

‎Defs/Ammo/Advanced/15x65mmDiffusingCharged.xml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<Defs>
3+
4+
<ThingCategoryDef>
5+
<defName>Ammo15x65mmDiffusingCharged</defName>
6+
<label>15x65mm Diffusing Charged</label>
7+
<parent>AmmoAdvanced</parent>
8+
<iconPath>UI/Icons/ThingCategories/CaliberChargeLarge</iconPath>
9+
</ThingCategoryDef>
10+
11+
<!-- ==================== AmmoSet ========================== -->
12+
13+
<CombatExtended.AmmoSetDef>
14+
<defName>AmmoSet_15x65mmDiffusingCharged</defName>
15+
<label>15x65mm Diffusing Charged</label>
16+
<ammoTypes>
17+
<Ammo_15x65mmDiffusingCharged_Buck>Bullet_15x65mmDiffusingCharged_Buck</Ammo_15x65mmDiffusingCharged_Buck>
18+
</ammoTypes>
19+
</CombatExtended.AmmoSetDef>
20+
21+
<!-- ==================== Ammo ========================== -->
22+
23+
<ThingDef Name="15x65mmDiffusingChargedBase" ParentName="SmallAmmoBase" Abstract="True">
24+
<description>Mechanoid-built cartridge designed to split upon firing.</description>
25+
<statBases>
26+
<Mass>0.05</Mass>
27+
<Bulk>0.07</Bulk>
28+
</statBases>
29+
<thingCategories>
30+
<li>Ammo15x65mmDiffusingCharged</li>
31+
</thingCategories>
32+
</ThingDef>
33+
34+
<ThingDef ParentName="15x65mmDiffusingChargedBase">
35+
<defName>Ammo_15x65mmDiffusingCharged_Buck</defName>
36+
<label>15x65mm Diffusing Charged cartridge</label>
37+
<graphicData>
38+
<texPath>Things/Ammo/Charged/Regular</texPath>
39+
<graphicClass>Graphic_StackCount</graphicClass>
40+
</graphicData>
41+
<statBases>
42+
<MarketValue>0.44</MarketValue>
43+
</statBases>
44+
<ammoClass>BuckShot</ammoClass>
45+
<cookOffProjectile>Bullet_15x65mmDiffusingCharged_Buck</cookOffProjectile>
46+
</ThingDef>
47+
48+
<!-- ================== Projectiles ================== -->
49+
50+
<ThingDef Name="Base15x65mmDiffusingChargedBullet" ParentName="BaseBullet" Abstract="true">
51+
<projectile>
52+
<damageDef>Bullet</damageDef>
53+
<speed>112</speed>
54+
<casingMoteDefName>Mote_ShotgunShell</casingMoteDefName>
55+
</projectile>
56+
</ThingDef>
57+
58+
<ThingDef ParentName="Base15x65mmDiffusingChargedBullet">
59+
<defName>Bullet_15x65mmDiffusingCharged_Buck</defName>
60+
<label>buckshot charged</label>
61+
<graphicData>
62+
<texPath>Things/Projectile/Charged/charge_regular</texPath>
63+
<graphicClass>Graphic_Single</graphicClass>
64+
</graphicData>
65+
<projectile>
66+
<damageAmountBase>6</damageAmountBase>
67+
<pelletCount>8</pelletCount>
68+
<secondaryDamage>
69+
<li>
70+
<def>Bomb_Secondary</def>
71+
<amount>4</amount>
72+
</li>
73+
</secondaryDamage>
74+
<armorPenetration>0.65</armorPenetration>
75+
<spreadMult>17.8</spreadMult>
76+
</projectile>
77+
</ThingDef>
78+
79+
<!-- ==================== Recipes ========================== -->
80+
81+
</Defs>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<defName>Ammo30x64mmFuelCell</defName>
66
<label>30x64mm Fuel Cell</label>
77
<parent>AmmoAdvanced</parent>
8+
<iconPath>UI/Icons/ThingCategories/CaliberFuel</iconPath>
89
</ThingCategoryDef>
910

1011
<!-- ==================== AmmoSet ========================== -->
@@ -96,10 +97,10 @@
9697
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
9798
<label>incendiary bolt</label>
9899
<projectile>
99-
<damageDef>Flame</damageDef>
100+
<damageDef>PrometheumFlame</damageDef>
100101
<damageAmountBase>15</damageAmountBase>
101102
<explosionRadius>1.5</explosionRadius>
102-
<preExplosionSpawnThingDef>FilthFuel</preExplosionSpawnThingDef>
103+
<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
103104
</projectile>
104105
</ThingDef>
105106

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<defName>Ammo5x35mmCharged</defName>
66
<label>5x35mm Charged</label>
77
<parent>AmmoAdvanced</parent>
8+
<iconPath>UI/Icons/ThingCategories/CaliberCharge</iconPath>
89
</ThingCategoryDef>
910

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

‎Defs/Ammo/Advanced/60x225mmGammaShell.xml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<Defs>
3+
4+
<ThingCategoryDef>
5+
<defName>Ammo60x225mmGammaShell</defName>
6+
<label>60x225mm Gamma Shell</label>
7+
<parent>AmmoAdvanced</parent>
8+
<iconPath>UI/Icons/ThingCategories/CaliberFuelLarge</iconPath>
9+
</ThingCategoryDef>
10+
11+
<!-- ==================== AmmoSet ========================== -->
12+
13+
<CombatExtended.AmmoSetDef>
14+
<defName>AmmoSet_60x225mmGamma</defName>
15+
<label>60x225mm Gamma Shell</label>
16+
<ammoTypes>
17+
<Ammo_60x225mmGamma_Standard>Bullet_60x225mmGamma_Standard</Ammo_60x225mmGamma_Standard>
18+
</ammoTypes>
19+
</CombatExtended.AmmoSetDef>
20+
21+
<!-- ==================== Ammo ========================== -->
22+
23+
<ThingDef Name="60x225mmGammaBase" ParentName="SmallAmmoBase" Abstract="True">
24+
<description>Shell containing large amounts of ionising gamma radiation.</description>
25+
<statBases>
26+
<Mass>2.5</Mass>
27+
<Bulk>7</Bulk>
28+
</statBases>
29+
<thingCategories>
30+
<li>Ammo60x225mmGammaShell</li>
31+
</thingCategories>
32+
<stackLimit>25</stackLimit>
33+
</ThingDef>
34+
35+
<ThingDef ParentName="60x225mmGammaBase">
36+
<defName>Ammo_60x225mmGamma_Standard</defName>
37+
<label>60x225mm Gamma Shell (Standard)</label>
38+
<graphicData>
39+
<texPath>Things/Ammo/FuelCell/Large</texPath>
40+
<graphicClass>Graphic_StackCount</graphicClass>
41+
</graphicData>
42+
<statBases>
43+
<MarketValue>28.98</MarketValue>
44+
</statBases>
45+
<ammoClass>RadiationIonising</ammoClass>
46+
<comps>
47+
<li Class="CombatExtended.CompProperties_ExplosiveCE">
48+
<explosionDamage>12</explosionDamage>
49+
<explosionDamageDef>Burn</explosionDamageDef>
50+
<explosionRadius>3.5</explosionRadius>
51+
<soundExplode>MortarIncendiary_Explode</soundExplode>
52+
</li>
53+
</comps>
54+
</ThingDef>
55+
56+
<!-- ================== Projectiles ================== -->
57+
58+
<ThingDef ParentName="BaseBullet">
59+
<defName>Bullet_60x225mmGamma_Standard</defName>
60+
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
61+
<label>radiation cannon shell</label>
62+
<graphicData>
63+
<texPath>Things/Projectile/InfernoCannonShot</texPath>
64+
<graphicClass>Graphic_Single</graphicClass>
65+
<shaderType>TransparentPostLight</shaderType>
66+
</graphicData>
67+
<projectile>
68+
<damageDef>Burn</damageDef>
69+
<damageAmountBase>12</damageAmountBase>
70+
<speed>90</speed>
71+
<flyOverhead>false</flyOverhead>
72+
<explosionRadius>3.5</explosionRadius>
73+
<soundExplode>MortarIncendiary_Explode</soundExplode>
74+
<soundHitThickRoof>ArtilleryHitThickRoof</soundHitThickRoof>
75+
<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
76+
<soundAmbient>MortarRound_Ambient</soundAmbient>
77+
</projectile>
78+
</ThingDef>
79+
80+
<!-- ==================== Recipes ========================== -->
81+
82+
</Defs>

0 commit comments

Comments
 (0)