Tribes filtering

data/campaigns/emp04.wmf/scripting/tribes/brewery1/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_brewery1 = {},
+}

data/campaigns/emp04.wmf/scripting/tribes/brewery2/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_brewery2 = {},
+}

data/campaigns/emp04.wmf/scripting/tribes/farm1/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_farm1 = {},
+}

data/campaigns/emp04.wmf/scripting/tribes/farm2/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_farm2 = {},
+}

data/campaigns/emp04.wmf/scripting/tribes/foresters_house1/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_foresters_house1 = {},
+}

data/campaigns/emp04.wmf/scripting/tribes/init.lua

@@ -1,81 +1,76 @@
-tribes = wl.Tribes()
-include "scripting/mapobjects.lua"
+-- RST
+-- .. _scenario_units:
+--
+-- Scenario-Specific Units
+-- -----------------------
+--
+-- When writing a scenario, you can create custom tribe objects for it.
+-- At the moment, we support buildings, wares and workers.
+-- If you need support for other types of tribe units, please open a new bug report.
+--
+-- For creating scenario-specific tribe objects, create a subdirectory
+-- ``scripting/tribes`` in your map.
+-- In that subdirectory, place a file called ``init.lua``.
+-- This file needs to return a table listing all the objects that the tribes do
+-- not have by default. For example:
+--
+-- .. code-block:: lua
+--
+--    return {
+--       empire = {
+--          buildings = {
+--             "empire_brewery1",
+--             "empire_brewery2",
+--             "empire_well1",
+--             "empire_temple_of_vesta"
+--          }
+--          workers_order = {
+--             {
+--                "empire_vesta_priestess"
+--             },
+--          },
+--          wares_order = {
+--             {
+--                "empire_vesta_wine"
+--             },
+--          }
+--       },
+--       frisians = {
+--          buildings = {
+--             "frisians_warehouse1"
+--          }
+--       }
+--    }
+--
+-- If you are only replacing already existing objects, you can skip adding the
+-- ``init.lua`` file.
+--
+-- Now place your custom tribe objects into subdirectories below ``scripting/tribes``:
+--
+-- * In each subdirectory, there needs to be an ``init.lua`` file that adds all
+--   objects for that subdirectory.
+--   If an object has the same name as an already existing tribe object,
+--   it will replace that tribe object.
+-- * You will also need to add a ``register.lua`` file that lists the names of all
+--   objects that you are adding or replacing.
+-- * You can also add ``helptexts.lua`` and ``.png`` files to your subdirectories.
+--
+-- See :ref:`defining_tribe_units` for further details on these files.
 
-push_textdomain("scenario_emp04.wmf")
-
--- ===================================
---    Campaign Specific Data
--- ===================================
-print_loading_message(_("Loading campaign-specific tribe units"), function()
-   -- ===================================
-   --    Empire Mission 4
-   -- ===================================
-   include "map:scripting/tribes/brewery2.lua"
-   include "map:scripting/tribes/brewery1.lua"
-   include "map:scripting/tribes/farm2.lua"
-   include "map:scripting/tribes/farm1.lua"
-   include "map:scripting/tribes/foresters_house1.lua"
-   include "map:scripting/tribes/lumberjacks_house1.lua"
-   include "map:scripting/tribes/mill2.lua"
-   include "map:scripting/tribes/mill1.lua"
-   include "map:scripting/tribes/trainingcamp1.lua"
-   include "map:scripting/tribes/well1.lua"
-   include "map:scripting/tribes/temple_of_vesta.lua"
-end)
-
-tribes:add_custom_building {
-   tribename = "empire",
-   buildingname = "empire_brewery1",
-}
-
-tribes:add_custom_building {
-   tribename = "empire",
-   buildingname = "empire_brewery2",
-}
-
-tribes:add_custom_building {
-   tribename = "empire",
-   buildingname = "empire_farm1",
-}
-
-tribes:add_custom_building {
-   tribename = "empire",
-   buildingname = "empire_farm2",
-}
-
-tribes:add_custom_building {
-   tribename = "empire",
-   buildingname = "empire_foresters_house1",
-}
-
-tribes:add_custom_building {
-   tribename = "empire",
-   buildingname = "empire_lumberjacks_house1",
+return {
+   empire = {
+      buildings = {
+         "empire_brewery1",
+         "empire_brewery2",
+         "empire_farm1",
+         "empire_farm2",
+         "empire_foresters_house1",
+         "empire_lumberjacks_house1",
+         "empire_mill1",
+         "empire_mill2",
+         "empire_trainingcamp1",
+         "empire_well1",
+         "empire_temple_of_vesta"
+      }
+   }
 }
-
-tribes:add_custom_building {
-   tribename = "empire",
-   buildingname = "empire_mill1",
-}
-
-tribes:add_custom_building {
-   tribename = "empire",
-   buildingname = "empire_mill2",
-}
-
-tribes:add_custom_building {
-   tribename = "empire",
-   buildingname = "empire_trainingcamp1",
-}
-
-tribes:add_custom_building {
-   tribename = "empire",
-   buildingname = "empire_well1",
-}
-
-tribes:add_custom_building {
-   tribename = "empire",
-   buildingname = "empire_temple_of_vesta",
-}
-
-pop_textdomain()

data/campaigns/emp04.wmf/scripting/tribes/lumberjacks_house1/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_lumberjacks_house1 = {},
+}

