[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2018-09-12 Thread bunnybot
Refusing to merge, since Travis is not green. Use @bunnybot merge force for 
merging anyways.

Travis build 3955. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/427787004.
-- 
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/string-fixes.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2018-09-12 Thread bunnybot
Continuous integration builds have changed state:

Travis build 3955. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/427787004.
Appveyor build 3753. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-3753.
-- 
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/string-fixes.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2018-09-12 Thread GunChleoc
@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/string-fixes.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands

2018-09-12 Thread Notabilis
Thanks for the bug report, the local fix and the review. Your remarks are 
hopefully all fixed now.
Do we need a translator comment for both occurrences of "Replace with %s" or is 
one comment enough when it is the same string?
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1434875-net-client-disconnect/+merge/354531
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable into lp:widelands

2018-09-12 Thread bunnybot
Continuous integration builds have changed state:

Travis build 3949. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/427562201.
Appveyor build 3747. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1772168_unused_key_in_luatable-3747.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1772168-unused-key-in-luatable/+merge/354202
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands

2018-09-12 Thread bunnybot
Continuous integration builds have changed state:

Travis build 3948. State: errored. Details: 
https://travis-ci.org/widelands/widelands/builds/427560056.
Appveyor build 3746. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1751440_smugglers_desync_single_coroutine-3746.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine/+merge/354747
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into 
lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2018-09-12 Thread hessenfarmer
Review: Approve

changes look good for me:


-- 
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/string-fixes.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into lp:widelands

2018-09-12 Thread noreply
The proposal to merge 
lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow/+merge/354179
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/rework-resource-indicators into lp:widelands

2018-09-12 Thread GunChleoc
Review: Approve

Yes, we have a winner :D

@bunnybot merge


> I´ve lost count the how-many-th version this is ;)

Me too... I find code easier to review *lol*
-- 
https://code.launchpad.net/~widelands-dev/widelands/rework-resource-indicators/+merge/353996
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/rework-resource-indicators.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2018-09-12 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into 
lp:widelands.

Commit message:
2 string fixes

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
  https://bugs.launchpad.net/widelands/+bug/1421942
  Bug #1487887 in widelands: "Translation missing in editor and in replay 
tooltip"
  https://bugs.launchpad.net/widelands/+bug/1487887
  Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the 
battle ax"
  https://bugs.launchpad.net/widelands/+bug/1530240
  Bug #1530398 in widelands: "Wrong text above marble mine"
  https://bugs.launchpad.net/widelands/+bug/1530398
  Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
  https://bugs.launchpad.net/widelands/+bug/1547909

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/campaigns/tutorial04_economy.wmf/scripting/texts.lua'
--- data/campaigns/tutorial04_economy.wmf/scripting/texts.lua	2018-05-01 20:35:22 +
+++ data/campaigns/tutorial04_economy.wmf/scripting/texts.lua	2018-09-12 15:59:25 +
@@ -231,7 +231,7 @@
   div("width=100%", div("float=left padding_r=14 padding_t=5",p(img("images/logos/wl-ico-32.png"))) .. p(_[[The ‘General’ tab contains information about all the basic interface controls for Widelands. Furthermore, you can find tips that are relevant for your tribe there.]])) ..
   div("width=100%", div("float=left padding_r=18 padding_t=15 padding_b=15 padding_l=4",p(img("images/wui/buildings/menu_tab_wares.png"))) .. p(_[[The ‘Wares’ tab shows information about the wares that your tribe needs, including a short help text, a list of buildings that produce each ware, the needed wares to produce it and where the ware is consumed.]])) ..
   div("width=100%", div("float=left padding_r=16",p(img("images/wui/buildings/menu_tab_workers.png"))) .. p(_[[The ‘Workers’ tab shows information about your tribe’s workers in a similar manner to the wares in the second tab.]])) ..
-  div("width=100%", div("float=left padding_r=18 padding_t=5 padding_l=4",p(img("images/wui/stats/genstats_nrbuildings.png"))) .. p(_[[The ‘Buldings’ tab contains all the necessary information about the buildings of your tribe.]])) ..
+  div("width=100%", div("float=left padding_r=18 padding_t=5 padding_l=4",p(img("images/wui/stats/genstats_nrbuildings.png"))) .. p(_[[The ‘Buildings’ tab contains all the necessary information about the buildings of your tribe.]])) ..
   li_image("tribes/immovables/field_harvested/idle_00.png", _[[Finally, the ‘Immovables’ tab shows information about the specific immovables that your tribe’s workers can place on the map.]]) ..
   li(_[[Now use the encyclopedia to find out how to create new soldiers.]]) ..
   li_arrow(_[[A soldier needs a wooden spear and a helmet – from there on out, you can search backwards to find the wares and the buildings you need to supply your barracks where the soldier is recruited. When you are finished, just close the encyclopedia window.]])

