widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1736901-shift-market into lp:widelands.

Commit message:
Shifted definition of Barbarian Market building to test scenario

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1736901 in widelands: "Remove market from release branch if trading unfinished"
  https://bugs.launchpad.net/widelands/+bug/1736901

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1736901-shift-market/+merge/349630

Since we can now have custom scenario building, no need to delete the market building for the release.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1736901-shift-market into lp:widelands.

=== modified file 'data/tribes/barbarians.lua'
--- data/tribes/barbarians.lua	2017-11-23 09:13:06 +0000
+++ data/tribes/barbarians.lua	2018-07-15 10:45:28 +0000
@@ -176,9 +176,6 @@
       "barbarians_warehouse",
       "barbarians_port",
 
-      -- Markets
-      "barbarians_market",
-
       -- Small
       "barbarians_quarry",
       "barbarians_lumberjacks_hut",

=== modified file 'data/tribes/init.lua'
--- data/tribes/init.lua	2018-05-17 10:02:26 +0000
+++ data/tribes/init.lua	2018-07-15 10:45:28 +0000
@@ -370,13 +370,6 @@
    end)
 
    -- ===================================
-   --    Markets
-   -- ===================================
-
-   print_loading_message("┃    Markets", function()
-      include "tribes/buildings/markets/barbarians/market/init.lua"
-   end)
-   -- ===================================
    --    Productionsites
    -- ===================================
 

=== modified file 'data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua'
--- data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua	2017-10-28 06:15:37 +0000
+++ data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua	2018-07-15 10:45:28 +0000
@@ -19,7 +19,6 @@
          sf = shared_in_start
       else
          plr:allow_workers("all")
-         plr:forbid_buildings{"barbarians_market"}
       end
 
       local h = plr:place_building("barbarians_citadel", sf, false, true)

=== modified file 'data/tribes/scripting/starting_conditions/barbarians/headquarters.lua'
--- data/tribes/scripting/starting_conditions/barbarians/headquarters.lua	2017-10-28 06:15:37 +0000
+++ data/tribes/scripting/starting_conditions/barbarians/headquarters.lua	2018-07-15 10:45:28 +0000
@@ -18,7 +18,6 @@
       sf = shared_in_start
    else
       player:allow_workers("all")
-      player:forbid_buildings{"barbarians_market"}
    end
 
    hq = prefilled_buildings(player, { "barbarians_headquarters", sf.x, sf.y,

=== modified file 'data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua'
--- data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua	2017-10-28 11:53:33 +0000
+++ data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua	2018-07-15 10:45:28 +0000
@@ -18,7 +18,6 @@
          sf = shared_in_start
       else
          player:allow_workers("all")
-         player:forbid_buildings{"barbarians_market"}
       end
 
       hq = prefilled_buildings(player, { "barbarians_headquarters", sf.x, sf.y,

=== added directory 'test/maps/market_trading.wmf/scripting/tribes'
=== added file 'test/maps/market_trading.wmf/scripting/tribes/init.lua'
--- test/maps/market_trading.wmf/scripting/tribes/init.lua	1970-01-01 00:00:00 +0000
+++ test/maps/market_trading.wmf/scripting/tribes/init.lua	2018-07-15 10:45:28 +0000
@@ -0,0 +1,14 @@
+tribes = wl.Tribes()
+include "scripting/mapobjects.lua"
+
+-- ===================================
+--    Campaign Specific Data
+-- ===================================
+print_loading_message("Loading market unit", function()
+   include "map:scripting/tribes/market/init.lua"
+end)
+
+tribes:add_custom_building {
+   tribename = "barbarians",
+   buildingname = "barbarians_market",
+}

=== renamed directory 'data/tribes/buildings/markets/barbarians/market' => 'test/maps/market_trading.wmf/scripting/tribes/market'
=== modified file 'test/maps/market_trading.wmf/scripting/tribes/market/init.lua'
--- data/tribes/buildings/markets/barbarians/market/init.lua	2017-09-20 08:21:31 +0000
+++ test/maps/market_trading.wmf/scripting/tribes/market/init.lua	2018-07-15 10:45:28 +0000
@@ -5,7 +5,7 @@
 -- -------
 --
 -- TODO(sirver, trading): Add useful documentation here
-dirname = path.dirname(__file__)
+dirname = "test/maps/market_trading.wmf/" .. path.dirname(__file__)
 
 tribes:new_market_type {
    msgctxt = "barbarians_building",