From 6996b25d9586434d3375b3756689eaecccf8cf90 Mon Sep 17 00:00:00 2001 From: GoogleFrog Date: Sun, 11 Jan 2015 21:07:16 +1100 Subject: [PATCH] Empirical DPS for the damage precision change. --- gamedata/modularcomms/weapons/lparticlebeam.lua | 2 +- gamedata/modularcomms/weapons/peashooter.lua | 4 ++-- scripts/shieldfelon.lua | 2 +- units/amphassault.lua | 2 +- units/armaak.lua | 8 ++++---- units/armcom1.lua | 2 +- units/armflea.lua | 4 ++-- units/armjeth.lua | 4 ++-- units/armkam.lua | 2 +- units/armpw.lua | 3 +-- units/coracv.lua | 4 ++-- units/corak.lua | 3 +-- units/corcrw.lua | 2 +- units/corhlt.lua | 4 ++-- units/corllt.lua | 2 +- units/corrl.lua | 2 +- units/corvamp.lua | 6 +++--- units/fighter.lua | 2 +- units/hoverriot.lua | 2 +- units/shieldfelon.lua | 2 +- 20 files changed, 30 insertions(+), 32 deletions(-) diff --git a/gamedata/modularcomms/weapons/lparticlebeam.lua b/gamedata/modularcomms/weapons/lparticlebeam.lua index edd1a36701..aa9cc261ab 100644 --- a/gamedata/modularcomms/weapons/lparticlebeam.lua +++ b/gamedata/modularcomms/weapons/lparticlebeam.lua @@ -13,7 +13,7 @@ local weaponDef = { }, damage = { - default = 40, + default = 39, subs = 2.05, }, diff --git a/gamedata/modularcomms/weapons/peashooter.lua b/gamedata/modularcomms/weapons/peashooter.lua index 0f825585fa..233dd35fac 100644 --- a/gamedata/modularcomms/weapons/peashooter.lua +++ b/gamedata/modularcomms/weapons/peashooter.lua @@ -13,8 +13,8 @@ local weaponDef = { }, damage = { - default = 10.76, - planes = 10.76, + default = 10.5, + planes = 10.5, subs = 0.55, }, diff --git a/scripts/shieldfelon.lua b/scripts/shieldfelon.lua index 420db23b1c..440ed1fc30 100644 --- a/scripts/shieldfelon.lua +++ b/scripts/shieldfelon.lua @@ -38,7 +38,7 @@ local gun_1 = 0 -------------------------------------------------------------------------------- -- constants -------------------------------------------------------------------------------- -local DRAIN = tonumber (WeaponDefs[UnitDef.weapons[1].weaponDef].customParams.shield_drain) +local DRAIN = 0--tonumber (WeaponDefs[UnitDef.weapons[1].weaponDef].customParams.shield_drain) local SHIELD_RADIUS = 100 local SPEED = UnitDef.speed / 30 local AIM_DELAY = 300 diff --git a/units/amphassault.lua b/units/amphassault.lua index db6d723c41..a757378546 100644 --- a/units/amphassault.lua +++ b/units/amphassault.lua @@ -97,7 +97,7 @@ unitDef = { }, damage = { - default = 300, + default = 300.1, subs = 15, }, diff --git a/units/armaak.lua b/units/armaak.lua index df77f4d678..d274a0e345 100644 --- a/units/armaak.lua +++ b/units/armaak.lua @@ -101,8 +101,8 @@ unitDef = { }, damage = { - default = 0.8, - planes = 8, + default = 0.78, + planes = 7.8, subs = 0.5, }, @@ -151,8 +151,8 @@ unitDef = { }, damage = { - default = 1.67, - planes = 16.7, + default = 1.636, + planes = 16.36, subs = 0.94, }, diff --git a/units/armcom1.lua b/units/armcom1.lua index b2c28beada..e69252d834 100644 --- a/units/armcom1.lua +++ b/units/armcom1.lua @@ -172,7 +172,7 @@ unitDef = { craterMult = 0, damage = { - default = 15.5, + default = 15.06, subs = 0.8, }, diff --git a/units/armflea.lua b/units/armflea.lua index 2729a45f1f..9370f848d5 100644 --- a/units/armflea.lua +++ b/units/armflea.lua @@ -89,8 +89,8 @@ unitDef = { craterMult = 0, damage = { - default = 10.87, - planes = 10.87, + default = 10.57, + planes = 10.57, subs = 0.5, }, diff --git a/units/armjeth.lua b/units/armjeth.lua index 1e7e257ef1..85c6a1f9c4 100644 --- a/units/armjeth.lua +++ b/units/armjeth.lua @@ -108,8 +108,8 @@ unitDef = { }, damage = { - default = 1.87, - planes = 18.73, + default = 1.84, + planes = 18.4, subs = 1, }, diff --git a/units/armkam.lua b/units/armkam.lua index 4b0d70d619..440a02b908 100644 --- a/units/armkam.lua +++ b/units/armkam.lua @@ -91,7 +91,7 @@ unitDef = { --cylinderTargeting = 1, damage = { - default = 6.83, + default = 6.83, -- 6.15 subs = 0.315, }, diff --git a/units/armpw.lua b/units/armpw.lua index 6e5935d87c..2a51925f99 100644 --- a/units/armpw.lua +++ b/units/armpw.lua @@ -99,8 +99,7 @@ unitDef = { craterMult = 0, damage = { - default = 12.16, - planes = 12.16, + default = 12, subs = 0.567, }, diff --git a/units/coracv.lua b/units/coracv.lua index 48e130751c..da8889f462 100644 --- a/units/coracv.lua +++ b/units/coracv.lua @@ -107,8 +107,8 @@ unitDef = { craterMult = 0, damage = { - default = 10.3, - planes = 10.3, + default = 10, + planes = 10, subs = 0.5, }, diff --git a/units/corak.lua b/units/corak.lua index eec87a74bd..0b331413cf 100644 --- a/units/corak.lua +++ b/units/corak.lua @@ -92,8 +92,7 @@ unitDef = { craterMult = 0, damage = { - default = 9.77, - planes = 9.77, + default = 9.53, subs = 0.61, }, diff --git a/units/corcrw.lua b/units/corcrw.lua index 8963e74458..0c4501d5ff 100644 --- a/units/corcrw.lua +++ b/units/corcrw.lua @@ -133,7 +133,7 @@ unitDef = { craterMult = 0, damage = { - default = 38.75, + default = 37.8, subs = 1.8, }, diff --git a/units/corhlt.lua b/units/corhlt.lua index 50b0beced3..d158f38b9e 100644 --- a/units/corhlt.lua +++ b/units/corhlt.lua @@ -98,8 +98,8 @@ unitDef = { }, damage = { - default = 170, - planes = 170, + default = 170.1, + planes = 170.1, subs = 9, }, diff --git a/units/corllt.lua b/units/corllt.lua index 4d7d19d55e..a704b53700 100644 --- a/units/corllt.lua +++ b/units/corllt.lua @@ -92,7 +92,7 @@ unitDef = { craterMult = 0, damage = { - default = 7.35, + default = 7.15, subs = 0.5, }, diff --git a/units/corrl.lua b/units/corrl.lua index eedeb0d752..8bee9874d5 100644 --- a/units/corrl.lua +++ b/units/corrl.lua @@ -102,7 +102,7 @@ unitDef = { }, damage = { - default = 105, + default = 103.1, subs = 7.5, }, diff --git a/units/corvamp.lua b/units/corvamp.lua index 5df68b3b74..624e4797f9 100644 --- a/units/corvamp.lua +++ b/units/corvamp.lua @@ -106,9 +106,9 @@ unitDef = { }, damage = { - default = 0.98, - planes = 9.8, - subs = 0.98, + default = 0.96, + planes = 9.6, + subs = 0.96, }, explosionGenerator = [[custom:flash_teal7]], diff --git a/units/fighter.lua b/units/fighter.lua index bd1215500d..28a0e8a660 100644 --- a/units/fighter.lua +++ b/units/fighter.lua @@ -121,7 +121,7 @@ unitDef = { craterMult = 0, damage = { - default = 7.2, + default = 7.1, subs = 0.36, }, diff --git a/units/hoverriot.lua b/units/hoverriot.lua index 8baff1941a..42eda345f8 100644 --- a/units/hoverriot.lua +++ b/units/hoverriot.lua @@ -90,7 +90,7 @@ unitDef = { craterMult = 0, damage = { - default = 30.43, + default = 29.68, subs = 1.75, }, diff --git a/units/shieldfelon.lua b/units/shieldfelon.lua index 7268a679fd..bdf47aa9f6 100644 --- a/units/shieldfelon.lua +++ b/units/shieldfelon.lua @@ -78,7 +78,7 @@ unitDef = { name = [[Energy Shield]], damage = { - default = 10, + default = 9.79, }, exteriorShield = true,