Permalink
Browse files

Fix an issue with static turrets where they would get an excessive am…

…ount of health via upgrades

Fix math revolving around metal and hitpoints
Revert nuke shield to anti nuke defense
Remove restrictions on number of silos and antinukes built as well as supply requirements
Remove supply requirements from lobsters
Remove supply requirements from t3 units, instead limiting via the tech 3 facility. Up to 3 t3 units may be on the field at any given time.
Fix morph costs on static turrets
  • Loading branch information...
ForbodingAngel committed Nov 14, 2017
1 parent 21604c5 commit 1ade9211cb094ccf3822f44247bfaec5bac8de0e
Showing with 159 additions and 113 deletions.
  1. +7 −7 Gamedata/configs/damageTypes.lua
  2. +36 −0 Gamedata/explosions/flamethrowerrange1000.lua
  3. +36 −0 Gamedata/explosions/flamethrowerrange750.lua
  4. +3 −3 LuaRules/Configs/morph_defs.lua
  5. +0 −8 LuaUI/Widgets_Evo/unit_customrings.lua
  6. +9 −8 Units-Configs-Basedefs/basedefs/allterrain/eallterranarchid_basedef.lua
  7. +3 −2 Units-Configs-Basedefs/basedefs/amphib/eamphibleveler_basedef.lua
  8. +1 −1 Units-Configs-Basedefs/basedefs/buildings/eheavyturret2_basedef.lua
  9. +1 −1 Units-Configs-Basedefs/basedefs/buildings/elightturret2_basedef.lua
  10. +1 −1 Units-Configs-Basedefs/basedefs/buildings/euwturret_basedef.lua
  11. +10 −9 Units-Configs-Basedefs/basedefs/hover/elacerator_basedef.lua
  12. +3 −2 Units/eallterrain/eallterranarchid.lua
  13. +3 −2 Units/eallterrain/upgraded1/eallterranarchid_up1.lua
  14. +3 −2 Units/eallterrain/upgraded1/upgraded2/eallterranarchid_up2.lua
  15. +3 −2 Units/eallterrain/upgraded1/upgraded2/upgraded3/eallterranarchid_up3.lua
  16. +3 −2 Units/eamphib/eamphibleveler.lua
  17. +3 −2 Units/eamphib/upgrade1/eamphibleveler_up1.lua
  18. +3 −2 Units/eamphib/upgrade1/upgrade2/eamphibleveler_up2.lua
  19. +3 −2 Units/eamphib/upgrade1/upgrade2/upgrade3/eamphibleveler_up3.lua
  20. +0 −2 Units/ebuilding/Upgrade 1/Upgrade 2/Upgrade 3/eheavyturret2_up3.lua
  21. +0 −2 Units/ebuilding/Upgrade 1/Upgrade 2/Upgrade 3/elightturret2_up3.lua
  22. +0 −2 Units/ebuilding/Upgrade 1/Upgrade 2/Upgrade 3/euwturret_up3.lua
  23. +0 −2 Units/ebuilding/Upgrade 1/Upgrade 2/eheavyturret2_up2.lua
  24. +0 −2 Units/ebuilding/Upgrade 1/Upgrade 2/elightturret2_up2.lua
  25. +0 −2 Units/ebuilding/Upgrade 1/Upgrade 2/euwturret_up2.lua
  26. +0 −2 Units/ebuilding/Upgrade 1/eheavyturret2_up1.lua
  27. +0 −2 Units/ebuilding/Upgrade 1/elightturret2_up1.lua
  28. +0 −2 Units/ebuilding/Upgrade 1/euwturret_up1.lua
  29. +1 −1 Units/ebuilding/eartyturret.lua
  30. +0 −2 Units/ebuilding/eheavyturret2.lua
  31. +0 −2 Units/ebuilding/elightturret2.lua
  32. +14 −24 Units/ebuilding/eshieldgen.lua
  33. +1 −1 Units/ebuilding/etech3.lua
  34. +0 −1 Units/ebuilding/euwturret.lua
  35. +3 −2 Units/ehover/elacerator.lua
  36. +3 −2 Units/ehover/upgrade1/elacerator_up1.lua
  37. +3 −2 Units/ehover/upgrade1/upgrade2/elacerator_up2.lua
  38. +3 −2 Units/ehover/upgrade1/upgrade2/upgrade3/elacerator_up3.lua
