diff --git a/data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua b/data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua index fb2be9be51..6f982faaa7 100644 --- a/data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua +++ b/data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua @@ -67,8 +67,9 @@ wl.Descriptions():new_productionsite_type { main = { -- TRANSLATORS: Completed/Skipped/Did not start working because ... descname = _("working"), actions = { + -- "return=skipped" causes 10 sec delay "call=produce_ax", "call=produce_ax_sharp", "call=produce_ax_broad", "return=skipped" @@ -77,12 +78,12 @@ wl.Descriptions():new_productionsite_type { produce_ax = { -- TRANSLATORS: Completed/Skipped/Did not start forging an ax because ... descname = _("forging an ax"), actions = { - -- time total: 57 + 3.6 + -- time total: 26.4 + 22 + 9 + 3.6 = 61 sec "return=skipped unless economy needs ax", "consume=coal iron", - "sleep=duration:26s", + "sleep=duration:26s400ms", "playsound=sound/smiths/smith priority:50% allow_multiple", "animate=working duration:22s", "playsound=sound/smiths/sharpening priority:90%", "sleep=duration:9s", @@ -92,12 +93,12 @@ wl.Descriptions():new_productionsite_type { produce_ax_sharp = { -- TRANSLATORS: Completed/Skipped/Did not start forging a sharp ax because ... descname = _("forging a sharp ax"), actions = { - -- time total: 57 + 3.6 + -- time total: 26.4 + 22 + 9 + 3.6 = 61 sec "return=skipped unless economy needs ax_sharp", "consume=coal iron:2", - "sleep=duration:26s", + "sleep=duration:26s400ms", "playsound=sound/smiths/smith priority:50% allow_multiple", "animate=working duration:22s", "playsound=sound/smiths/sharpening priority:90%", "sleep=duration:9s", @@ -107,12 +108,12 @@ wl.Descriptions():new_productionsite_type { produce_ax_broad = { -- TRANSLATORS: Completed/Skipped/Did not start forging a broad ax because ... descname = _("forging a broad ax"), actions = { - -- time total: 57 + 3.6 + -- time total: 16.4 + 22 + 9 + 3.6 + 10 = 61 sec "return=skipped unless economy needs ax_broad", "consume=coal:2 iron:2", - "sleep=duration:26s", + "sleep=duration:16s400ms", "playsound=sound/smiths/smith priority:50% allow_multiple", "animate=working duration:22s", "playsound=sound/smiths/sharpening priority:90%", "sleep=duration:9s", diff --git a/data/tribes/buildings/productionsites/barbarians/bakery/init.lua b/data/tribes/buildings/productionsites/barbarians/bakery/init.lua index 26186a2c02..7f3e2fa3eb 100644 --- a/data/tribes/buildings/productionsites/barbarians/bakery/init.lua +++ b/data/tribes/buildings/productionsites/barbarians/bakery/init.lua @@ -52,11 +52,12 @@ wl.Descriptions():new_productionsite_type { main = { -- TRANSLATORS: Completed/Skipped/Did not start baking bread because ... descname = pgettext("barbarians_building", "baking pitta bread"), actions = { + -- time total: 20.8 + 2 * (20 + 3.6) = 68 sec "return=skipped unless economy needs barbarians_bread", "consume=water:3 wheat:3", - "sleep=duration:20s", + "sleep=duration:20s800ms", "animate=working duration:20s", "produce=barbarians_bread", "animate=working duration:20s", "produce=barbarians_bread" diff --git a/data/tribes/buildings/productionsites/barbarians/barracks/init.lua b/data/tribes/buildings/productionsites/barbarians/barracks/init.lua index 20dc080afe..05b5cea429 100644 --- a/data/tribes/buildings/productionsites/barbarians/barracks/init.lua +++ b/data/tribes/buildings/productionsites/barbarians/barracks/init.lua @@ -52,8 +52,9 @@ wl.Descriptions():new_productionsite_type { main = { -- TRANSLATORS: Completed/Skipped/Did not start recruiting soldier because ... descname = pgettext("barbarians_building", "recruiting soldier"), actions = { + -- time total: 30 sec "return=skipped unless economy needs barbarians_soldier", "consume=ax barbarians_recruit", "sleep=duration:30s", "recruit=barbarians_soldier" diff --git a/data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua b/data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua index a2ca08da98..bd254e6b42 100644 --- a/data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua +++ b/data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua @@ -61,11 +61,13 @@ wl.Descriptions():new_productionsite_type { main = { -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ... descname = _("mining coal"), actions = { + -- "return=skipped" causes 10 sec delay + -- time total: 29.6 + 4 * (9.5 + 3.6) + 10 = 92 sec "return=skipped unless economy needs coal", "consume=snack", - "sleep=duration:40s", + "sleep=duration:29s600ms", "call=mine_produce", "call=mine_produce", "call=mine_produce", "call=mine_produce", diff --git a/data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua b/data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua index 3466f69003..b0a422dfce 100644 --- a/data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua +++ b/data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua @@ -50,11 +50,13 @@ wl.Descriptions():new_productionsite_type { main = { -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ... descname = _("mining coal"), actions = { + -- "return=skipped" causes 10 sec delay + -- time total: 27 + 5 * (7 + 3.6) + 10 = 90 sec "return=skipped unless economy needs coal", "consume=meal", - "sleep=duration:37s", + "sleep=duration:27s", "call=mine_produce", "call=mine_produce", "call=mine_produce", "call=mine_produce", diff --git a/data/tribes/buildings/productionsites/barbarians/gamekeepers_hut/init.lua b/data/tribes/buildings/productionsites/barbarians/gamekeepers_hut/init.lua index c07062b56a..6651d4a204 100644 --- a/data/tribes/buildings/productionsites/barbarians/gamekeepers_hut/init.lua +++ b/data/tribes/buildings/productionsites/barbarians/gamekeepers_hut/init.lua @@ -53,10 +53,11 @@ wl.Descriptions():new_productionsite_type { main = { -- TRANSLATORS: Completed/Skipped/Did not start working because ... descname = _("working"), actions = { + -- time total: 53 sec "callworker=release", - "sleep=duration:52s500ms" + "sleep=duration:53s" } }, }, } diff --git a/data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua b/data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua index 89bf6f8a07..c4fe80a078 100644 --- a/data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua +++ b/data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua @@ -61,11 +61,13 @@ wl.Descriptions():new_productionsite_type { main = { -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ... descname = _("mining iron"), actions = { + -- "return=skipped" causes 10 sec delay + -- time total: 29.6 + 4 * (9.5 + 3.6) + 10 = 92 sec "return=skipped unless economy needs iron_ore", "consume=snack", - "sleep=duration:40s", + "sleep=duration:29s600ms", "call=mine_produce", "call=mine_produce", "call=mine_produce", "call=mine_produce", diff --git a/data/tribes/initialization/barbarians/units.lua b/data/tribes/initialization/barbarians/units.lua index 72262de941..5b4e408c7c 100644 --- a/data/tribes/initialization/barbarians/units.lua +++ b/data/tribes/initialization/barbarians/units.lua @@ -1152,10 +1152,14 @@ wl.Descriptions():new_tribe { -- TRANSLATORS: Purpose helptext for a barbarian production site: Lumberjack_s Hut purpose = pgettext("building", "Fells trees in the surrounding area and processes them into logs."), -- TRANSLATORS: Note helptext for a barbarian production site: Lumberjack_s Hut note = pgettext("barbarians_building", "The lumberjack’s hut needs trees to fell within the work area."), - -- TRANSLATORS: Performance helptext for a barbarian production site: Lumberjack_s Hut - performance = pgettext("barbarians_building", "The lumberjack needs %s to fell a tree, not counting the time he needs to reach the destination and go home again."):bformat(ngettext("%d second", "%d seconds", 12):bformat(12)) + performance = { + -- TRANSLATORS: Performance helptext for a barbarian production site: Lumberjack_s Hut + pgettext("barbarians_building", "The lumberjack needs %s to fell a tree, not counting the time he needs to reach the destination and go home again."):bformat(ngettext("%d second", "%d seconds", 17):bformat(17)), + -- TRANSLATORS: Performance helptext for a barbarian production site: Lumberjack_s Hut + pgettext("barbarians_building", "He rests in the hut for %s."):bformat(ngettext("%d second", "%d seconds", 20):bformat(20)) + } } }, { name = "barbarians_rangers_hut", @@ -1212,9 +1216,9 @@ wl.Descriptions():new_tribe { lore_author = pgettext("barbarians_building", "Barbarian nursery rhyme"), -- TRANSLATORS: Purpose helptext for production site: Gamekeeper's Hut purpose = pgettext("barbarians_building", "Releases animals into the wild to steady the meat production."), -- TRANSLATORS: Performance helptext for production site: Gamekeeper's Hut - performance = pgettext("barbarians_building", "The gamekeeper pauses 52.5 seconds before going to work again.") + performance = pgettext("barbarians_building", "The gamekeeper pauses %s before going to work again."):bformat(ngettext("%d second", "%d seconds", 53):bformat(53)) } }, { name = "barbarians_well", @@ -1294,9 +1298,9 @@ wl.Descriptions():new_tribe { lore_author = pgettext("barbarians_building", "Khantarakh, ‘The Modern Barbarian Economy’,
3ʳᵈ cowhide ‘Craftsmanship and Trade’"), -- TRANSLATORS: Purpose helptext for a barbarian production site: Bakery purpose = pgettext("barbarians_building", "Bakes pitta bread for soldiers and miners alike."), -- TRANSLATORS: Performance helptext for a barbarian production site: Bakery - performance = pgettext("barbarians_building", "If all needed wares are delivered in time, this building can produce a pitta bread in %s on average."):bformat(ngettext("%d second", "%d seconds", 30):bformat(30)) + performance = pgettext("barbarians_building", "If all needed wares are delivered in time, this building can produce a pitta bread in %s on average."):bformat(ngettext("%d second", "%d seconds", 34):bformat(34)) } }, { name = "barbarians_micro_brewery", @@ -1434,9 +1438,9 @@ wl.Descriptions():new_tribe { -- TRANSLATORS: Note helptext for a barbarian production site: Ax Workshop note = pgettext("barbarians_building", "The Barbarian ax workshop is the intermediate production site in a series of three buildings. It is enhanced from the metal workshop but doesn’t require additional qualification for the worker."), performance = { -- TRANSLATORS: Performance helptext for a barbarian production site: Ax Workshop - pgettext("barbarians_building", "If all needed wares are delivered in time, this building can produce each type of ax in about %s on average."):bformat(ngettext("%d second", "%d seconds", 57):bformat(57)), + pgettext("barbarians_building", "If all needed wares are delivered in time, this building can produce each type of ax in about %s on average."):bformat(ngettext("%d second", "%d seconds", 61):bformat(61)), -- TRANSLATORS: Performance helptext for a barbarian production site: Ax Workshop pgettext("barbarians_building", "All three weapons take the same time for making, but the required raw materials vary.") } } @@ -1448,9 +1452,11 @@ wl.Descriptions():new_tribe { lore = pgettext("barbarians_building", "‘Don’t ask what your tribe can do for you, ask what you can do for your tribe!’"), -- TRANSLATORS: Lore author helptext for a barbarian production site: Barracks lore_author = pgettext("barbarians_building", "Famous barbarian recruitment poster"), -- TRANSLATORS: Purpose helptext for a barbarian production site: Barracks - purpose = pgettext("barbarians_building", "Equips recruits and trains them as soldiers.") + purpose = pgettext("barbarians_building", "Equips recruits and trains them as soldiers."), + -- TRANSLATORS: Performance helptext for a barbarian production site: Barracks + performance = pgettext("barbarians_building", "The barracks needs %s on average to recruit one soldier."):bformat(ngettext("%d second", "%d seconds", 30):bformat(30)) } }, -- Big @@ -1541,9 +1547,9 @@ wl.Descriptions():new_tribe { }, -- TRANSLATORS: Purpose helptext for production site: Deep Coal Mine purpose = pgettext("building", "Digs coal out of the ground in mountain terrain."), -- TRANSLATORS: Performance helptext for production site: Deep Coal Mine - performance = pgettext("barbarians_building", "If the food supply is steady, this mine can produce coal in 19.5 seconds on average.") + performance = pgettext("barbarians_building", "If the food supply is steady, this mine can produce coal in %s on average."):bformat(ngettext("%d second", "%d seconds", 23):bformat(23)) } }, { name = "barbarians_coalmine_deeper", @@ -1556,9 +1562,9 @@ wl.Descriptions():new_tribe { }, -- TRANSLATORS: Purpose helptext for production site: Deeper Coal Mine purpose = pgettext("building", "Digs coal out of the ground in mountain terrain."), -- TRANSLATORS: Performance helptext for production site: Deeper Coal Mine - performance = pgettext("barbarians_building", "If the food supply is steady, this mine can produce coal in 14.4 seconds on average.") + performance = pgettext("barbarians_building", "If the food supply is steady, this mine can produce coal in %s on average."):bformat(ngettext("%d second", "%d seconds", 18):bformat(18)) } }, { name = "barbarians_ironmine", @@ -1582,9 +1588,9 @@ wl.Descriptions():new_tribe { lore_author = pgettext("barbarians_building", "Quote from an anonymous miner."), -- TRANSLATORS: Purpose helptext for a barbarian production site: Deep Iron Mine purpose = pgettext("building", "Digs iron ore out of the ground in mountain terrain."), -- TRANSLATORS: Performance helptext for a barbarian production site: Deep Iron Mine - performance = pgettext("barbarians_building", "If the food supply is steady, this mine can produce iron ore in 39.5 seconds on average.") + performance = pgettext("barbarians_building", "If the food supply is steady, this mine can produce iron ore in %s on average."):bformat(ngettext("%d second", "%d seconds", 23):bformat(23)) } }, { name = "barbarians_ironmine_deeper",