widelands

Merge lp:~widelands-dev/widelands/bug-1736901-shift-market into lp:widelands

  1. bug-1736901-shift-market
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 8769
Proposed branch: lp:~widelands-dev/widelands/bug-1736901-shift-market
Merge into: lp:widelands
Diff against target: 143 lines (+20/-18)
10 files modified
data/tribes/barbarians.lua (+0/-3)
data/tribes/init.lua (+0/-7)
data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua (+0/-1)
data/tribes/scripting/starting_conditions/barbarians/headquarters.lua (+0/-1)
data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua (+0/-1)
doc/sphinx/extract_rst.py (+2/-2)
src/scripting/lua_root.cc (+2/-1)
test/maps/lua_testsuite.wmf/scripting/tribes_descriptions.lua (+1/-1)
test/maps/market_trading.wmf/scripting/tribes/init.lua (+14/-0)
test/maps/market_trading.wmf/scripting/tribes/market/init.lua (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1736901-shift-market
Reviewer Review Type Date Requested Status
kaputtnik (community) Approve
GunChleoc Needs Resubmitting
Review via email: mp+349630@code.launchpad.net

Commit message

Shifted definition of Barbarian Market building to test scenario

Description of the change

Since we can now have custom scenario building, no need to delete the market building for the release.

To post a comment you must log in.
Revision history for this message
kaputtnik (franku) wrote :

Tested it for the homepage, all fine, the market does not show up anymore :-)

Two tests about lua are failing with this branch:

FAIL: test_get_buildings: [string "scripting/tribes_descriptions.lua"]:31: expected '52' but was '51'!
stack traceback:
        [C]: in global 'error'
        [string "scripting/lunit.lua"]:284: in global 'lunit_do_assert'
        [string "scripting/lunit.lua"]:102: in global 'assert_equal'
        [string "scripting/tribes_descriptions.lua"]:31: in upvalue 'func'
        [string "scripting/lunit.lua"]:425: in function <[string "scripting/lunit.lua"]:425>
        [C]: in global 'xpcall'
        [string "scripting/lunit.lua"]:425: in upvalue 'call'
        [string "scripting/lunit.lua"]:450: in local 'run'
        [string "scripting/lunit.lua"]:476: in global 'lunit_run_testcase'
        [string "scripting/lunit.lua"]:382: in method 'run'
        [string "scripting/init.lua"]:70: in main chunk

Commands i used:

./widelands --datadir=data --datadir_for_testing=. --scenario=test/maps/lua_testsuite.wmf --script=test/maps/lua_testsuite.wmf/scripting/test_lua_in_game.lua

./widelands --datadir=data --datadir_for_testing=. --scenario=test/maps/lua_testsuite.wmf --script=test/maps/lua_testsuite.wmf/scripting/editor_test_lua_in_editor.lua

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3683. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/405430463.
Appveyor build 3482. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1736901_shift_market-3482.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3692. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/405896929.
Appveyor build 3491. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1736901_shift_market-3491.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3694. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/406147484.
Appveyor build 3493. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1736901_shift_market-3493.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Sphinx is fixed, so this branch is ready now

review: Needs Resubmitting
Revision history for this message
kaputtnik (franku) wrote :

LGTM :-)

