widelands

Merge lp://staging/~widelands-dev/widelands/bug-1764318-barbarian-lore into lp://staging/widelands

bug-1764318-barbarian-lore
Merge into trunk

Proposed by hessenfarmer on 2019-04-07

Status:

Merged

Merged at revision:

9063

Proposed branch:

lp://staging/~widelands-dev/widelands/bug-1764318-barbarian-lore

Merge into:

lp://staging/widelands

Diff against target:

685 lines (+138/-161)

29 files modified

data/tribes/buildings/militarysites/barbarians/barrier/helptexts.lua (+4/-7)
data/tribes/buildings/militarysites/barbarians/citadel/helptexts.lua (+5/-7)
data/tribes/buildings/militarysites/barbarians/fortress/helptexts.lua (+4/-7)
data/tribes/buildings/militarysites/barbarians/sentry/helptexts.lua (+5/-7)
data/tribes/buildings/militarysites/barbarians/tower/helptexts.lua (+5/-7)
data/tribes/buildings/partially_finished/constructionsite/helptexts.lua (+5/-10)
data/tribes/buildings/partially_finished/dismantlesite/helptexts.lua (+5/-10)
data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/helptexts.lua (+7/-4)
data/tribes/buildings/productionsites/barbarians/bakery/helptexts.lua (+4/-7)
data/tribes/buildings/productionsites/barbarians/barracks/helptexts.lua (+4/-4)
data/tribes/buildings/productionsites/barbarians/big_inn/helptexts.lua (+5/-4)
data/tribes/buildings/productionsites/barbarians/brewery/helptexts.lua (+7/-4)
data/tribes/buildings/productionsites/barbarians/cattlefarm/helptexts.lua (+4/-7)
data/tribes/buildings/productionsites/barbarians/charcoal_kiln/helptexts.lua (+11/-4)
data/tribes/buildings/productionsites/barbarians/farm/helptexts.lua (+5/-7)
data/tribes/buildings/productionsites/barbarians/fishers_hut/helptexts.lua (+2/-2)
data/tribes/buildings/productionsites/barbarians/helmsmithy/helptexts.lua (+4/-4)
data/tribes/buildings/productionsites/barbarians/inn/helptexts.lua (+4/-4)
data/tribes/buildings/productionsites/barbarians/quarry/helptexts.lua (+4/-7)
data/tribes/buildings/productionsites/barbarians/scouts_hut/helptexts.lua (+5/-4)
data/tribes/buildings/productionsites/barbarians/shipyard/helptexts.lua (+6/-4)
data/tribes/buildings/productionsites/barbarians/smelting_works/helptexts.lua (+5/-4)
data/tribes/buildings/productionsites/barbarians/tavern/helptexts.lua (+4/-4)
data/tribes/buildings/productionsites/barbarians/warmill/helptexts.lua (+0/-3)
data/tribes/buildings/productionsites/barbarians/weaving_mill/helptexts.lua (+5/-4)
data/tribes/buildings/productionsites/barbarians/wood_hardener/helptexts.lua (+6/-4)
data/tribes/buildings/warehouses/barbarians/headquarters/helptexts.lua (+4/-7)
data/tribes/buildings/warehouses/barbarians/port/helptexts.lua (+4/-7)
data/tribes/buildings/warehouses/barbarians/warehouse/helptexts.lua (+5/-7)

To merge this branch:

bzr merge lp://staging/~widelands-dev/widelands/bug-1764318-barbarian-lore

Undecided

Won't Fix

Link a bug report

Reviewer	Review Type	Date Requested	Status
hessenfarmer			Approve on 2019-04-21
Review via email: mp+365637@code.staging.launchpad.net

Commit message

This is for b21.
A lot of lore texts added according to the relevant forum discussions

Description of the change

Lore texts for all missing Barbarians Buildings (see https://wl.widelands.org/forum/topic/4193/)
Lore text for atlantean fishbreeder (see https://wl.widelands.org/forum/topic/4471/)

Revision history for this message

bunnybot (widelandsofficial) wrote on 2019-04-08:

Continuous integration builds have changed state:

Travis build 4683. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/516906606.
Appveyor build 4469. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1764318_barbarian_lore-4469.

Revision history for this message

GunChleoc (gunchleoc) wrote on 2019-04-08:

I have pushed some code fixes. I'll have to review the texts themselves later.

Constructionsites and Dismanlesites are not tribe-specific, so I have removed "Barbarian" from the lore author.

For the Atlantean fishbreeder:

return pgettext("atlanteans_building", [[‘‘Only after the last deer has been shot down 
 Only after the last game has been put to death 
 Only after the last fish has been caught 
 Then will you find that spiders are not to be eaten.’]])

I'd prefer:

return pgettext("atlanteans_building", [[‘‘Only after the last duck has been shot down 
 Only after the last deer has been put to death 
 Only after the last fish has been caught 
 Then will you find that spiders are not to be eaten.’]])

"duck" and "deer" alliterate nicely, and it's more specific than using "game", because deer is also game.

Revision history for this message

bunnybot (widelandsofficial) wrote on 2019-04-08:

Continuous integration builds have changed state:

Travis build 4693. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/517159425.
Appveyor build 4479. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1764318_barbarian_lore-4479.