From 7c35691069b92c63a3ccc713dcf661069f7d3e5b Mon Sep 17 00:00:00 2001 From: NoImageAvailable Date: Thu, 28 Apr 2016 11:35:14 +0200 Subject: [PATCH] Rebalance Rebalanced thermobarics, added FSX and Prometheum to bulk goods trader, added binoculars recipe, fixed secondary explosion description --- Assemblies/CombatRealism.dll | Bin 154112 -> 154112 bytes Defs/ModHelperDefs/ModHelper.xml | 256 ++++++++++-------- Defs/ThingDefs/Weapons_Spotting.xml | 7 +- Defs/ThingDefs_Ammo/Projectiles_Advanced.xml | 27 +- Defs/ThingDefs_Ammo/Projectiles_Rockets.xml | 12 +- Defs/ThingDefs_Buildings/Buildings_Exotic.xml | 4 +- .../Combat_Realism/Comps/CompExplosiveCR.cs | 2 +- .../Comps/CompProperties_ExplosiveCR.cs | 2 +- .../Combat_Realism/Things/AmmoThing.cs | 4 +- 9 files changed, 181 insertions(+), 133 deletions(-) diff --git a/Assemblies/CombatRealism.dll b/Assemblies/CombatRealism.dll index 3dbc759230c393a7917d65c8b98f43a66db92943..d86e911035718c39ead0a74536f5f4d23c2c140a 100644 GIT binary patch delta 19033 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 delta 19012 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%0Ap6E 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 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 + ")");