review: Approve
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks!

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/tribes/barbarians.lua'
2--- data/tribes/barbarians.lua 2017-11-23 09:13:06 +0000
3+++ data/tribes/barbarians.lua 2018-07-20 08:03:30 +0000
4@@ -176,9 +176,6 @@
5 "barbarians_warehouse",
6 "barbarians_port",
7
8- -- Markets
9- "barbarians_market",
10-
11 -- Small
12 "barbarians_quarry",
13 "barbarians_lumberjacks_hut",
14
15=== modified file 'data/tribes/init.lua'
16--- data/tribes/init.lua 2018-05-17 10:02:26 +0000
17+++ data/tribes/init.lua 2018-07-20 08:03:30 +0000
18@@ -370,13 +370,6 @@
19 end)
20
21 -- ===================================
22- -- Markets
23- -- ===================================
24-
25- print_loading_message("┃ Markets", function()
26- include "tribes/buildings/markets/barbarians/market/init.lua"
27- end)
28- -- ===================================
29 -- Productionsites
30 -- ===================================
31
32
33=== modified file 'data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua'
34--- data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua 2017-10-28 06:15:37 +0000
35+++ data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua 2018-07-20 08:03:30 +0000
36@@ -19,7 +19,6 @@
37 sf = shared_in_start
38 else
39 plr:allow_workers("all")
40- plr:forbid_buildings{"barbarians_market"}
41 end
42
43 local h = plr:place_building("barbarians_citadel", sf, false, true)
44
45=== modified file 'data/tribes/scripting/starting_conditions/barbarians/headquarters.lua'
46--- data/tribes/scripting/starting_conditions/barbarians/headquarters.lua 2017-10-28 06:15:37 +0000
47+++ data/tribes/scripting/starting_conditions/barbarians/headquarters.lua 2018-07-20 08:03:30 +0000
48@@ -18,7 +18,6 @@
49 sf = shared_in_start
50 else
51 player:allow_workers("all")
52- player:forbid_buildings{"barbarians_market"}
53 end
54
55 hq = prefilled_buildings(player, { "barbarians_headquarters", sf.x, sf.y,
56
57=== modified file 'data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua'
58--- data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua 2017-10-28 11:53:33 +0000
59+++ data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua 2018-07-20 08:03:30 +0000
60@@ -18,7 +18,6 @@
61 sf = shared_in_start
62 else
63 player:allow_workers("all")
64- player:forbid_buildings{"barbarians_market"}
65 end
66
67 hq = prefilled_buildings(player, { "barbarians_headquarters", sf.x, sf.y,
68
69=== modified file 'doc/sphinx/extract_rst.py'
70--- doc/sphinx/extract_rst.py 2018-05-07 08:06:05 +0000
71+++ doc/sphinx/extract_rst.py 2018-07-20 08:03:30 +0000
72@@ -47,8 +47,8 @@
73 'trainingsite', 'lua_tribes_buildings'),
74 ('data/tribes/buildings/warehouses/atlanteans/headquarters',
75 'warehouse', 'lua_tribes_buildings'),
76- ('data/tribes/buildings/markets/barbarians/market',
77- 'market', 'lua_tribes_buildings'),
78+# ('data/tribes/buildings/markets/barbarians/market',
79+# 'market', 'lua_tribes_buildings'),
80 ('data/tribes/buildings/partially_finished/constructionsite',
81 'constructionsite', 'lua_tribes_buildings'),
82 ('data/tribes/buildings/partially_finished/dismantlesite',
83
84=== modified file 'src/scripting/lua_root.cc'
85--- src/scripting/lua_root.cc 2018-04-07 16:59:00 +0000
86+++ src/scripting/lua_root.cc 2018-07-20 08:03:30 +0000
87@@ -681,7 +681,8 @@
88 return 0;
89 }
90
91-/* RST
92+// TODO(GunChleoc): add RST marker
93+/*
94 .. method:: new_market_type{table}
95
96 Adds a new market building type. Takes a single argument, a table with
97
98=== modified file 'test/maps/lua_testsuite.wmf/scripting/tribes_descriptions.lua'
99--- test/maps/lua_testsuite.wmf/scripting/tribes_descriptions.lua 2017-11-23 09:13:06 +0000
100+++ test/maps/lua_testsuite.wmf/scripting/tribes_descriptions.lua 2018-07-20 08:03:30 +0000
101@@ -28,7 +28,7 @@
102 local tribe = egbase:get_tribe_description("atlanteans")
103 assert_equal(42, #tribe.buildings)
104 tribe = egbase:get_tribe_description("barbarians")
105- assert_equal(52, #tribe.buildings)
106+ assert_equal(51, #tribe.buildings)
107 tribe = egbase:get_tribe_description("empire")
108 assert_equal(52, #tribe.buildings)
109
110
111=== added directory 'test/maps/market_trading.wmf/scripting/tribes'
112=== added file 'test/maps/market_trading.wmf/scripting/tribes/init.lua'
113--- test/maps/market_trading.wmf/scripting/tribes/init.lua 1970-01-01 00:00:00 +0000
114+++ test/maps/market_trading.wmf/scripting/tribes/init.lua 2018-07-20 08:03:30 +0000
115@@ -0,0 +1,14 @@
116+tribes = wl.Tribes()
117+include "scripting/mapobjects.lua"
118+
119+-- ===================================
120+-- Campaign Specific Data
121+-- ===================================
122+print_loading_message("Loading market unit", function()
123+ include "map:scripting/tribes/market/init.lua"
124+end)
125+
126+tribes:add_custom_building {
127+ tribename = "barbarians",
128+ buildingname = "barbarians_market",
129+}
130
131=== renamed directory 'data/tribes/buildings/markets/barbarians/market' => 'test/maps/market_trading.wmf/scripting/tribes/market'
132=== modified file 'test/maps/market_trading.wmf/scripting/tribes/market/init.lua'
133--- data/tribes/buildings/markets/barbarians/market/init.lua 2017-09-20 08:21:31 +0000
134+++ test/maps/market_trading.wmf/scripting/tribes/market/init.lua 2018-07-20 08:03:30 +0000
135@@ -5,7 +5,7 @@
136 -- -------
137 --
138 -- TODO(sirver, trading): Add useful documentation here
139-dirname = path.dirname(__file__)
140+dirname = "test/maps/market_trading.wmf/" .. path.dirname(__file__)
141
142 tribes:new_market_type {
143 msgctxt = "barbarians_building",

Subscribers

People subscribed via source and target branches

to status/vote changes: