Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update performance helptext for buildings producing more wares #5861

Merged
merged 32 commits into from
Aug 3, 2023
Merged

Update performance helptext for buildings producing more wares #5861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
f4cf39c
Updated performance helptext.
gpalino Apr 20, 2023
e4dc933
Improved wording.
gpalino Apr 22, 2023
21d7c47
Improved wording.
gpalino Apr 22, 2023
ad750bc
Improved wording.
gpalino Apr 22, 2023
7234f4a
Updated performance helptext for barbarians.
gpalino Apr 25, 2023
1c720a7
Updated performance helptext for atlanteans.
gpalino Apr 29, 2023
aea435e
Updated performance helptext for empire.
gpalino May 2, 2023
cd3bc52
Fixed sleep duration typo.
gpalino May 2, 2023
24958d1
Shortened help texts where production times are equal.
gpalino May 3, 2023
addeeb4
Fixed typo in format specifiers.
gpalino May 3, 2023
88b5ced
Updated performance helptext for frisians.
gpalino May 8, 2023
629371e
Updated performance helptext for amazons.
gpalino May 10, 2023
3b2397b
Improved wording.
gpalino May 10, 2023
66ffdc7
Merge remote-tracking branch 'myfork/master' into performance-helptext1
gpalino May 10, 2023
ebfe79d
Merge branch 'master' into performance-helptext1
gpalino May 13, 2023
3f13031
Fixed wording in descname of deep marble mine.
gpalino May 13, 2023
901e4a1
Merge remote-tracking branch 'myfork/master' into performance-helptext1
gpalino May 15, 2023
752ea0e
Merge remote-tracking branch 'myfork/master' into performance-helptext1
gpalino May 17, 2023
f29f716
Apply suggestions from code review
gpalino May 21, 2023
71ec4bc
Fixed one doublespace.
gpalino May 21, 2023
2886fe2
Merge branch 'master' into performance-helptext1
hessenfarmer May 21, 2023
0ac4c82
Updated ax production in Ax Workshop and Warmill.
gpalino May 23, 2023
fa8dc13
Apply suggestions from code review
gpalino Jul 29, 2023
67f308d
Merge remote-tracking branch 'myfork/master' into performance-helptext1
gpalino Jul 29, 2023
024ae04
Simplified Inn & Drinking Hall performance sentences.
gpalino Jul 30, 2023
b59f000
More explanatory performance text for frisian tavern.
gpalino Jul 31, 2023
243e013
Merge remote-tracking branch 'myfork/master' into performance-helptext1
gpalino Aug 1, 2023
74a148c
Reformulated performance text for Reindeer Farm.
gpalino Aug 1, 2023
59d7a5b
Added performance text instead of note for Reindeer Farm.
gpalino Aug 1, 2023
e1a2b04
Update data/tribes/initialization/frisians/units.lua
gpalino Aug 2, 2023
bb3c6af
Merge remote-tracking branch 'myfork/master' into performance-helptext1
gpalino Aug 2, 2023
bffa328
Merge branch 'master' into performance-helptext1
hessenfarmer Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 19 additions & 9 deletions data/tribes/buildings/productionsites/amazons/dressmakery/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start working because ...
descname = _("working"),
actions = {
-- time total: 9 * 71 = 639 sec
"call=produce_tunic",
"call=produce_helmet_wooden",
"call=produce_armor_wooden",
Expand All @@ -72,9 +73,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start forging a felling ax because ...
descname = _("sewing a tunic"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs tunic",
"consume=rubber rope",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=tunic"
},
Expand All @@ -83,9 +85,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start forging a pick because ...
descname = _("making a light wooden armor"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs armor_wooden",
"consume=balsa:2 rope",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=armor_wooden"
},
Expand All @@ -94,9 +97,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making a scythe because ...
descname = _("making a wooden helmet"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs helmet_wooden",
"consume=ironwood rubber",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=helmet_wooden"
},
Expand All @@ -105,9 +109,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making a shovel because ...
descname = _("sewing a warrior’s coat"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs warriors_coat",
"consume=ironwood balsa:2 rubber gold",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=warriors_coat"
},
Expand All @@ -116,9 +121,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making a basket because ...
descname = _("making sturdy boots"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs boots_sturdy",
"consume=rubber balsa",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=boots_sturdy"
},
Expand All @@ -127,9 +133,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making a hunting spear because ...
descname = _("making swift boots"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs boots_swift",
"consume=rubber:3",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=boots_swift"
},
Expand All @@ -138,9 +145,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making a fishing net because ...
descname = _("making hero boots"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs boots_hero",
"consume=rubber:3 gold",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=boots_hero"
},
Expand All @@ -149,9 +157,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making a bread paddle because ...
descname = _("making a padded vest"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs vest_padded",
"consume=rubber:2 rope:2",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=vest_padded"
},
Expand All @@ -160,9 +169,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making kitchen tools because ...
descname = _("making a padded protector"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs protector_padded",
"consume=rubber:2 rope:2 balsa gold",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=protector_padded"
},
Expand Down
37 changes: 25 additions & 12 deletions data/tribes/buildings/productionsites/amazons/stone_workshop/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start working because ...
descname = _("working"),
actions = {
-- time total: 18 * 71 = 1278 sec
"call=produce_shovel",
"call=produce_spear_wooden",
"call=produce_felling_ax",
Expand All @@ -82,9 +83,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start forging a felling ax because ...
descname = _("making a shovel"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs shovel",
"consume=ironwood",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=shovel"
},
Expand All @@ -93,9 +95,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start forging a pick because ...
descname = _("making a felling ax"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs felling_ax",
"consume=log granite",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=felling_ax"
},
Expand All @@ -104,9 +107,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making a scythe because ...
descname = _("making a pick"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs pick",
"consume=log granite",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=pick"
},
Expand All @@ -115,9 +119,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making a shovel because ...
descname = _("making a machete"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs machete",
"consume=log granite",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=machete"
},
Expand All @@ -126,9 +131,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making a basket because ...
descname = _("making kitchen tools"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs kitchen_tools",
"consume=log granite",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=kitchen_tools"
},
Expand All @@ -137,9 +143,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making a hunting spear because ...
descname = _("making a hammer"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs hammer",
"consume=log granite",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=hammer"
},
Expand All @@ -148,9 +155,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making a fishing net because ...
descname = _("making a chisel"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs chisel",
"consume=granite",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=chisel"
},
Expand All @@ -159,9 +167,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making a bread paddle because ...
descname = _("making needles"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs needles",
"consume=granite",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=needles"
},
Expand All @@ -170,9 +179,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making kitchen tools because ...
descname = _("making a stone bowl"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs stone_bowl",
"consume=granite",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=stone_bowl"
},
Expand All @@ -181,9 +191,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making kitchen tools because ...
descname = _("making a wooden spear"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs spear_wooden",
"consume=ironwood",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=spear_wooden"
},
Expand All @@ -192,9 +203,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making kitchen tools because ...
descname = _("making a stone-tipped spear"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs spear_stone_tipped",
"consume=ironwood granite",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=spear_stone_tipped"
},
Expand All @@ -203,9 +215,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start making kitchen tools because ...
descname = _("making a hardened spear"),
actions = {
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs spear_hardened",
"consume=ironwood log granite",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=spear_hardened"
},
Expand Down
9 changes: 5 additions & 4 deletions data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start working because ...
descname = _("working"),
actions = {
-- time total: 71 + 81 = 152 sec
"call=produce_shield_steel",
"call=produce_shield_advanced",
}
Expand All @@ -221,10 +222,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start forging a steel shield because ...
descname = _("forging a steel shield"),
actions = {
-- time total: 67 + 3.6
-- time: 32.4 + 35 + 3.6 = 71 sec
"return=skipped unless economy needs shield_steel",
"consume=iron:2 coal:2",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:35s",
"produce=shield_steel"
}
Expand All @@ -233,10 +234,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start forging an advanced shield because ...
descname = _("forging an advanced shield"),
actions = {
-- time total: 77 + 3.6
-- time: 32.4 + 45 + 3.6 = 81 sec
"return=skipped unless economy needs shield_advanced",
"consume=iron:2 coal:2 gold",
"sleep=duration:32s",
"sleep=duration:32s400ms",
"animate=working duration:45s",
"produce=shield_advanced"
}
Expand Down
10 changes: 7 additions & 3 deletions data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start working because ...
descname = _("working"),
actions = {
-- time total: 145 + 126 + 116 = 387 sec
"call=mine_granite",
"call=mine_quartz",
"call=mine_diamond",
Expand All @@ -61,9 +62,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
descname = _("mining granite"),
actions = {
-- time: 38.4 + 5 * (15 + 3.6) + 1 * (10 + 3.6) = 145 sec
"return=skipped unless economy needs granite",
"consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
"sleep=duration:40s",
"sleep=duration:38s400ms",
"call=a_mine_produce_granite",
"call=a_mine_produce_granite",
"call=a_mine_produce_granite",
Expand All @@ -76,9 +78,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start mining quartz because ...
descname = _("mining quartz"),
actions = {
-- time: 29.4 + 3 * (10 + 3.6) + 3 * (15 + 3.6) = 126 sec
"return=skipped unless economy needs quartz",
"consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
"sleep=duration:30s",
"sleep=duration:29s400ms",
"call=a_mine_produce_quartz",
"call=a_mine_produce_granite",
"call=a_mine_produce_granite",
Expand All @@ -91,9 +94,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start mining diamonds because ...
descname = _("mining diamonds"),
actions = {
-- time: 40.2 + 2 * (25 + 3.6) + 1 * (15 + 3.6) = 116 sec
"return=skipped unless economy needs diamond",
"consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
"sleep=duration:40s",
"sleep=duration:40s200ms",
"call=a_mine_produce_diamond",
"call=a_mine_produce_granite",
"call=a_mine_produce_diamond",
Expand Down
7 changes: 5 additions & 2 deletions data/tribes/buildings/productionsites/atlanteans/mill/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start working because ...
descname = _("working"),
actions = {
-- time total: 22 + 22 = 44 sec
"call=produce_cornmeal",
"call=produce_blackroot_flour",
}
Expand All @@ -64,9 +65,10 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start grinding corn because ...
descname = _("grinding corn"),
actions = {
-- time: 3.4 + 15 + 3.6 = 22 sec
"return=skipped when site has blackroot and economy needs blackroot_flour and not economy needs cornmeal",
"return=skipped unless economy needs cornmeal",
"sleep=duration:3s500ms",
"sleep=duration:3s400ms",
"consume=corn",
"playsound=sound/mill/mill_turning priority:85% allow_multiple",
"animate=working duration:15s",
Expand All @@ -77,10 +79,11 @@ wl.Descriptions():new_productionsite_type {
-- TRANSLATORS: Completed/Skipped/Did not start grinding blackroot because ...
descname = _("grinding blackroot"),
actions = {
-- time: 3.4 + 15 + 3.6 = 22 sec
-- No check whether we need blackroot_flour because blackroots cannot be used for anything else.
"return=skipped when site has corn and economy needs cornmeal and not economy needs blackroot_flour",
"consume=blackroot",
"sleep=duration:3s500ms",
"sleep=duration:3s400ms",
"playsound=sound/mill/mill_turning priority:85% allow_multiple",
"animate=working duration:15s",
"produce=blackroot_flour"
Expand Down