From 258ea779e69d666878f2743ea16f00f0e8ee0440 Mon Sep 17 00:00:00 2001 From: lL1l1 <82986251+lL1l1@users.noreply.github.com> Date: Tue, 17 Dec 2024 21:49:20 -0800 Subject: [PATCH 1/4] Buff UEF ACU Drone costs --- units/UEA0001/UEA0001_unit.bp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/units/UEA0001/UEA0001_unit.bp b/units/UEA0001/UEA0001_unit.bp index b01b70fe4d..98f6cd768e 100644 --- a/units/UEA0001/UEA0001_unit.bp +++ b/units/UEA0001/UEA0001_unit.bp @@ -68,11 +68,11 @@ UnitBlueprint{ UniformScale = 0.1, }, Economy = { - BuildCostEnergy = 1600, - BuildCostMass = 160, + BuildCostEnergy = 800, + BuildCostMass = 60, BuildRadius = 8, BuildRate = 5, - BuildTime = 400, + BuildTime = 200, BuildableCategory = { "BUILTBYCOMMANDER UEF" }, NaturalProducer = true, }, From e9b690de2f7f96ef4e9b64bb6070652c97355be0 Mon Sep 17 00:00:00 2001 From: lL1l1 <82986251+lL1l1@users.noreply.github.com> Date: Tue, 17 Dec 2024 21:50:01 -0800 Subject: [PATCH 2/4] Use drone blueprint and ACU buildpower in UEF ACU drone rebuild process --- units/UEL0001/UEL0001_script.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/units/UEL0001/UEL0001_script.lua b/units/UEL0001/UEL0001_script.lua index 35202b054b..aaa9f76837 100644 --- a/units/UEL0001/UEL0001_script.lua +++ b/units/UEL0001/UEL0001_script.lua @@ -25,6 +25,8 @@ local TDFOverchargeWeapon = TerranWeaponFile.TDFOverchargeWeapon local EffectUtil = import("/lua/effectutilities.lua") local Buff = import("/lua/sim/buff.lua") +local podBpEco = __blueprints['uea0001'].Economy + ---@class UEL0001 : ACUUnit ---@field LeftPod TConstructionPodUnit ---@field HasLeftPod boolean @@ -234,7 +236,7 @@ UEL0001 = ClassUnit(ACUUnit) { WaitFor(self.RebuildingPod2) end if self.HasLeftPod == true then - self.RebuildingPod = CreateEconomyEvent(self, 1600, 160, 10, self.SetWorkProgress) + self.RebuildingPod = CreateEconomyEvent(self, podBpEco.BuildCostEnergy, podBpEco.BuildCostMass, podBpEco.BuildTime / self:GetBuildRate(), self.SetWorkProgress) self:RequestRefreshUI() WaitFor(self.RebuildingPod) self:SetWorkProgress(0.0) @@ -255,7 +257,7 @@ UEL0001 = ClassUnit(ACUUnit) { WaitFor(self.RebuildingPod) end if self.HasRightPod == true then - self.RebuildingPod2 = CreateEconomyEvent(self, 1600, 160, 10, self.SetWorkProgress) + self.RebuildingPod2 = CreateEconomyEvent(self, podBpEco.BuildCostEnergy, podBpEco.BuildCostMass, podBpEco.BuildTime / self:GetBuildRate(), self.SetWorkProgress) self:RequestRefreshUI() WaitFor(self.RebuildingPod2) self:SetWorkProgress(0.0) From 4a2451408505841c9f06d82619657c9be2da89b8 Mon Sep 17 00:00:00 2001 From: lL1l1 <82986251+lL1l1@users.noreply.github.com> Date: Tue, 17 Dec 2024 22:22:12 -0800 Subject: [PATCH 3/4] Annotate __blueprints --- lua/RuleInit.lua | 6 ++++++ units/UEL0001/UEL0001_script.lua | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lua/RuleInit.lua b/lua/RuleInit.lua index 9db7918960..c3502f6ab3 100644 --- a/lua/RuleInit.lua +++ b/lua/RuleInit.lua @@ -5,6 +5,12 @@ -- This is the minimal setup required to load the game rules. -- Do global init + +--[[`number` is `BlueprintOrdinal` from the entity creation dialog, used by all types of blueprints +`BlueprintId` for units +`FileName` for projectiles and meshes (meshes have the file extension stripped)]] +---@type table +---@diagnostic disable-next-line: lowercase-global __blueprints = {} doscript '/lua/system/config.lua' diff --git a/units/UEL0001/UEL0001_script.lua b/units/UEL0001/UEL0001_script.lua index aaa9f76837..461c8a800d 100644 --- a/units/UEL0001/UEL0001_script.lua +++ b/units/UEL0001/UEL0001_script.lua @@ -25,7 +25,7 @@ local TDFOverchargeWeapon = TerranWeaponFile.TDFOverchargeWeapon local EffectUtil = import("/lua/effectutilities.lua") local Buff = import("/lua/sim/buff.lua") -local podBpEco = __blueprints['uea0001'].Economy +local podBpEco = __blueprints['uea0001']--[[@as UnitBlueprint]].Economy ---@class UEL0001 : ACUUnit ---@field LeftPod TConstructionPodUnit From d6360e90133d419a2a56154def0740dfb7e69d43 Mon Sep 17 00:00:00 2001 From: lL1l1 <82986251+lL1l1@users.noreply.github.com> Date: Tue, 17 Dec 2024 22:28:41 -0800 Subject: [PATCH 4/4] Create balance.6591.md --- changelog/snippets/balance.6591.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/snippets/balance.6591.md diff --git a/changelog/snippets/balance.6591.md b/changelog/snippets/balance.6591.md new file mode 100644 index 0000000000..0d250359cc --- /dev/null +++ b/changelog/snippets/balance.6591.md @@ -0,0 +1,7 @@ +- (#6591) Buff UEF ACU Drone's rebuild costs by making it half the upgrade's cost. Previously it was too high due to not being changed alongside the upgrade's cost, and had an unreasonable drain for a T1 economy. + Additionally, the drone now rebuilds based off the ACU's buildpower instead of a hardcoded 10 seconds. + + - UEF ACU Drone: + - Rebuild mass cost: 160 -> 60 + - Rebuild energy cost: 1600 -> 800 + - Rebuild time: 10 seconds -> 200 buildtime