data/campaigns/emp04.wmf/scripting/tribes/mill1/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_mill1 = {},
+}

data/campaigns/emp04.wmf/scripting/tribes/mill2/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_mill2 = {},
+}

data/campaigns/emp04.wmf/scripting/tribes/temple_of_vesta.lua → data/campaigns/emp04.wmf/scripting/tribes/temple_of_vesta/init.lua

@@ -7,7 +7,7 @@ tribes:new_warehouse_type {
    name = "empire_temple_of_vesta",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Temple of Vesta"),
-   helptext_script = "campaigns/emp04.wmf/scripting/tribes/vesta_helptexts.lua",
+   helptext_script = path.dirname(__file__) .. "helptexts.lua",
    icon = dirname .. "menu.png",
    size = "medium",
 

data/campaigns/emp04.wmf/scripting/tribes/temple_of_vesta/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_temple_of_vesta = {},
+}

data/campaigns/emp04.wmf/scripting/tribes/trainingcamp1/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_trainingcamp1 = {},
+}

data/campaigns/emp04.wmf/scripting/tribes/well1/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_well1 = {},
+}

data/campaigns/fri02.wmf/scripting/tribes/init.lua

@@ -1,11 +1,11 @@
-tribes = wl.Tribes()
-include "scripting/mapobjects.lua"
+-- ===================================
+--    Campaign Specific Data
+-- ===================================
 
-print_loading_message("Loading campaign-specific tribe units", function()
-   include "map:scripting/tribes/warehouse_empire.lua"
-end)
-
-tribes:add_custom_building {
-   tribename = "frisians",
-   buildingname = "frisians_warehouse_empire",
+return {
+   frisians = {
+      buildings = {
+         "frisians_warehouse_empire",
+      }
+   }
 }

data/campaigns/fri02.wmf/scripting/tribes/warehouse/register.lua

@@ -0,0 +1,3 @@
+return {
+   frisians_warehouse_empire = {},
+}

data/tribes/atlanteans.lua

@@ -66,6 +66,8 @@
 --       }
 --
 
+tribes = wl.Tribes()
+
 image_dirname = path.dirname(__file__) .. "images/atlanteans/"
 
 tribes:new_tribe {

data/tribes/barbarians.lua

@@ -1,3 +1,5 @@
+tribes = wl.Tribes()
+
 image_dirname = path.dirname(__file__) .. "images/barbarians/"
 
 tribes:new_tribe {

data/tribes/buildings/militarysites/atlanteans/castle/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_castle = {},
+}

data/tribes/buildings/militarysites/atlanteans/guardhall/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_guardhall = {},
+}

data/tribes/buildings/militarysites/atlanteans/guardhouse/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_guardhouse = {},
+}

data/tribes/buildings/militarysites/atlanteans/tower/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_tower = {},
+}

data/tribes/buildings/militarysites/atlanteans/tower_high/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_tower_high = {},
+}