=== modified file 'data/tribes/wares/granite/helptexts.lua'
--- data/tribes/wares/granite/helptexts.lua	2018-05-02 10:12:31 +
+++ data/tribes/wares/granite/helptexts.lua	2018-09-12 15:59:25 +
@@ -7,7 +7,7 @@
   -- TRANSLATORS: Helptext for a ware: Granite
   barbarians = pgettext("barbarians_ware", "The Barbarians produce granite blocks in quarries and granite mines."),
   -- TRANSLATORS: Helptext for a ware: Granite
-  frisians = pgettext("frisians_ware", "The Frisians produce granite blocks in quarries and rock mines. They can be refined by a brick burner."),
+  frisians = pgettext("frisians_ware", "The Frisians produce granite blocks in quarries and rock mines. They can be refined in a brick kiln."),
   -- TRANSLATORS: Helptext for a ware: Granite
   empire = pgettext("empire_ware", "The Empire produces granite blocks in quarries and marble mines.")
}

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands

2018-09-12 Thread bunnybot
Continuous integration builds have changed state:

Travis build 3945. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/427533795.
Appveyor build 3743. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1434875_net_client_disconnect-3743.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1434875-net-client-disconnect/+merge/354531
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation into lp:widelands

2018-09-12 Thread noreply
The proposal to merge 
lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1766957-sinking-ship-animation/+merge/353746
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ferry into lp:widelands

2018-09-12 Thread Benedikt Straub
The proposal to merge lp:~widelands-dev/widelands/ferry into lp:widelands has 
been updated.

Status: Needs review => Work in progress

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/ferry into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/rework-resource-indicators into lp:widelands

2018-09-12 Thread Benedikt Straub
I´ve lost count the how-many-th version this is ;)
I find only one strip of cloth hard to see, unless it´s very broad. How about 
these new crossed silk strips?
-- 
https://code.launchpad.net/~widelands-dev/widelands/rework-resource-indicators/+merge/353996
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/rework-resource-indicators.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation into lp:widelands

2018-09-12 Thread GunChleoc
@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1766957-sinking-ship-animation/+merge/353746
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands

2018-09-12 Thread bunnybot
Continuous integration builds have changed state:

Travis build 3943. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/427411087.
Appveyor build 3741. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1791891_key_modifier_inputqueue-3741.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands

2018-09-12 Thread Benedikt Straub
Review: Approve code

Code LGTM, not tested.
Thanks!
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/rework-resource-indicators into lp:widelands

2018-09-12 Thread GunChleoc
Empire is good now :)

Atlantean "none" still signals to me that there is something important there - 
it's visually too busy. Try just 1 strip of cloth in the middle and remove the 
3rd pole?
-- 
https://code.launchpad.net/~widelands-dev/widelands/rework-resource-indicators/+merge/353996
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/rework-resource-indicators.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands

2018-09-12 Thread GunChleoc
There is also some NOCOM log output for testing that we need to delete before 
merging.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine/+merge/354747
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into 
lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands

2018-09-12 Thread GunChleoc
For testing, hack the player_names packet and change the tribes there. You can 
also replace some players with empty AI if you don't want to run 4 instances of 
Widelands.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine/+merge/354747
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into 
lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands

2018-09-12 Thread GunChleoc
GunChleoc has proposed merging 
lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into 
lp:widelands.

Commit message:
Fixed desync in the Smugglers scenario by using a single coroutine and 
selecting the wares round robin. The scenario can now be played with any tribe 
combination as soon as we implement the selection code in the UI.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1751440 in widelands: "Desync in Smugglers scenario"
  https://bugs.launchpad.net/widelands/+bug/1751440

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine/+merge/354747
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into 
lp:widelands.
=== modified file 'data/maps/MP_Scenarios/Smugglers.wmf/scripting/multiplayer_init.lua'
--- data/maps/MP_Scenarios/Smugglers.wmf/scripting/multiplayer_init.lua	2017-12-10 10:52:45 +
+++ data/maps/MP_Scenarios/Smugglers.wmf/scripting/multiplayer_init.lua	2018-09-12 06:21:05 +
@@ -17,19 +17,6 @@
 
 points_to_win = 2000
 
