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

Commit 7768f94

Browse files
N7HuntsmanN7Huntsman
authored
Merge pull request #1173 from CombatExtendedRWMod/zhrocks11Dev
Zhrocks11 dev merge
2 parents 305fc34 + b311977 commit 7768f94

File tree

640 files changed

+85028
-6552
lines changed

Some content is hidden

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

640 files changed

+85028
-6552
lines changed

‎About/About.xml‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,26 @@
22
<ModMetaData>
33
<name>Combat Extended</name>
44
<author>CE Team</author>
5+
<url>https://ludeon.com/forums/index.php?topic=33461.0</url>
56
<supportedVersions>
67
<li>1.0</li>
8+
<li>1.1</li>
79
</supportedVersions>
8-
<url>https://ludeon.com/forums/index.php?topic=33461.0</url>
9-
<description>Version: 1.0.2.0\n\nExtends combat mechanics to make them deeper and more tactical.</description>
10+
<packageId>CETeam.CombatExtended</packageId>
11+
<description>Version: 1.1.2.0\n\nExtends combat mechanics to make them deeper and more tactical.</description>
12+
<modDependencies>
13+
<li>
14+
<packageId>brrainz.harmony</packageId>
15+
<displayName>Harmony</displayName>
16+
<steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
17+
<downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
18+
</li>
19+
</modDependencies>
20+
<incompatibleWith>
21+
<li>Flyfire2002.FieldMedic</li>
22+
<li>hobtook.mortaraccuracy</li>
23+
</incompatibleWith>
24+
<loadAfter>
25+
<li>brrainz.harmony</li>
26+
</loadAfter>
1027
</ModMetaData>

‎About/Manifest.xml‎

Lines changed: 4 additions & 3 deletions
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.2.0</version>
4+
<version>1.1.2.0</version>
55
<dependencies>
66
</dependencies>
77
<incompatibleWith>
@@ -13,8 +13,9 @@
1313
</loadAfter>
1414
<suggests>
1515
<li>CombatExtendedGuns</li> <!-- CE Guns -->
16+
<li>CombatExtendedMelee</li> <!-- CE Melee -->
1617
</suggests>
1718
<showCrossPromotions>true</showCrossPromotions>
18-
<manifestUri>https://raw.githubusercontent.com/NoImageAvailable/CombatExtended/master/About/Manifest.xml</manifestUri>
19-
<downloadUri>https://github.com/NoImageAvailable/CombatExtended/releases/latest</downloadUri>
19+
<manifestUri>https://raw.githubusercontent.com/CombatExtendedRWMod/CombatExtended/master/About/Manifest.xml</manifestUri>
20+
<downloadUri>https://github.com/CombatExtendedRWMod/CombatExtended/releases/latest</downloadUri>
2021
</Manifest>

‎About/ModSync.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<ModSyncNinjaData>
33
<ID>32418f60-269c-4a70-ae6e-a51d7a34cb2f</ID>
44
<ModName>Combat Extended</ModName>
5-
<Version>1.0.2.0</Version>
5+
<Version>1.1.2.0</Version>
66
<SaveBreaking>False</SaveBreaking>
77
<Host name="Github">
8-
<Owner>NoImageAvailable</Owner>
8+
<Owner>CombatExtendedRWMod</Owner>
99
<Project>CombatExtended</Project>
1010
<AboutDir>About</AboutDir>
1111
<DownloadFrom>ModSyncReleases</DownloadFrom>

‎Assemblies/0Harmony.dll‎

598 KB
Binary file not shown.

‎Assemblies/0Harmony.xml‎

Lines changed: 2476 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assemblies/CombatExtended.dll‎

62 KB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282

8383
<ThingDef Class="CombatExtended.AmmoDef" Name="Base30x64mmFuelBullet" ParentName="BaseBullet" Abstract="true">
8484
<graphicData>
85-
<texPath>Things/Projectile/InfernoCannonShot</texPath>
85+
<texPath>Things/Projectile/LauncherShot</texPath>
8686
<graphicClass>Graphic_Single</graphicClass>
8787
<shaderType>TransparentPostLight</shaderType>
8888
</graphicData>

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,7 @@
4343
<MarketValue>14</MarketValue>
4444
</statBases>
4545
<ammoClass>RadiationIonising</ammoClass>
46-
<comps>
47-
<li Class="CombatExtended.CompProperties_ExplosiveCE">
48-
<explosionDamage>33</explosionDamage>
49-
<explosionDamageDef>Burn</explosionDamageDef>
50-
<explosionRadius>7.5</explosionRadius>
51-
<soundExplode>MortarIncendiary_Explode</soundExplode>
52-
</li>
53-
</comps>
46+
<detonateProjectile>Bullet_60x225mmGamma_Standard</detonateProjectile>
5447
</ThingDef>
5548

5649
<!-- ================== Projectiles ================== -->
@@ -60,7 +53,7 @@
6053
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
6154
<label>radiation cannon shell</label>
6255
<graphicData>
63-
<texPath>Things/Projectile/InfernoCannonShot</texPath>
56+
<texPath>Things/Projectile/LauncherShot</texPath>
6457
<graphicClass>Graphic_Single</graphicClass>
6558
<shaderType>TransparentPostLight</shaderType>
6659
</graphicData>

‎Defs/Ammo/Advanced/70mmMechanoidGrenade.xml‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,7 @@
4545
<MarketValue>36.68</MarketValue>
4646
</statBases>
4747
<ammoClass>GrenadeHE</ammoClass>
48-
<comps>
49-
<li Class="CombatExtended.CompProperties_ExplosiveCE">
50-
<explosionDamage>132</explosionDamage>
51-
<explosionDamageDef>Bomb</explosionDamageDef>
52-
<explosionRadius>2.5</explosionRadius>
53-
<fragments>
54-
<Fragment_Large>3</Fragment_Large>
55-
<Fragment_Small>76</Fragment_Small>
56-
</fragments>
57-
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
58-
</li>
59-
</comps>
48+
<detonateProjectile>Bullet_70mmMechanoidGrenade_HE</detonateProjectile>
6049
</ThingDef>
6150

6251
<ThingDef Class="CombatExtended.AmmoDef" ParentName="70mmMechanoidGrenadeBase">
@@ -72,9 +61,12 @@
7261
<ammoClass>GrenadeEMP</ammoClass>
7362
<comps>
7463
<li Class="CombatExtended.CompProperties_ExplosiveCE">
75-
<explosionDamage>5</explosionDamage>
76-
<explosionDamageDef>Bomb</explosionDamageDef>
77-
<explosionRadius>2.5</explosionRadius>
64+
<damageAmountBase>5</damageAmountBase>
65+
<explosiveDamageType>Bomb</explosiveDamageType>
66+
<explosiveRadius>2.5</explosiveRadius>
67+
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
68+
</li>
69+
<li Class="CombatExtended.CompProperties_Fragments">
7870
<fragments>
7971
<Fragment_Large>1</Fragment_Large>
8072
</fragments>
@@ -106,7 +98,7 @@
10698
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
10799
</projectile>
108100
<comps>
109-
<li Class="CombatExtended.CompProperties_ExplosiveCE">
101+
<li Class="CombatExtended.CompProperties_Fragments">
110102
<fragments>
111103
<Fragment_Large>3</Fragment_Large>
112104
<Fragment_Small>76</Fragment_Small>

‎Defs/Ammo/Advanced/80x256mmFuelCell.xml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,18 @@
4646
<MarketValue>109.66</MarketValue>
4747
</statBases>
4848
<ammoClass>ThermobaricFuel</ammoClass>
49-
<comps>
50-
<li Class="CombatExtended.CompProperties_ExplosiveCE">
51-
<explosionDamageDef>Thermobaric</explosionDamageDef>
52-
<explosionDamage>383</explosionDamage>
53-
<explosionRadius>5.5</explosionRadius>
54-
<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
55-
<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
56-
<soundExplode>MortarIncendiary_Explode</soundExplode>
57-
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
58-
</li>
59-
</comps>
49+
<detonateProjectile>Bullet_80x256mmFuel_Thermobaric</detonateProjectile>
50+
<comps>
51+
<li Class="CompProperties_Explosive">
52+
<explosiveRadius>2</explosiveRadius>
53+
<explosiveDamageType>Thermobaric</explosiveDamageType>
54+
<explosiveExpandPerStackcount>0.15</explosiveExpandPerStackcount>
55+
<startWickHitPointsPercent>0.33</startWickHitPointsPercent>
56+
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
57+
<explodeOnKilled>True</explodeOnKilled>
58+
<wickTicks>60~300</wickTicks>
59+
</li>
60+
</comps>
6061
</ThingDef>
6162

6263
<!-- ================== Projectiles ================== -->
@@ -66,7 +67,7 @@
6667
<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
6768
<label>80x256mm fuel shell (Thermobaric)</label>
6869
<graphicData>
69-
<texPath>Things/Projectile/InfernoCannonShot</texPath>
70+
<texPath>Things/Projectile/LauncherShot</texPath>
7071
<graphicClass>Graphic_Single</graphicClass>
7172
<shaderType>TransparentPostLight</shaderType>
7273
</graphicData>

0 commit comments

Comments
 (0)