data/tribes/buildings/militarysites/atlanteans/tower_small/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_tower_small = {},
+}

data/tribes/buildings/militarysites/barbarians/barrier/register.lua

@@ -0,0 +1,3 @@
+return {
+   barbarians_barrier = {},
+}

data/tribes/buildings/militarysites/barbarians/citadel/register.lua

@@ -0,0 +1,3 @@
+return {
+   barbarians_citadel = {},
+}

data/tribes/buildings/militarysites/barbarians/fortress/register.lua

@@ -0,0 +1,3 @@
+return {
+   barbarians_fortress = {},
+}

data/tribes/buildings/militarysites/barbarians/sentry/register.lua

@@ -0,0 +1,3 @@
+return {
+   barbarians_sentry = {},
+}

data/tribes/buildings/militarysites/barbarians/tower/register.lua

@@ -0,0 +1,3 @@
+return {
+   barbarians_tower = {},
+}

data/tribes/buildings/militarysites/empire/barrier/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_barrier = {},
+}

data/tribes/buildings/militarysites/empire/blockhouse/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_blockhouse = {},
+}

data/tribes/buildings/militarysites/empire/castle/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_castle = {},
+}

data/tribes/buildings/militarysites/empire/fortress/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_fortress = {},
+}

data/tribes/buildings/militarysites/empire/outpost/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_outpost = {},
+}

data/tribes/buildings/militarysites/empire/sentry/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_sentry = {},
+}

data/tribes/buildings/militarysites/empire/tower/register.lua

@@ -0,0 +1,3 @@
+return {
+   empire_tower = {},
+}

data/tribes/buildings/militarysites/frisians/fortress/register.lua

@@ -0,0 +1,3 @@
+return {
+   frisians_fortress = {},
+}

data/tribes/buildings/militarysites/frisians/outpost/register.lua

@@ -0,0 +1,3 @@
+return {
+   frisians_outpost = {},
+}

data/tribes/buildings/militarysites/frisians/sentinel/register.lua

@@ -0,0 +1,3 @@
+return {
+   frisians_sentinel = {},
+}

data/tribes/buildings/militarysites/frisians/tower/register.lua

@@ -0,0 +1,3 @@
+return {
+   frisians_tower = {},
+}

data/tribes/buildings/militarysites/frisians/wooden_tower/register.lua

@@ -0,0 +1,3 @@
+return {
+   frisians_wooden_tower = {},
+}

data/tribes/buildings/militarysites/frisians/wooden_tower_high/register.lua

@@ -0,0 +1,3 @@
+return {
+   frisians_wooden_tower_high = {},
+}

data/tribes/buildings/partially_finished/constructionsite/register.lua

@@ -0,0 +1,3 @@
+return {
+   constructionsite = {},
+}

data/tribes/buildings/partially_finished/dismantlesite/register.lua

@@ -0,0 +1,3 @@
+return {
+   dismantlesite = {},
+}

data/tribes/buildings/productionsites/atlanteans/armorsmithy/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_armorsmithy = {},
+}

data/tribes/buildings/productionsites/atlanteans/bakery/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_bakery = {},
+}

data/tribes/buildings/productionsites/atlanteans/barracks/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_barracks = {},
+}

data/tribes/buildings/productionsites/atlanteans/blackroot_farm/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_blackroot_farm = {},
+}

data/tribes/buildings/productionsites/atlanteans/charcoal_kiln/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_charcoal_kiln = {},
+}

data/tribes/buildings/productionsites/atlanteans/coalmine/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_coalmine = {},
+}

data/tribes/buildings/productionsites/atlanteans/crystalmine/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_crystalmine = {},
+}

data/tribes/buildings/productionsites/atlanteans/farm/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_farm = {},
+}

data/tribes/buildings/productionsites/atlanteans/ferry_yard/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_ferry_yard = {},
+}

data/tribes/buildings/productionsites/atlanteans/fishbreeders_house/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_fishbreeders_house = {},
+}

data/tribes/buildings/productionsites/atlanteans/fishers_house/register.lua

@@ -0,0 +1,3 @@
+return {
+   atlanteans_fishers_house = {},
+}