-route_descrs = {
-   { value = 2, send = map:get_field(35, 52):region(2), recv = map:get_field(96, 77):region(2) },
-   { value = 2, send = map:get_field(98, 55):region(2), recv = map:get_field(34, 76):region(2) },
-
-   { value = 3, send = map:get_field(64, 57):region(2), recv = map:get_field(78, 73):region(2) },
-   { value = 3, send = map:get_field(77, 58):region(2), recv = map:get_field(65, 72):region(2) },
-
-   { value = 2, send = map:get_field(62, 93):region(2), recv = map:get_field(78, 34):region(2) },
-   { value = 2, send = map:get_field(80, 95):region(2), recv = map:get_field(63, 29):region(2) },
-   { value = 2, send = map:get_field(18, 66):region(2), recv = map:get_field(121, 61):region(2) },
-   { value = 2, send = map:get_field(124, 72):region(2), recv = map:get_field(19, 57):region(2) }
-}
-
 -- =
 -- Global Variables
 -- =
@@ -41,66 +28,48 @@
 -- 
 -- Initializations
 -- 
+
+-- If the tribes don't have any wares in common, nothing can be smuggled
+-- This should not happen, but let's have a safeguard anyway.
+function check_ware_compatiblity(player1, player2)
+   local has_compatible_ware = false
+   for idx,ware in pairs(player1.tribe.wares) do
+  if player2.tribe:has_ware(ware.name) then
+ has_compatible_ware = true
+ break
+  end
+   end
+   if not has_compatible_ware then
+  do_game_over()
+   end
+end
+
 function assign_teams()
game.players[1].team = 1
game.players[2].team = 1
game.players[3].team = 2
game.players[4].team = 2
+   check_ware_compatiblity(game.players[1], game.players[2])
+   check_ware_compatiblity(game.players[3], game.players[4])
 end
 
 function place_headquarters()
+   include "map:scripting/starting_conditions.lua"
for idx,player in ipairs(game.players) do
   local sf = map.player_slots[player.number].starting_field
-
-  prefilled_buildings(player, { "barbarians_headquarters", sf.x, sf.y,
- wares = {
-ax = 5,
-bread_paddle = 2,
-blackwood = 32,
-cloth = 5,
-coal = 12,
-felling_ax = 4,
-fire_tongs = 2,
-fish = 6,
-fishing_rod = 2,
-gold = 4,
-grout = 12,
-hammer = 12,
-hunting_spear = 2,
-iron = 12,
-iron_ore = 5,
-kitchen_tools = 4,
-meal = 4,
-meat = 6,
-pick = 14,
-barbarians_bread = 8,
-ration = 12,
-granite = 40,
-scythe = 6,
-shovel = 4,
-snack = 3,
-thatch_reed = 24,
-log = 80,
- },
- workers = {
-barbarians_blacksmith = 2,
-barbarians_brewer = 1,
-barbarians_builder = 10,
-barbarians_carrier = 40,
-barbarians_charcoal_burner = 1,
-barbarians_gardener = 1,
-barbarians_geologist = 4,
-barbarians_lime_burner = 1,
-barbarians_lumberjack = 3,
-barbarians_miner = 4,
-barbarians_ranger = 1,
-barbarians_stonemason = 2,
-barbarians_ox = 5,
- },
- soldiers = {
-[{0,0,0,0}] = 45,
- }
-  })
+  local tribename = player.tribe.name
+  if tribename == "barbarians" then
+ set_starting_conditions_barbarians(player, sf)
+  elseif tribename == "empire" then
+ set_starting_conditions_empire(player, sf)
+  elseif tribename == "atlanteans" then
+ set_starting_conditions_atlanteans(player, sf)
+  elseif tribename == "frisians" then
+ set_starting_conditions_frisians(player, sf)
+  else
+ print("We 

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands

2018-09-12 Thread GunChleoc
The proposal to merge 
lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into 
lp:widelands has been updated.

Commit message changed to:

Fixed desync in the Smugglers scenario by using a single coroutine and 
selecting the wares round robin. The scenario can now be played with any tribe 
combination as soon as we implement the selection code in the UI.

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine/+merge/354747
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into 
lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into lp:widelands

2018-09-12 Thread GunChleoc
Thanks for the review :)

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow/+merge/354179
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable into lp:widelands

2018-09-12 Thread GunChleoc
That's a missing include.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1772168-unused-key-in-luatable/+merge/354202
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp