From 161d91340811c5b648ff1b372404ed8e7cfa9796 Mon Sep 17 00:00:00 2001 From: Forboding Angel Date: Sun, 4 Apr 2021 19:25:27 -0700 Subject: [PATCH] Remove sell ability Update Sidedata Add energycost override customparam Increase cost of tech 1 facility so that it drains more energy than is default produced Increase costs of factories on ateran side Time early game so that ateran amphibs and zaal units will pop out at the same time if the player is going for a rush build remove the extra orbs granted to ateran players on game start --- Gamedata/alldefs_post.lua | 6 ++++++ Gamedata/sidedata.lua | 20 +++++++++---------- LuaRules/Gadgets/GreenBean_sell.locals.lua | 2 +- LuaRules/Gadgets/game_spawn.lua | 4 ++-- ModOptions.lua | 2 +- .../basedefs/air/eairplant_basedef.lua | 2 +- .../hbot/mobile/ehbotpeewee_basedef.lua | 8 ++++---- .../turret/ehbotpeewee_turret_basedef.lua | 6 +++--- Units/eair/eairplant.lua | 2 +- Units/eallterrain/eminifac.lua | 2 +- Units/eamphib/eamphibfac.lua | 2 +- Units/ebuilding/etech1.lua | 1 + Units/ehbot/mobile/ehbotfac.lua | 2 +- Units/ehover/ebasefactory.lua | 2 +- modinfo.lua | 3 ++- 15 files changed, 36 insertions(+), 28 deletions(-) diff --git a/Gamedata/alldefs_post.lua b/Gamedata/alldefs_post.lua index 233d9d86..0c81da88 100644 --- a/Gamedata/alldefs_post.lua +++ b/Gamedata/alldefs_post.lua @@ -546,6 +546,9 @@ function ModOptions_Post (UnitDefs, WeaponDefs) if unitDef.customparams and unitDef.customparams.noenergycost == true then unitDef.buildcostenergy = 0 end + if unitDef.customparams and unitDef.customparams.buildcostenergyoverride ~= nil then + unitDef.buildcostenergy = unitDef.customparams.buildcostenergyoverride + end end -- Set Rules for Zaal race @@ -564,6 +567,9 @@ function ModOptions_Post (UnitDefs, WeaponDefs) if unitDef.customparams and unitDef.customparams.noenergycost == true then unitDef.buildcostenergy = 0 end + if unitDef.customparams and unitDef.customparams.buildcostenergyoverride ~= nil then + unitDef.buildcostenergy = unitDef.customparams.buildcostenergyoverride + end end -- This is a catchall for units that don't have a factionname declared diff --git a/Gamedata/sidedata.lua b/Gamedata/sidedata.lua index d0ee2a22..5c8b4505 100644 --- a/Gamedata/sidedata.lua +++ b/Gamedata/sidedata.lua @@ -19,15 +19,15 @@ local sideData = { Rank = {1.00, 0.90, 0.50, 1}, }, }, - [3] = { - name = 'Pattern', - startunit = 'xcommander', - startunitai = 'xcommander', - uiSets = { - Main = {0.40, 0.20, 0.70, 1}, - Trim = {1.00, 0.80, 0.00, 1}, - Rank = {1.00, 0.90, 0.50, 1}, - }, - }, + -- [3] = { + -- name = 'Pattern', + -- startunit = 'xcommander', + -- startunitai = 'xcommander', + -- uiSets = { + -- Main = {0.40, 0.20, 0.70, 1}, + -- Trim = {1.00, 0.80, 0.00, 1}, + -- Rank = {1.00, 0.90, 0.50, 1}, + -- }, + -- }, } return sideData \ No newline at end of file diff --git a/LuaRules/Gadgets/GreenBean_sell.locals.lua b/LuaRules/Gadgets/GreenBean_sell.locals.lua index 4cfb5f55..377acdce 100644 --- a/LuaRules/Gadgets/GreenBean_sell.locals.lua +++ b/LuaRules/Gadgets/GreenBean_sell.locals.lua @@ -27,7 +27,7 @@ function gadget:GetInfo() date = "2008-06-12", license = "Public Domain", layer = 300, - enabled = true + enabled = false } end diff --git a/LuaRules/Gadgets/game_spawn.lua b/LuaRules/Gadgets/game_spawn.lua index 899b1885..117e8a09 100644 --- a/LuaRules/Gadgets/game_spawn.lua +++ b/LuaRules/Gadgets/game_spawn.lua @@ -162,8 +162,8 @@ local function SpawnStartUnit(teamID) local unitID = Spring.CreateUnit(startUnit, x, y, z, facing, teamID) -- Fun times if startUnit == "ecommander" then - id1=Spring.CreateUnit("eorb", x+100, y+200, z, facing, teamID) - id1=Spring.CreateUnit("eorb", x-100, y-200, z, facing, teamID) + --id1=Spring.CreateUnit("eorb", x+100, y+200, z, facing, teamID) + --id1=Spring.CreateUnit("eorb", x-100, y-200, z, facing, teamID) --Spring.GiveOrderToUnit(id1,CMD.GUARD,{unitID}, {"shift"}) end if startUnit == "zarm" then diff --git a/ModOptions.lua b/ModOptions.lua index 9ebaa6bb..bde0bbe7 100644 --- a/ModOptions.lua +++ b/ModOptions.lua @@ -273,7 +273,7 @@ local options= { desc = 'This acts as a percentage of base unit health. Setting to 200 would double unit hitpoints.', type = 'number', section= 'gameplayoptions', - def = 50, + def = 250, min = 1, max = 400, step = 1, -- quantization is aligned to the def value diff --git a/Units-Configs-Basedefs/basedefs/air/eairplant_basedef.lua b/Units-Configs-Basedefs/basedefs/air/eairplant_basedef.lua index 9f20ad9d..43777b1c 100644 --- a/Units-Configs-Basedefs/basedefs/air/eairplant_basedef.lua +++ b/Units-Configs-Basedefs/basedefs/air/eairplant_basedef.lua @@ -1,7 +1,7 @@ unitDef = { activatewhenbuilt = true, buildCostEnergy = 0, - buildCostMetal = 30, + buildCostMetal = buildCostMetal, builder = true, buildTime = 2.5, buildpic = "eairplant.png", diff --git a/Units-Configs-Basedefs/basedefs/hbot/mobile/ehbotpeewee_basedef.lua b/Units-Configs-Basedefs/basedefs/hbot/mobile/ehbotpeewee_basedef.lua index 51f37246..e33164f9 100644 --- a/Units-Configs-Basedefs/basedefs/hbot/mobile/ehbotpeewee_basedef.lua +++ b/Units-Configs-Basedefs/basedefs/hbot/mobile/ehbotpeewee_basedef.lua @@ -126,14 +126,14 @@ weaponDefs = { name = "E.M.G.", range = 650, reloadtime = 1, - projectiles = 5, + --projectiles = 5, weaponType = "LaserCannon", soundStart = "weapons/shotgun-reload.wav", soundTrigger = true, - sprayAngle = 500, + --sprayAngle = 500, texture1 = "shot", texture2 = "empty", - coreThickness = 0.3, + coreThickness = 0.6, thickness = 6, tolerance = 10000, turret = true, @@ -145,7 +145,7 @@ weaponDefs = { isupgraded = isUpgraded, }, damage = { - default = 10, + default = 50, }, }, } diff --git a/Units-Configs-Basedefs/basedefs/hbot/turret/ehbotpeewee_turret_basedef.lua b/Units-Configs-Basedefs/basedefs/hbot/turret/ehbotpeewee_turret_basedef.lua index bc09f1aa..77dca0ad 100644 --- a/Units-Configs-Basedefs/basedefs/hbot/turret/ehbotpeewee_turret_basedef.lua +++ b/Units-Configs-Basedefs/basedefs/hbot/turret/ehbotpeewee_turret_basedef.lua @@ -124,14 +124,14 @@ weaponDefs = { name = "E.M.G.", range = 650*1.33, reloadtime = 1, - projectiles = 5, + --projectiles = 5, weaponType = "LaserCannon", soundStart = "weapons/shotgun-reload.wav", soundTrigger = true, sprayAngle = 500, texture1 = "shot", texture2 = "empty", - coreThickness = 0.3, + coreThickness = 0.6, thickness = 6, tolerance = 10000, turret = true, @@ -143,7 +143,7 @@ weaponDefs = { isupgraded = isUpgraded, }, damage = { - default = 10, + default = 50, }, }, } diff --git a/Units/eair/eairplant.lua b/Units/eair/eairplant.lua index 6f44f5c2..e8ccc02c 100644 --- a/Units/eair/eairplant.lua +++ b/Units/eair/eairplant.lua @@ -5,7 +5,7 @@ unitName = "eairplant" -------------------------------------------------------------------------------- -buildCostMetal = 30 +buildCostMetal = 60 maxDamage = buildCostMetal * 12.5 humanName = [[VTOL Factory]] diff --git a/Units/eallterrain/eminifac.lua b/Units/eallterrain/eminifac.lua index e76b92e4..a5fa7397 100644 --- a/Units/eallterrain/eminifac.lua +++ b/Units/eallterrain/eminifac.lua @@ -5,7 +5,7 @@ unitName = "eminifac" -------------------------------------------------------------------------------- -buildCostMetal = 30 +buildCostMetal = 60 maxDamage = buildCostMetal * 12.5 humanName = [[All-Terrain Strider Factory]] diff --git a/Units/eamphib/eamphibfac.lua b/Units/eamphib/eamphibfac.lua index 33ee5b08..99d0a99e 100644 --- a/Units/eamphib/eamphibfac.lua +++ b/Units/eamphib/eamphibfac.lua @@ -5,7 +5,7 @@ unitName = "eamphibfac" -------------------------------------------------------------------------------- -buildCostMetal = 30 +buildCostMetal = 60 maxDamage = buildCostMetal * 12.5 humanName = [[Amphibious Tank Factory]] diff --git a/Units/ebuilding/etech1.lua b/Units/ebuilding/etech1.lua index 3c822d07..ba45db1a 100644 --- a/Units/ebuilding/etech1.lua +++ b/Units/ebuilding/etech1.lua @@ -96,6 +96,7 @@ local unitDef = { -- groundtexselectxsize = 500, -- optional -- groundtexselectzsize = 500, -- optional helptext = [[]], + buildcostenergyoverride = 800, }, useGroundDecal = true, BuildingGroundDecalType = "factorygroundplate.dds", diff --git a/Units/ehbot/mobile/ehbotfac.lua b/Units/ehbot/mobile/ehbotfac.lua index 13845e7f..535de8b8 100644 --- a/Units/ehbot/mobile/ehbotfac.lua +++ b/Units/ehbot/mobile/ehbotfac.lua @@ -5,7 +5,7 @@ unitName = "ehbotfac" -------------------------------------------------------------------------------- -buildCostMetal = 30 +buildCostMetal = 60 maxDamage = buildCostMetal * 12.5 humanName = [[H-Bot Factory]] diff --git a/Units/ehover/ebasefactory.lua b/Units/ehover/ebasefactory.lua index 443c2e96..13b4d3f9 100644 --- a/Units/ehover/ebasefactory.lua +++ b/Units/ehover/ebasefactory.lua @@ -5,7 +5,7 @@ unitName = "ebasefactory" -------------------------------------------------------------------------------- -buildCostMetal = 30 +buildCostMetal = 60 maxDamage = buildCostMetal * 12.5 humanName = "Hover Factory" diff --git a/modinfo.lua b/modinfo.lua index dc49606d..ec876bda 100644 --- a/modinfo.lua +++ b/modinfo.lua @@ -13,12 +13,13 @@ return { name='Evolution RTS -', description='EvoRTS', shortname='EvoRTS', - version='v15.02', + version='dev', mutator='Official', game='Evolution RTS', shortGame='EvoRTS', modtype=1, depend = { + "Evolution RTS Music Addon v2", -- "Spring Features v1.9", -- "Evolution RTS Music Addon v1", -- "Shard LuaAI $VERSION",