Merge pull request #1173 from CombatExtendedRWMod/zhrocks11Dev

Zhrocks11 dev merge
CombatExtendedRWMod · Apr 1, 2020 · 7768f94 · 7768f94
2 parents 305fc34 + b311977
commit 7768f94
Show file tree

Hide file tree

Showing 640 changed files with 85,028 additions and 6,552 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -2,9 +2,26 @@
 <ModMetaData>
 	<name>Combat Extended</name>
 	<author>CE Team</author>
+	<url>https://ludeon.com/forums/index.php?topic=33461.0</url>
 	<supportedVersions>
 		<li>1.0</li>
+		<li>1.1</li>
 	</supportedVersions>
-	<url>https://ludeon.com/forums/index.php?topic=33461.0</url>
-	<description>Version: 1.0.2.0\n\nExtends combat mechanics to make them deeper and more tactical.</description>
+	<packageId>CETeam.CombatExtended</packageId>
+	<description>Version: 1.1.2.0\n\nExtends combat mechanics to make them deeper and more tactical.</description>
+	<modDependencies>
+	<li>
+        <packageId>brrainz.harmony</packageId>
+        <displayName>Harmony</displayName>
+        <steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
+        <downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
+    </li>
+  </modDependencies>
+  <incompatibleWith>
+    <li>Flyfire2002.FieldMedic</li>
+    <li>hobtook.mortaraccuracy</li>	
+  </incompatibleWith>	  
+  <loadAfter>
+	<li>brrainz.harmony</li>
+  </loadAfter>
 </ModMetaData>
diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
     <identifier>CombatExtended</identifier>
-    <version>1.0.2.0</version>
+    <version>1.1.2.0</version>
     <dependencies>
     </dependencies>
     <incompatibleWith>
@@ -13,8 +13,9 @@
     </loadAfter>
     <suggests>
         <li>CombatExtendedGuns</li> <!-- CE Guns -->
+        <li>CombatExtendedMelee</li> <!-- CE Melee -->
     </suggests>
     <showCrossPromotions>true</showCrossPromotions>
-    <manifestUri>https://raw.githubusercontent.com/NoImageAvailable/CombatExtended/master/About/Manifest.xml</manifestUri>
-    <downloadUri>https://github.com/NoImageAvailable/CombatExtended/releases/latest</downloadUri>
+    <manifestUri>https://raw.githubusercontent.com/CombatExtendedRWMod/CombatExtended/master/About/Manifest.xml</manifestUri>
+    <downloadUri>https://github.com/CombatExtendedRWMod/CombatExtended/releases/latest</downloadUri>
 </Manifest>
diff --git a/About/ModSync.xml b/About/ModSync.xml
@@ -2,10 +2,10 @@
 <ModSyncNinjaData>
   <ID>32418f60-269c-4a70-ae6e-a51d7a34cb2f</ID>
   <ModName>Combat Extended</ModName>
-  <Version>1.0.2.0</Version>
+  <Version>1.1.2.0</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
-    <Owner>NoImageAvailable</Owner>
+    <Owner>CombatExtendedRWMod</Owner>
     <Project>CombatExtended</Project>
     <AboutDir>About</AboutDir>
     <DownloadFrom>ModSyncReleases</DownloadFrom>

diff --git a/Assemblies/0Harmony.dll b/Assemblies/0Harmony.dll
diff --git a/Assemblies/0Harmony.xml b/Assemblies/0Harmony.xml
diff --git a/Assemblies/CombatExtended.dll b/Assemblies/CombatExtended.dll
diff --git a/Defs/Ammo/Advanced/30x64mmFuelCell.xml b/Defs/Ammo/Advanced/30x64mmFuelCell.xml
@@ -82,7 +82,7 @@
 
   <ThingDef Class="CombatExtended.AmmoDef" Name="Base30x64mmFuelBullet" ParentName="BaseBullet" Abstract="true">
     <graphicData>
-      <texPath>Things/Projectile/InfernoCannonShot</texPath>
+      <texPath>Things/Projectile/LauncherShot</texPath>
       <graphicClass>Graphic_Single</graphicClass>
       <shaderType>TransparentPostLight</shaderType>
     </graphicData>

diff --git a/Defs/Ammo/Advanced/60x225mmGammaShell.xml b/Defs/Ammo/Advanced/60x225mmGammaShell.xml
@@ -43,14 +43,7 @@
       <MarketValue>14</MarketValue>
     </statBases>
     <ammoClass>RadiationIonising</ammoClass>
-    <comps>
-      <li Class="CombatExtended.CompProperties_ExplosiveCE">
-        <explosionDamage>33</explosionDamage>
-        <explosionDamageDef>Burn</explosionDamageDef>
-        <explosionRadius>7.5</explosionRadius>
-        <soundExplode>MortarIncendiary_Explode</soundExplode>
-      </li>
-    </comps>
+	<detonateProjectile>Bullet_60x225mmGamma_Standard</detonateProjectile>
   </ThingDef>
 
 	<!-- ================== Projectiles ================== -->
