Merge lp:~widelands-dev/widelands/bug-1639514_fix_yellow_player into lp:widelands

[kaputtnik]

Use ai="empty" for second barbarian campaign

Use ai="empty" (=no ai) for the yellow player, manually connect the buildings with roads (looks nicer).

This fixes bug 1639514

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3163. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/339870358.
Appveyor build 2970. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1639514_fix_yellow_player-2970.

[GunChleoc (gunchleoc)]

LGTM :)

@bunnybot merge

review: Approve

[kaputtnik (franku)]

Thanks :-)

[Tino (tino79)]

Has anyone an idea, why this was not merged to trunk by now?
Interestingly it is already merged on github to master: https://github.com/widelands/widelands/commit/4b2baddcdcd635b4c4b07490ea43efcbb20e2df9

[kaputtnik (franku)]

No idea... the branch is merged in revision 8588 at: 2018-02-13 02:17:15 UTC. This could be seen when pulling trunk and also if you watch the source code https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/files

Maybe launchpad is confused?

[GunChleoc (gunchleoc)]

Running a translation update on trunk regenerated the Launchpad state :)

=== modified file 'data/campaigns/bar02.wmf/player_names'
--- data/campaigns/bar02.wmf/player_names	2015-12-06 12:40:37 +0000
+++ data/campaigns/bar02.wmf/player_names	2018-02-12 17:07:42 +0000
@@ -15,7 +15,7 @@
 [player_3]
 name="First Brother"
 tribe="barbarians"
-ai="normal"
+ai="empty"
 
 [player_4]
 name="Second Brother"

=== modified file 'data/campaigns/bar02.wmf/scripting/starting_conditions.lua'
--- data/campaigns/bar02.wmf/scripting/starting_conditions.lua	2015-10-31 12:11:44 +0000
+++ data/campaigns/bar02.wmf/scripting/starting_conditions.lua	2018-02-12 17:07:42 +0000
@@ -94,7 +94,7 @@
 --                                 Player 3
 -- =======================================================================
 p3:forbid_buildings("all")
-prefilled_buildings(p3,
+local b_table = prefilled_buildings(p3,
    {"barbarians_sentry", 137, 87, soldiers = {[{0,0,0,0}]=2}},
    {"barbarians_barrier", 130, 86, soldiers = {[{0,0,0,0}]=4}},
    {"barbarians_barrier", 132, 82, soldiers = {[{0,0,0,0}]=4}},
@@ -106,6 +106,12 @@
    }}
 )
 
+-- This player has no AI so we build some roads for him
+connected_road(p3, b_table[1].flag, "l, tl, tl" )
+connected_road(p3, b_table[2].flag, "r, r, r, r, r, tr")
+connected_road(p3, b_table[3].flag, "bl, bl, bl, bl" )
+connected_road(p3, b_table[5].flag, "br, br, bl, bl" )
+
 -- =======================================================================
 --                                 Player 4
 -- =======================================================================