diff --git a/Assemblies/CombatRealism.dll b/Assemblies/CombatRealism.dll index 3dbc759..d86e911 100644 Binary files a/Assemblies/CombatRealism.dll and b/Assemblies/CombatRealism.dll differ diff --git a/Defs/ModHelperDefs/ModHelper.xml b/Defs/ModHelperDefs/ModHelper.xml index cde9c0c..d62826a 100644 --- a/Defs/ModHelperDefs/ModHelper.xml +++ b/Defs/ModHelperDefs/ModHelper.xml @@ -1,123 +1,165 @@ - - CombatRealism - CombatRealism - 0.13.0 + + CombatRealism + CombatRealism + 0.13.0
  • Combat_Realism.Detours.DetourInjector
    • -
  • Combat_Realism.ITabInjector
    • -
  • Combat_Realism.AmmoInjector
    • +
  • Combat_Realism.ITabInjector
    • +
  • Combat_Realism.AmmoInjector
    •  - -
  • - - CommunityCoreLibrary.CompPawnGizmo - - -
  • Human
    • - - -
  • - - Combat_Realism.CompSuppressable - - -
  • Human
    • - - -
  • - - Combat_Realism.CompInventory - - -
  • Human
    • -
  • Mechanoid_Centipede
    • -
  • Mechanoid_Scyther
    • - - -
  • - - CommunityCoreLibrary.CompShearableRenameable - Chemical fullness - 5 - 5 - FSX - - -
  • Boomalope
    • - - -     - -
  • - Orbital_Misc_PirateMerchant - -
  • - CR_Ammo - - 500 - 1000 - - + +
  • + + CommunityCoreLibrary.CompPawnGizmo + + +
  • Human
    • + + +
  • + + Combat_Realism.CompSuppressable + + +
  • Human
    • + + +
  • + + Combat_Realism.CompInventory + + +
  • Human
    • +
  • Mechanoid_Centipede
    • +
  • Mechanoid_Scyther
    • + + +
  • + + CommunityCoreLibrary.CompShearableRenameable + Chemical fullness + 5 + 5 + FSX + + +
  • Boomalope
    • + + + + +
  • + Orbital_Misc_PirateMerchant + +
  • + CR_Ammo + + 500 + 1000 + + -1 4 - -
    • - - -
  • - Caravan_Outlander_PirateMerchant - -
  • - CR_Ammo - - 100 - 200 - - + +
    • + + +
  • + Caravan_Outlander_PirateMerchant + +
  • + CR_Ammo + + 100 + 200 + + -1 2 - -
    • - - -
  • - Orbital_Misc_CombatSupplier - -
  • - CR_Ammo - - 2000 - 5000 - - Cheap - + +
    • + + +
  • + Orbital_Misc_CombatSupplier + +
  • + CR_Ammo + + 2000 + 5000 + + Cheap + 3 9 - -
    • - - -
  • - Caravan_Outlander_CombatSupplier - -
  • - CR_Ammo - - 500 - 2000 - - Cheap - + +
    • + + +
  • + Caravan_Outlander_CombatSupplier + +
  • + CR_Ammo + + 500 + 2000 + + Cheap + 2 5 - -
    • - - -     -     + + + + +
  • + Caravan_Outlander_BulkGoods + +
  • + FSX + Normal + + -120 + 70 + +
    • +
  • + Prometheum + Normal + + -120 + 70 + +
    • + + +
  • + Orbital_Misc_BulkGoods + +
  • + FSX + Normal + + -300 + 300 + +
    • +
  • + Prometheum + Normal + + -300 + 300 + +
    • + + + +     diff --git a/Defs/ThingDefs/Weapons_Spotting.xml b/Defs/ThingDefs/Weapons_Spotting.xml index 609b40f..d98c469 100644 --- a/Defs/ThingDefs/Weapons_Spotting.xml +++ b/Defs/ThingDefs/Weapons_Spotting.xml @@ -16,7 +16,7 @@ - + Gun_BinocularsRadio A pair of binoculars and a portable radio. Useful to coordinate artillery strikes.\n\nUsing this on a target will mark it, removing the indirect fire penalty from any artillery pieces targeting it. Additionally, any directed fire will use the aiming accuracy and efficiency of the spotter, rather than the artillery operator to determine final accuracy. @@ -27,10 +27,15 @@ false InteractRifle + 10500 650 1.25 0.5 + + 100 + 4 +
  • Combat_Realism.Verb_MarkForArtilleryCR diff --git a/Defs/ThingDefs_Ammo/Projectiles_Advanced.xml b/Defs/ThingDefs_Ammo/Projectiles_Advanced.xml index 7e776cf..ae2fd4a 100644 --- a/Defs/ThingDefs_Ammo/Projectiles_Advanced.xml +++ b/Defs/ThingDefs_Ammo/Projectiles_Advanced.xml @@ -18,7 +18,6 @@ - Combat_Realism.ProjectileCR_Explosive Things/Projectile/InfernoCannonShot Graphic_Single @@ -31,6 +30,7 @@ Bullet_30x64mmFuel_Incendiary + Combat_Realism.ProjectileCR_Explosive Flame @@ -44,22 +44,24 @@ Bullet_30x64mmFuel_Thermobaric - Bomb + Thermobaric 100 - 2.0 + MortarBomb_Explode
  • - 20 - Flame + 50 + Thermobaric 2.0 MortarBomb_Explode + true
    • Bullet_30x64mmFuel_Foam + Combat_Realism.ProjectileCR_Explosive Extinguish @@ -67,6 +69,7 @@ 5.0 FilthFireFoam 1 + true @@ -75,7 +78,6 @@ Bullet_80x256mmFuel_Thermobaric - Combat_Realism.ProjectileCR_Explosive Things/Projectile/InfernoCannonShot Graphic_Single @@ -83,16 +85,17 @@ 180 - Bomb - 250 - 6.0 + Thermobaric + 200 + true
  • - 40 - Flame - 6.0 + 100 + Thermobaric + 4.0 MortarBomb_Explode + true
    • diff --git a/Defs/ThingDefs_Ammo/Projectiles_Rockets.xml b/Defs/ThingDefs_Ammo/Projectiles_Rockets.xml index 1286212..0bdd19d 100644 --- a/Defs/ThingDefs_Ammo/Projectiles_Rockets.xml +++ b/Defs/ThingDefs_Ammo/Projectiles_Rockets.xml @@ -4,7 +4,6 @@ - Combat_Realism.ProjectileCR_Explosive 60 @@ -40,17 +39,15 @@ Graphic_Single - 7.5 Thermobaric - 150 - true - MortarBomb_Explode + 200
  • - 150 + 100 Thermobaric - 2.5 + 4.0 + true MortarBomb_Explode
    • @@ -58,6 +55,7 @@ Bullet_RPG7Grenade_Frag + Combat_Realism.ProjectileCR_Explosive Things/Projectile/RPG/Frag diff --git a/Defs/ThingDefs_Buildings/Buildings_Exotic.xml b/Defs/ThingDefs_Buildings/Buildings_Exotic.xml index 4be4329..1cede3e 100644 --- a/Defs/ThingDefs_Buildings/Buildings_Exotic.xml +++ b/Defs/ThingDefs_Buildings/Buildings_Exotic.xml @@ -14,11 +14,11 @@
  • Bomb - 2 + 2.5
  • Thermobaric - 3 + 5
  • Bullet diff --git a/Source/CombatRealism/Combat_Realism/Comps/CompExplosiveCR.cs b/Source/CombatRealism/Combat_Realism/Comps/CompExplosiveCR.cs index caa2236..c625479 100644 --- a/Source/CombatRealism/Combat_Realism/Comps/CompExplosiveCR.cs +++ b/Source/CombatRealism/Combat_Realism/Comps/CompExplosiveCR.cs @@ -40,7 +40,7 @@ public virtual void Explode(Thing instigator) this.parent.def, Props.postExplosionSpawnThingDef, Props.explosionSpawnChance, - Props.damageAdjacentCells, + Props.damageAdjacentTiles, Props.preExplosionSpawnThingDef, Props.explosionSpawnChance); diff --git a/Source/CombatRealism/Combat_Realism/Comps/CompProperties_ExplosiveCR.cs b/Source/CombatRealism/Combat_Realism/Comps/CompProperties_ExplosiveCR.cs index 3bb7ff5..a87303e 100644 --- a/Source/CombatRealism/Combat_Realism/Comps/CompProperties_ExplosiveCR.cs +++ b/Source/CombatRealism/Combat_Realism/Comps/CompProperties_ExplosiveCR.cs @@ -19,7 +19,7 @@ public class CompProperties_ExplosiveCR : CompProperties public SoundDef soundExplode; public List fragments = new List(); public float fragRange = 0f; - public bool damageAdjacentCells = false; + public bool damageAdjacentTiles = false; public CompProperties_ExplosiveCR() { diff --git a/Source/CombatRealism/Combat_Realism/Things/AmmoThing.cs b/Source/CombatRealism/Combat_Realism/Things/AmmoThing.cs index f71bc34..f7819c2 100644 --- a/Source/CombatRealism/Combat_Realism/Things/AmmoThing.cs +++ b/Source/CombatRealism/Combat_Realism/Things/AmmoThing.cs @@ -44,12 +44,12 @@ public override string GetDescription() stringBuilder.AppendLine("CR_DescExplosionRadius".Translate() + ": " + GenText.ToStringByStyle(props.explosionRadius, ToStringStyle.FloatOne)); // Secondary explosion - CompProperties_ExplosiveCR secExpProps = ammoDef.GetCompProperties(); + CompProperties_ExplosiveCR secExpProps = ammoDef.linkedProjectile.GetCompProperties(); if (secExpProps != null) { if (secExpProps.explosionRadius > 0) { - stringBuilder.AppendLine("CR_DescSecondaryExplosion".Translate()); + stringBuilder.AppendLine("CR_DescSecondaryExplosion".Translate() + ":"); stringBuilder.AppendLine(" " + "CR_DescExplosionRadius".Translate() + ": " + GenText.ToStringByStyle(secExpProps.explosionRadius, ToStringStyle.FloatOne)); stringBuilder.AppendLine(" " + "CR_DescDamage".Translate() + ": " + GenText.ToStringByStyle(secExpProps.explosionDamage, ToStringStyle.Integer) + " (" + secExpProps.explosionDamageDef.LabelCap + ")");