Merge lp:~widelands-dev/widelands/hide_seafaring_buildings into lp:widelands

[GunChleoc]

Shipyards and Barbarian Weaving Mill are hidden from the flag actions in non-seafaring maps. This prevents players from building completely useless seafaring buildings, especially when they are new to the game. The buildings are still listed in the Encyclopedia.

I implemented it like this:

Added a new "needs_seafaring" property to buildings' init.lua. When this is set and the map doesn't have a need for ships, these buildings are hidden from the building window. Might also come in useful for the AI?

[TiborB (tiborb95)]

This is usefull tweak.

AI just scans the map to identify portspaces - yes, small cheat...

However barbarian weaving mill might still be build if it finds out that the output is needed... but right now I dont know if it happens....

review: Approve

=== modified file 'src/logic/building.cc'
--- src/logic/building.cc	2015-11-11 09:53:54 +0000
+++ src/logic/building.cc	2015-11-27 15:18:43 +0000
@@ -159,6 +159,8 @@
 
 	directory_ = table.get_string("directory");
 
+	m_needs_seafaring = table.has_key("needs_seafaring") ? table.get_bool("needs_seafaring") : false;
+
 	if (table.has_key("vision_range")) {
 		m_vision_range = table.get_int("vision_range");
 	}
 
=== modified file 'src/logic/building.h'
--- src/logic/building.h	2015-11-11 09:53:54 +0000
+++ src/logic/building.h	2015-11-27 15:18:43 +0000
@@ -95,6 +95,7 @@
 	int32_t get_size() const {return m_size;}
 	bool get_ismine() const {return m_mine;}
 	bool get_isport() const {return m_port;}
+	bool needs_seafaring() const {return m_needs_seafaring;}
 
 	// Returns the enhancement this building can become or
 	// INVALID_INDEX if it cannot be enhanced.
@@ -144,6 +145,7 @@
 	int32_t       m_size;            // size of the building
 	bool          m_mine;
 	bool          m_port;
+	bool          m_needs_seafaring; // This building should only be built on seafaring maps.
 	DescriptionIndex  m_enhancement;
 	DescriptionIndex  m_enhanced_from; // The building this building was enhanced from, or INVALID_INDEX
 	bool          m_enhanced_building; // if it is one, it is bulldozable
 
=== modified file 'src/wui/fieldaction.cc'
--- src/wui/fieldaction.cc	2015-11-20 18:16:22 +0000
+++ src/wui/fieldaction.cc	2015-11-27 15:18:43 +0000
@@ -507,6 +507,8 @@
 		if (dynamic_cast<const Game *>(&ibase().egbase())) {
 			if (!building_descr->is_buildable() || !m_plr->is_building_type_allowed(building_index))
 				continue;
+			if (building_descr->needs_seafaring() && ibase().egbase().map().get_port_spaces().size() < 2)
+				continue;
 		} else if (!building_descr->is_buildable() && !building_descr->is_enhanced())
 			continue;
 
 
=== modified file 'tribes/buildings/productionsites/atlanteans/shipyard/init.lua'
--- tribes/buildings/productionsites/atlanteans/shipyard/init.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/atlanteans/shipyard/init.lua	2015-11-27 15:18:43 +0000
@@ -8,6 +8,7 @@
    directory = dirname,
    icon = dirname .. "menu.png",
    size = "medium",
+   needs_seafaring = true,
 
    buildcost = {
       log = 3,
 
=== modified file 'tribes/buildings/productionsites/barbarians/shipyard/init.lua'
--- tribes/buildings/productionsites/barbarians/shipyard/init.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/barbarians/shipyard/init.lua	2015-11-27 15:18:43 +0000
@@ -8,6 +8,7 @@
    directory = dirname,
    icon = dirname .. "menu.png",
    size = "medium",
+   needs_seafaring = true,
 
    buildcost = {
       log = 3,
@@ -74,7 +75,7 @@
          -- TRANSLATORS: Completed/Skipped/Did not start constructing a ship because ...
          descname = _"constructing a ship",
          actions = {
-            "check_map=seafaring", -- TODO(GunChleoc): We should make this check on game creation as well and remove it from the allowed buildings
+            "check_map=seafaring",
             "construct=barbarians_shipconstruction buildship 6",
             "animate=working 35000",
             "return=completed"
 
=== modified file 'tribes/buildings/productionsites/barbarians/weaving_mill/init.lua'
--- tribes/buildings/productionsites/barbarians/weaving_mill/init.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/barbarians/weaving_mill/init.lua	2015-11-27 15:18:43 +0000
@@ -8,6 +8,7 @@
    directory = dirname,
    icon = dirname .. "menu.png",
    size = "big",
+   needs_seafaring = true,
 
    buildcost = {
       log = 5,
@@ -58,6 +59,7 @@
          descname = _"weaving",
          actions = {
             "sleep=20000",
+            "check_map=seafaring",
             "return=skipped unless economy needs cloth",
             "consume=thatch_reed",
             "animate=working 25000",
 
=== modified file 'tribes/buildings/productionsites/empire/shipyard/init.lua'
--- tribes/buildings/productionsites/empire/shipyard/init.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/empire/shipyard/init.lua	2015-11-27 15:18:43 +0000
@@ -8,6 +8,7 @@
    directory = dirname,
    icon = dirname .. "menu.png",
    size = "medium",
+   needs_seafaring = true,
 
    buildcost = {
       log = 3,