widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1639514_fix_yellow_player into lp:widelands with lp:~widelands-dev/widelands/fix_infrastructure_return_values as a prerequisite.

Commit message:
Use ai="empty" for second barbarian campaign

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1639514 in widelands: "Barbarian campaing, scenario 2: yellow brother bails out"
  https://bugs.launchpad.net/widelands/+bug/1639514

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1639514_fix_yellow_player/+merge/337507

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

This fixes bug 1639514
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1639514_fix_yellow_player into lp:widelands.

=== 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-10 14:47:14 +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-10 14:47:14 +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
 -- =======================================================================