@@ -60,7 +53,7 @@
     <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
     <label>radiation cannon shell</label>
     <graphicData>
-      <texPath>Things/Projectile/InfernoCannonShot</texPath>
+      <texPath>Things/Projectile/LauncherShot</texPath>
       <graphicClass>Graphic_Single</graphicClass>
       <shaderType>TransparentPostLight</shaderType>
     </graphicData>

diff --git a/Defs/Ammo/Advanced/70mmMechanoidGrenade.xml b/Defs/Ammo/Advanced/70mmMechanoidGrenade.xml
@@ -45,18 +45,7 @@
 		<MarketValue>36.68</MarketValue>
 		</statBases>		
 		<ammoClass>GrenadeHE</ammoClass>
-		<comps>
-			<li Class="CombatExtended.CompProperties_ExplosiveCE">
-				<explosionDamage>132</explosionDamage>
-				<explosionDamageDef>Bomb</explosionDamageDef>
-				<explosionRadius>2.5</explosionRadius>
-				<fragments>
-					<Fragment_Large>3</Fragment_Large>
-					<Fragment_Small>76</Fragment_Small>
-				</fragments>
-      	<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-			</li>
-		</comps>
+		<detonateProjectile>Bullet_70mmMechanoidGrenade_HE</detonateProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="70mmMechanoidGrenadeBase">
@@ -72,9 +61,12 @@
 		<ammoClass>GrenadeEMP</ammoClass>
 		<comps>
 			<li Class="CombatExtended.CompProperties_ExplosiveCE">
-				<explosionDamage>5</explosionDamage>
-				<explosionDamageDef>Bomb</explosionDamageDef>
-				<explosionRadius>2.5</explosionRadius>
+				<damageAmountBase>5</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+			<li Class="CombatExtended.CompProperties_Fragments">
 				<fragments>
 					<Fragment_Large>1</Fragment_Large>
 				</fragments>
@@ -106,7 +98,7 @@
       <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 		</projectile>
 		<comps>
-			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+			<li Class="CombatExtended.CompProperties_Fragments">
 				<fragments>
 					<Fragment_Large>3</Fragment_Large>
 					<Fragment_Small>76</Fragment_Small>

diff --git a/Defs/Ammo/Advanced/80x256mmFuelCell.xml b/Defs/Ammo/Advanced/80x256mmFuelCell.xml
@@ -46,17 +46,18 @@
       <MarketValue>109.66</MarketValue>
     </statBases>
     <ammoClass>ThermobaricFuel</ammoClass>
-    <comps>
-      <li Class="CombatExtended.CompProperties_ExplosiveCE">
-        <explosionDamageDef>Thermobaric</explosionDamageDef>
-        <explosionDamage>383</explosionDamage>
-        <explosionRadius>5.5</explosionRadius>
-        <preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-        <preExplosionSpawnChance>0.5</preExplosionSpawnChance>
-        <soundExplode>MortarIncendiary_Explode</soundExplode>
-        <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-      </li>
-    </comps>
+	<detonateProjectile>Bullet_80x256mmFuel_Thermobaric</detonateProjectile>
+	<comps>
+    <li Class="CompProperties_Explosive">
+        <explosiveRadius>2</explosiveRadius>
+        <explosiveDamageType>Thermobaric</explosiveDamageType>
+		<explosiveExpandPerStackcount>0.15</explosiveExpandPerStackcount>
+        <startWickHitPointsPercent>0.33</startWickHitPointsPercent>
+		<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		<explodeOnKilled>True</explodeOnKilled>
+        <wickTicks>60~300</wickTicks>
+    </li>
+	</comps>
   </ThingDef>
 
   <!-- ================== Projectiles ================== -->
@@ -66,7 +67,7 @@
     <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
     <label>80x256mm fuel shell (Thermobaric)</label>
     <graphicData>
-      <texPath>Things/Projectile/InfernoCannonShot</texPath>
+      <texPath>Things/Projectile/LauncherShot</texPath>
       <graphicClass>Graphic_Single</graphicClass>
       <shaderType>TransparentPostLight</shaderType>
     </graphicData>

diff --git a/Defs/Ammo/Advanced/PlasmaCellHeavy.xml b/Defs/Ammo/Advanced/PlasmaCellHeavy.xml
@@ -45,15 +45,17 @@
 		<ammoClass>Plasma</ammoClass>
 		<comps>
 			<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
-			<li Class="CombatExtended.CompProperties_ExplosiveCE">
-				<explosionDamage>80</explosionDamage>
-				<explosionDamageDef>Bomb</explosionDamageDef>
-				<explosionRadius>0.5</explosionRadius>
+			  <li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>80</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			  </li>
+			<li Class="CombatExtended.CompProperties_Fragments">
 				<fragments>
 					<Fragment_Large>2</Fragment_Large>
 					<Fragment_Small>10</Fragment_Small>
 				</fragments>
-				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 			</li>
 		</comps>
 	</ThingDef>

diff --git a/Defs/Ammo/Advanced/PlasmaCellPistol.xml b/Defs/Ammo/Advanced/PlasmaCellPistol.xml
@@ -44,15 +44,17 @@
 		<ammoClass>Plasma</ammoClass>
 		<comps>
 			<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
-			<li Class="CombatExtended.CompProperties_ExplosiveCE">
-				<explosionDamage>20</explosionDamage>
-				<explosionDamageDef>Bomb</explosionDamageDef>
-				<explosionRadius>0.5</explosionRadius>
+			  <li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			  </li>
+			<li Class="CombatExtended.CompProperties_Fragments">
 				<fragments>
 					<Fragment_Large>2</Fragment_Large>
 					<Fragment_Small>10</Fragment_Small>
 				</fragments>
-				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 			</li>
 		</comps>
 	</ThingDef>

diff --git a/Defs/Ammo/Advanced/PlasmaCellRifle.xml b/Defs/Ammo/Advanced/PlasmaCellRifle.xml
@@ -44,15 +44,17 @@
 		<ammoClass>Plasma</ammoClass>
 		<comps>
 			<!-- Arbitarily defined cookoff explosive stats; represents a plasma containment system failing -->
-			<li Class="CombatExtended.CompProperties_ExplosiveCE">
-				<explosionDamage>20</explosionDamage>
-				<explosionDamageDef>Bomb</explosionDamageDef>
-				<explosionRadius>0.5</explosionRadius>
+			  <li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>20</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>0.5</explosiveRadius>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			  </li>
+			<li Class="CombatExtended.CompProperties_Fragments">
 				<fragments>
 					<Fragment_Large>2</Fragment_Large>
 					<Fragment_Small>10</Fragment_Small>
 				</fragments>
-				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 			</li>
 		</comps>
 	</ThingDef>

diff --git a/Defs/Ammo/AmmoBases.xml b/Defs/Ammo/AmmoBases.xml
@@ -85,7 +85,7 @@
 	<!-- ==================== Recipes ========================== -->
 
   <RecipeDef Name="AmmoRecipeBase" Abstract="true">
-    <workSpeedStat>SmithingSpeed</workSpeedStat>
+    <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
     <effectWorking>Cook</effectWorking>
     <soundWorking>Recipe_Machining</soundWorking>
     <allowMixingIngredients>true</allowMixingIngredients>
@@ -104,7 +104,7 @@
   </RecipeDef>
 
   <RecipeDef Name="AmmoRecipeNeolithicBase" Abstract="true">
-    <workSpeedStat>SmithingSpeed</workSpeedStat>
+    <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
     <effectWorking>Cook</effectWorking>
     <soundWorking>Recipe_Machining</soundWorking>
     <allowMixingIngredients>true</allowMixingIngredients>

diff --git a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Grenades.xml b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Grenades.xml
@@ -21,5 +21,12 @@
     <description>Filled with incendiary agent. The agent is dispersed on impact, covering the area in flames.</description>
 	<advanced>true</advanced>
   </CombatExtended.AmmoCategoryDef>
-
-</Defs>
+
+   <CombatExtended.AmmoCategoryDef>
+    <defName>Smoke</defName>
+    <label>Smoke</label>
+    <description>Filled with a smoke-producing agent. Explodes on impact to generate a thick smokescreen.</description>
+	<advanced>true</advanced>
+  </CombatExtended.AmmoCategoryDef>	
+
+</Defs>
diff --git a/Defs/Ammo/Flamethrower.xml b/Defs/Ammo/Flamethrower.xml
@@ -51,13 +51,13 @@
     </statBases>
     <ammoClass>NapalmFuel</ammoClass>
     <comps>
-      <li Class="CombatExtended.CompProperties_ExplosiveCE">
-		<explosionDamage>2</explosionDamage>
-        <explosionDamageDef>Flame</explosionDamageDef>
-        <explosionRadius>1</explosionRadius>
-		<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
-		<preExplosionSpawnChance>1</preExplosionSpawnChance>
-      </li>
+		  <li Class="CombatExtended.CompProperties_ExplosiveCE">
+			<damageAmountBase>2</damageAmountBase>
+			<explosiveDamageType>Flame</explosiveDamageType>
+			<explosiveRadius>1</explosiveRadius>
+			<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+		  </li>
     </comps>
   </ThingDef>
 
@@ -73,13 +73,13 @@
     </statBases>
     <ammoClass>JelliedPrometheumFuel</ammoClass>
     <comps>
-      <li Class="CombatExtended.CompProperties_ExplosiveCE">
-		<explosionDamage>5</explosionDamage>
-        <explosionDamageDef>PrometheumFlame</explosionDamageDef>
-        <explosionRadius>1.2</explosionRadius>
+	  <li Class="CombatExtended.CompProperties_ExplosiveCE">
+		<damageAmountBase>5</damageAmountBase>
+		<explosiveDamageType>PrometheumFlame</explosiveDamageType>
+		<explosiveRadius>1.2</explosiveRadius>
 		<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
 		<preExplosionSpawnChance>1</preExplosionSpawnChance>
-      </li>
+	  </li>
     </comps>
   </ThingDef>