From 98476b0c424c7762d05b7b8a5986a79b395283d6 Mon Sep 17 00:00:00 2001 From: FAForever Machine User Date: Tue, 7 Apr 2026 16:03:32 +0000 Subject: [PATCH 1/4] Post-process deployment --- lua/shared/components/DebugComponent.lua | 8 ++++---- lua/version.lua | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lua/shared/components/DebugComponent.lua b/lua/shared/components/DebugComponent.lua index 6ceb164723a..37d504adc31 100644 --- a/lua/shared/components/DebugComponent.lua +++ b/lua/shared/components/DebugComponent.lua @@ -31,11 +31,11 @@ DebugComponent = ClassSimple { -- - https://github.com/FAForever/fa/blob/develop/.github/workflows/deploy-fafbeta.yaml -- - https://github.com/FAForever/fa/blob/develop/.github/workflows/deploy-fafdevelop.yaml - EnabledSpewing = true, - EnabledLogging = true, - EnabledWarnings = true, + EnabledSpewing = false, + EnabledLogging = false, + EnabledWarnings = false, EnabledErrors = true, - EnabledDrawing = true, + EnabledDrawing = false, --#endregion } diff --git a/lua/version.lua b/lua/version.lua index cb6a2e6c882..f40de9fe4b8 100644 --- a/lua/version.lua +++ b/lua/version.lua @@ -28,9 +28,9 @@ -- - https://github.com/FAForever/fa/blob/develop/.github/workflows/deploy-fafbeta.yaml -- - https://github.com/FAForever/fa/blob/develop/.github/workflows/deploy-fafdevelop.yaml -local GameType = 'unknown' -- The use of `'` instead of `"` is **intentional** +local GameType = "FAF" -- The use of `'` instead of `"` is **intentional** -local Commit = 'unknown' -- The use of `'` instead of `"` is **intentional** +local Commit = "2ae081b063aba82df3c679780f0ba8460e06a63e" -- The use of `'` instead of `"` is **intentional** --#endregion From 4d0dc2cd1065f1e8d6fef3665ac45aff09b86c9c Mon Sep 17 00:00:00 2001 From: Isokinetic Date: Sun, 10 May 2026 18:10:14 +0300 Subject: [PATCH 2/4] Buff Mercy BT Mercies can be a highly effective unit, however their hyper-specialization means that their application is narrow as well, including timeframe usage. It's hard to get enough mercies to make enough impact. It's especially true since big T2 air stage is less common than say big T2 land stage. And by the T3 stage mercies are usually obsolete. All this factors put a big constraint on volume of mercies' production. Current Mercy mass production drain is 7.6 m/s compared to 10.8 m/s when producing beetles (after recent beetle BT nerf). We would reduce BT time 1200-> 800-900. This would put mercies production mass drain one tier above t1/t2 bombers but within the same category as beetles. Making more mercies when needed would allow to spam enough mercies to be and feel impactful on the battlefield without directly buffing the unit itself. Related discord thread: https://discord.com/channels/197033481883222026/1498448334728200382 --- units/DAA0206/DAA0206_unit.bp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/units/DAA0206/DAA0206_unit.bp b/units/DAA0206/DAA0206_unit.bp index abafc533da5..c5862364604 100644 --- a/units/DAA0206/DAA0206_unit.bp +++ b/units/DAA0206/DAA0206_unit.bp @@ -107,7 +107,7 @@ UnitBlueprint{ Economy = { BuildCostEnergy = 4600, BuildCostMass = 230, - BuildTime = 1200, + BuildTime = 800, }, Footprint = { MaxSlope = 0.25, @@ -239,4 +239,4 @@ UnitBlueprint{ WeaponCategory = "Death", }, }, -} \ No newline at end of file +} From 9f5b68d0003a9298d4823b4fcbd8e9948d9a41e0 Mon Sep 17 00:00:00 2001 From: Isokinetic Date: Sun, 10 May 2026 18:29:41 +0300 Subject: [PATCH 3/4] Create balance.7112.md --- changelog/balance.7112.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog/balance.7112.md diff --git a/changelog/balance.7112.md b/changelog/balance.7112.md new file mode 100644 index 00000000000..406ecdebe15 --- /dev/null +++ b/changelog/balance.7112.md @@ -0,0 +1,3 @@ +- (#7112) Mercy receives BT cost reduction to allow spam enough mercies to deal impact on the battlefield. + + - Build Time: 1200 -> 800 From bc951d7a782b51a8349a1a0d99c63b80d9c1b313 Mon Sep 17 00:00:00 2001 From: ImperiumAeternum <222115789+Isocinetic@users.noreply.github.com> Date: Sun, 10 May 2026 18:52:38 +0300 Subject: [PATCH 4/4] Reverse deploy branch leftover Reverse deploy branch leftover after rebase. Restore default --- lua/shared/components/DebugComponent.lua | 8 ++++---- lua/version.lua | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lua/shared/components/DebugComponent.lua b/lua/shared/components/DebugComponent.lua index 37d504adc31..6ceb164723a 100644 --- a/lua/shared/components/DebugComponent.lua +++ b/lua/shared/components/DebugComponent.lua @@ -31,11 +31,11 @@ DebugComponent = ClassSimple { -- - https://github.com/FAForever/fa/blob/develop/.github/workflows/deploy-fafbeta.yaml -- - https://github.com/FAForever/fa/blob/develop/.github/workflows/deploy-fafdevelop.yaml - EnabledSpewing = false, - EnabledLogging = false, - EnabledWarnings = false, + EnabledSpewing = true, + EnabledLogging = true, + EnabledWarnings = true, EnabledErrors = true, - EnabledDrawing = false, + EnabledDrawing = true, --#endregion } diff --git a/lua/version.lua b/lua/version.lua index f40de9fe4b8..cb6a2e6c882 100644 --- a/lua/version.lua +++ b/lua/version.lua @@ -28,9 +28,9 @@ -- - https://github.com/FAForever/fa/blob/develop/.github/workflows/deploy-fafbeta.yaml -- - https://github.com/FAForever/fa/blob/develop/.github/workflows/deploy-fafdevelop.yaml -local GameType = "FAF" -- The use of `'` instead of `"` is **intentional** +local GameType = 'unknown' -- The use of `'` instead of `"` is **intentional** -local Commit = "2ae081b063aba82df3c679780f0ba8460e06a63e" -- The use of `'` instead of `"` is **intentional** +local Commit = 'unknown' -- The use of `'` instead of `"` is **intentional** --#endregion