@@ -102,8 +102,8 @@ local damageClasses = {
BUILDING = 0.25,
},
elacerator = {
ARMORED = 0.33,
LIGHT = 0.33,
ARMORED = 1,
LIGHT = 1,
BUILDING = 1,
},
-- End Hovers
@@ -145,13 +145,13 @@ local damageClasses = {
BUILDING = 1,
},
eallterranarchid = {
ARMORED = 0.25,
LIGHT = 0.25,
ARMORED = 1,
LIGHT = 1,
BUILDING = 1,
},
eallterranarchidflame = {
ARMORED = 0.5,
LIGHT = 0.5,
ARMORED = 1,
LIGHT = 1,
BUILDING = 1,
},
-- End All Terrains
@@ -200,7 +200,7 @@ local damageClasses = {
eamphibleveler = {
ARMORED = 1,
LIGHT = 1,
BUILDING = 0.5,
BUILDING = 1,
},
-- End Amphibs
@@ -0,0 +1,36 @@
-- flamethrowerrange1000
return {
["flamethrowerrange1000"] = {
searingflame2 = {
air = true,
class = [[CSimpleParticleSystem]],
count = 1,
ground = true,
water = true,
properties = {
airdrag = 1,
colormap = [[0.01 0.01 0.01 0.005 0.04 0.04 0.1 0.005 0.08 0.03 0.01 0.005 0 0 0 0.05 0 0 0 0.01]],
directional = true,
emitrot = 3,
emitrotspread = 5,
emitvector = [[dir]],
gravity = [[0, 0.05, 0]],
numparticles = 30,
particlelife = 120,
particlelifespread = 5,
particlesize = [[2 r3]],
particlesizespread = 0,
particlespeed = 8,
particlespeedspread = 3,
pos = [[0, 0, 0]],
sizegrowth = 0.5,
sizemod = 1,
texture = [[flame]],
useairlos = true,
},
},
},
}
@@ -0,0 +1,36 @@
-- flamethrowerrange750
return {
["flamethrowerrange750"] = {
searingflame2 = {
air = true,
class = [[CSimpleParticleSystem]],
count = 1,
ground = true,
water = true,
properties = {
airdrag = 1,
colormap = [[0.01 0.01 0.01 0.005 0.04 0.04 0.1 0.005 0.08 0.03 0.01 0.005 0 0 0 0.05 0 0 0 0.01]],
directional = true,
emitrot = 3,
emitrotspread = 5,
emitvector = [[dir]],
gravity = [[0, 0.05, 0]],
numparticles = 15,
particlelife = 90,
particlelifespread = 5,
particlesize = [[2 r3]],
particlesizespread = 0,
particlespeed = 8,
particlespeedspread = 3,
pos = [[0, 0, 0]],
sizegrowth = 0.5,
sizemod = 1,
texture = [[flame]],
useairlos = true,
},
},
},
}
@@ -50,13 +50,13 @@ local timeToBuild_etech2 = metalCost_etech2 * 0.25
local metalCost_etech3 = 2000
local timeToBuild_etech3 = metalCost_etech3 * 0.25
local metalCost_elightturret2 = 200
local metalCost_elightturret2 = 75
local timeToBuild_elightturret2 = metalCost_elightturret2 * 0.25
local metalCost_eheavyturret2 = 320
local metalCost_eheavyturret2 = 125
local timeToBuild_eheavyturret2 = metalCost_eheavyturret2 * 0.25
local metalCost_euwturret = 80
local metalCost_euwturret = 50
local timeToBuild_euwturret = metalCost_euwturret * 0.25
local metalCost_emetalextractor_up1 = 600
@@ -82,14 +82,6 @@ local ringsDefs = {
{ color = {0,1,0,0.6}, lineWidth = 10, radius = 1000 },
},
-- Shield Units
[UnitDefNames.eshieldgen.id] = {
{ color = {0, 0, 1, 0.5}, lineWidth = 5, radius = 2000 },
{ color = {1, 0, 0, 0.5}, lineWidth = 2, radius = 1500 },
},
[UnitDefNames.eantinukeai.id] = {
{ color = {0, 0, 1, 0.5}, lineWidth = 5, radius = 2000 },
{ color = {1, 0, 0, 0.5}, lineWidth = 2, radius = 1500 },
},
[UnitDefNames.ekmar.id] = {
{ color = {0, 0, 1, 0.5}, lineWidth = 5, radius = 200 },
},
@@ -3,7 +3,7 @@ unitDef = {
acceleration = 0.18,
brakeRate = 1,
buildCostEnergy = 0,
buildCostMetal = 1250,
buildCostMetal = 1750,
builder = false,
buildTime = 5,
buildpic = "eallterranarchid.png",
@@ -28,7 +28,7 @@ unitDef = {
-- End Cloaking
description = [[Endbringer Class Base Obliteration Strider • Uses +]] .. supply .. [[ Supply]],
description = [[Endbringer Class Obliteration Strider]],
energyMake = 0,
energyStorage = 0,
energyUse = 0,
@@ -76,7 +76,7 @@ unitDef = {
explosiongenerators = {
"custom:gdhcannon",
"custom:dirtsmall",
"custom:flamethrowerrange500",
"custom:flamethrowerrange750",
"custom:blacksmoke",
},
},
@@ -104,9 +104,10 @@ unitDef = {
unittype = "mobile",
isupgraded = isUpgraded,
death_sounds = "nuke",
ProvideTech = techprovided,
RequireTech = tech,
armortype = armortype,
supply_cost = supply,
--supply_cost = supply,
normaltex = "unittextures/lego2skin_explorernormal.dds",
buckettex = "unittextures/lego2skin_explorerbucket.dds",
factionname = "outer_colonies",
@@ -154,14 +155,14 @@ weaponDefs = {
damagetype = "eallterranarchid",
},
damage = {
default = 300,
default = 440,
},
},
flamethrower = {
accuracy = 0,
AreaOfEffect = 1,
AreaOfEffect = 10,
avoidFeature = false,
avoidFriendly = false,
collideFeature = false,
@@ -178,7 +179,7 @@ weaponDefs = {
minintensity = 1,
impulseFactor = 0,
name = "Something with Flames",
range = 500,
range = 750,
reloadtime = 0.1,
WeaponType = [[LaserCannon]],
rgbColor = "0 0 0",
@@ -192,7 +193,7 @@ weaponDefs = {
damagetype = "eallterranarchidflame",
},
damage = {
default = 25,
default = 6,
},
},
}
@@ -12,7 +12,7 @@ unitDef = {
canPatrol = true,
canstop = "1",
category = "ARMORED AMPHIB SKIRMISHER",
description = [[Endbringer Class Mobile Target Evaporator • Uses +]] .. supply .. [[ Supply]],
description = [[Endbringer Class Mobile Target Evaporator]],
energyMake = 0,
energyStorage = 0,
energyUse = 0,
@@ -81,9 +81,10 @@ unitDef = {
isupgraded = isUpgraded,
unittype = "mobile",
death_sounds = "nuke",
ProvideTech = techprovided,
RequireTech = tech,
armortype = armortype,
supply_cost = supply,
--supply_cost = supply,
normaltex = "unittextures/lego2skin_explorernormal.dds",
buckettex = "unittextures/lego2skin_explorerbucket.dds",
factionname = "outer_colonies",
@@ -1,7 +1,7 @@
unitDef = {
buildAngle = 8192,
buildCostEnergy = 0,
buildCostMetal = buildCostMetal,
buildCostMetal = 160,
builder = false,
buildTime = 5,
buildpic = "eheavyturret2.png",
@@ -1,7 +1,7 @@
unitDef = {
buildAngle = 2048,
buildCostEnergy = 0,
buildCostMetal = buildCostMetal,
buildCostMetal = 100,
builder = false,
buildTime = 5,
buildpic = "elightturret2.png",
@@ -2,7 +2,7 @@ unitDef = {
buildAngle = 2048,
buildCostEnergy = 0,
buildCostMetal = buildCostMetal,
buildCostMetal = 40,
builder = false,
buildTime = 5,
buildpic = "euwturret.png",
@@ -2,7 +2,7 @@ unitDef = {
acceleration = 0.18,
brakeRate = 0.2,
buildCostEnergy = 0,
buildCostMetal = 1500,
buildCostMetal = 1750,
builder = false,
buildTime = 5,
buildpic = "elacerator.png",
@@ -14,7 +14,7 @@ unitDef = {
canPatrol = true,
canstop = "1",
category = "ARMORED NOTAIR SUPPORT",
description = [[Endbringer Class Low Yield Nuclear Artillery • Uses +]] .. supply .. [[ Supply]],
description = [[Endbringer Class Nuclear Battle Tank]],
energyMake = 0,
energyStorage = 0,
energyUse = 0,
@@ -41,7 +41,7 @@ unitDef = {
repairable = false,
selfDestructAs = "BIG_UNIT",
side = "CORE",
sightDistance = 1500,
sightDistance = 1200,
smoothAnim = true,
stealth = true,
seismicSignature = 4,
@@ -80,9 +80,10 @@ unitDef = {
isupgraded = isUpgraded,
unittype = "mobile",
death_sounds = "nuke",
ProvideTech = techprovided,
RequireTech = tech,
armortype = armortype,
supply_cost = supply,
--supply_cost = supply,
normaltex = "unittextures/lego2skin_explorernormal.dds",
buckettex = "unittextures/lego2skin_explorerbucket.dds",
factionname = "outer_colonies",
@@ -93,7 +94,7 @@ unitDef = {
weaponDefs = {
nukeartyweapon = {
accuracy = 500,
AreaOfEffect = 500,
AreaOfEffect = 250,
avoidFriendly = false,
avoidFeature = false,
collideFriendly = false,
@@ -107,11 +108,11 @@ weaponDefs = {
impulseFactor = 0,
interceptedByShieldType = 4,
name = "Light Cannon",
range = 1500,
reloadtime = 5,
range = 1200,
reloadtime = 1,
size = 16,
weaponType = "Cannon",
soundHit = "explosions/nukeartyhit.wav",
soundHit = "explosions/42024_digifishmusic_Missile_Strike.wav",
soundStart = "weapons/nukeartyshot.wav",
tolerance = 2000,
@@ -122,7 +123,7 @@ weaponDefs = {
damagetype = "elacerator",
},
damage = {
default = 1000,
default = 280,
},
},
}
@@ -12,9 +12,10 @@ humanName = [[Anarchid]]
objectName = "eallterranarchid.s3o"
script = "eallterranarchid.cob"
tech = [[tech3]]
techprovided = [[-1 endbringer]]
tech = [[tech3, 1 endbringer]]
armortype = [[armored]]
supply = [[35]]
--supply = [[35]]
VFS.Include("Units-Configs-Basedefs/basedefs/allterrain/eallterranarchid_basedef.lua")
@@ -12,9 +12,10 @@ humanName = [[Anarchid Mark II]]
objectName = "eallterranarchid.s3o"
script = "eallterranarchid.cob"
tech = [[tech3]]
techprovided = [[-1 endbringer]]
tech = [[tech3, 1 endbringer]]
armortype = [[armored]]
supply = [[35]]
--supply = [[35]]
VFS.Include("Units-Configs-Basedefs/basedefs/allterrain/eallterranarchid_basedef.lua")
@@ -12,9 +12,10 @@ humanName = [[Anarchid Mark III]]
objectName = "eallterranarchid.s3o"
script = "eallterranarchid.cob"
tech = [[tech3]]
techprovided = [[-1 endbringer]]
tech = [[tech3, 1 endbringer]]
armortype = [[armored]]
supply = [[35]]
---supply = [[35]]
VFS.Include("Units-Configs-Basedefs/basedefs/allterrain/eallterranarchid_basedef.lua")
@@ -12,9 +12,10 @@ humanName = [[Anarchid Mark IV]]
objectName = "eallterranarchid.s3o"
script = "eallterranarchid.cob"
tech = [[tech3]]
techprovided = [[-1 endbringer]]
tech = [[tech3, 1 endbringer]]
armortype = [[armored]]
supply = [[35]]
--supply = [[35]]
VFS.Include("Units-Configs-Basedefs/basedefs/allterrain/eallterranarchid_basedef.lua")
Oops, something went wrong.

0 comments on commit 1ade921

Please sign in to comment.