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

[kaputtnik]

Changing the is values in world/terrains/init.lua and the terms for is-value related things in C++ code.

dead -> unreachable
mountain -> minebale
green -> arable
dry -> walkable
impassable -> unwalkable

This version change also the strings for the editor_info_tool to reflect the changes and uses the same terms.

All other things that has been discussed works well also.

[GunChleoc (gunchleoc)]

LGTM :)

Somebody should look at my part of the code - files to review are:

src/editor/tools/editor_info_tool.cc
src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc
src/logic/world/terrain_description.cc
src/logic/world/terrain_description.h

review: Approve

[kaputtnik (franku)]

Sorry that i couldn't approve your code... i could only say it works :-D

[GunChleoc (gunchleoc)]

Thanks for testing again! I still would like a C++ coder to have a look though.

[TiborB (tiborb95)]

OK for me, only look at my question in diff

[GunChleoc (gunchleoc)]

The "buf" thing is old code that I didn't want to mess with in this branch - it would have made the diff pretty big. We should overhaul it one day though.

[TiborB (tiborb95)]

I have not meant buf itself, but its position. But when looking in code again it looks OK

review: Approve

[GunChleoc (gunchleoc)]

OK, thanks! Will merge :)

=== renamed file 'pics/terrain_green.png' => 'pics/terrain_arable.png'
=== renamed file 'pics/terrain_mountain.png' => 'pics/terrain_mineable.png'
Binary files pics/terrain_mountain.png	2009-11-09 19:01:11 +0000 and pics/terrain_mineable.png	2015-12-05 10:59:45 +0000 differ
=== renamed file 'pics/terrain_dead.png' => 'pics/terrain_unreachable.png'
=== renamed file 'pics/terrain_impassable.png' => 'pics/terrain_unwalkable.png'
Binary files pics/terrain_impassable.png	2015-02-24 13:51:38 +0000 and pics/terrain_unwalkable.png	2015-12-05 10:59:45 +0000 differ
=== renamed file 'pics/terrain_dry.png' => 'pics/terrain_walkable.png'
Binary files pics/terrain_dry.png	2009-11-09 19:01:11 +0000 and pics/terrain_walkable.png	2015-12-05 10:59:45 +0000 differ
=== modified file 'pics/terrain_water.png'
Binary files pics/terrain_water.png	2005-12-29 01:10:07 +0000 and pics/terrain_water.png	2015-12-05 10:59:45 +0000 differ
=== modified file 'src/ai/ai_help_structs.h'
--- src/ai/ai_help_structs.h	2015-11-26 10:43:33 +0000
+++ src/ai/ai_help_structs.h	2015-12-05 10:59:45 +0000
@@ -187,9 +187,9 @@
 
 	bool accept(const Map& /* map */, const FCoords& coord) const {
 		return (world_.terrain_descr(coord.field->terrain_d()).get_is() &
-		        TerrainDescription::Type::kWater) ||
+		        TerrainDescription::Is::kWater) ||
 		       (world_.terrain_descr(coord.field->terrain_r()).get_is() &
-		        TerrainDescription::Type::kWater);
+		        TerrainDescription::Is::kWater);
 	}
 
 private:

=== modified file 'src/editor/tools/editor_increase_resources_tool.cc'
--- src/editor/tools/editor_increase_resources_tool.cc	2015-11-11 09:56:22 +0000
+++ src/editor/tools/editor_increase_resources_tool.cc	2015-12-05 10:59:45 +0000
@@ -37,7 +37,7 @@
 	if (!terrain.is_resource_valid(resource)) {
 		return -1;
 	}
-	if (terrain.get_is() & Widelands::TerrainDescription::Type::kImpassable) {
+	if (terrain.get_is() & Widelands::TerrainDescription::Is::kUnwalkable) {
 		return 8;
 	}
 	return 1;
@@ -59,7 +59,7 @@
 	count += resource_value(world.terrain_descr(f.field->terrain_r()), curres);
 	count += resource_value(world.terrain_descr(f.field->terrain_d()), curres);
 
-	//  If one of the neighbours is impassable, count its resource stronger.
+	//  If one of the neighbours is unwalkable, count its resource stronger.
 	//  top left neigbour
 	map.get_neighbour(f, Widelands::WALK_NW, &f1);
 	count += resource_value(world.terrain_descr(f1.field->terrain_r()), curres);

=== modified file 'src/editor/tools/editor_info_tool.cc'
--- src/editor/tools/editor_info_tool.cc	2015-11-27 14:42:11 +0000
+++ src/editor/tools/editor_info_tool.cc	2015-12-05 10:59:45 +0000
@@ -107,28 +107,13 @@
 
 	buf += "• " + (boost::format(pgettext("terrain_name", "Name: %s")) % ter.descname()).str() + "\n";
 
-	Widelands::TerrainDescription::Type terrain_is = ter.get_is();
 	std::vector<std::string> terrain_is_strings;
-
-	if (terrain_is == Widelands::TerrainDescription::Type::kGreen) {
-		terrain_is_strings.push_back(_("arable"));
-	}
-	if (terrain_is & Widelands::TerrainDescription::Type::kDry) {
-		terrain_is_strings.push_back(_("treeless"));
-	}
-	if (terrain_is & Widelands::TerrainDescription::Type::kWater) {
-		terrain_is_strings.push_back(_("aquatic"));
-	}
-	if (terrain_is & Widelands::TerrainDescription::Type::kDead) {
-		terrain_is_strings.push_back(_("dead"));
-	}
-	if (terrain_is & Widelands::TerrainDescription::Type::kMountain) {
-		terrain_is_strings.push_back(_("mountainous"));
-	}
-	if (terrain_is & Widelands::TerrainDescription::Type::kImpassable) {
-		terrain_is_strings.push_back(_("impassable"));
-	}
-	buf += "• " + (boost::format(_("Category: %s"))
+	for (const Widelands::TerrainDescription::Type& terrain_type : ter.get_types()) {
+		terrain_is_strings.push_back(terrain_type.descname);
+	}
+	/** TRANSLATORS: "Is" is a list of terrain properties, e.g. "arable", "unreachable and unwalkable" */
+	/** TRANSLATORS: You can also translate this as "Category: %s" or "Property: %s" */
+	buf += "• " + (boost::format(_("Is: %s"))
 						% i18n::localize_list(terrain_is_strings, i18n::ConcatenateWith::AMPERSAND)).str() + "\n";
 	buf += "• " + (boost::format(_("Editor Category: %s")) % ter.editor_category().descname()).str() + "\n";
 

=== modified file 'src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc'
--- src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc	2015-10-10 11:47:22 +0000
+++ src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc	2015-12-05 10:59:45 +0000
@@ -42,117 +42,39 @@
 
 using namespace Widelands;
 
-static const int32_t check[] = {
-	TerrainDescription::Type::kGreen,                                 //  "green"
-	TerrainDescription::Type::kDry,                                   //  "dry"
-	TerrainDescription::Type::kDry | TerrainDescription::Type::kMountain,    //  "mountain"
-	TerrainDescription::Type::kDry | TerrainDescription::Type::kImpassable,  //  "impassable"
-	TerrainDescription::Type::kDead | TerrainDescription::Type::kDry |
-		TerrainDescription::Type::kImpassable,  //  "dead"
-	TerrainDescription::Type::kImpassable | TerrainDescription::Type::kDry | TerrainDescription::Type::kWater,
-	-1,  // end marker
-};
-
 UI::Checkbox* create_terrain_checkbox(UI::Panel* parent,
                                       const TerrainDescription& terrain_descr,
                                       std::vector<std::unique_ptr<const Image>>* offscreen_images) {
-	const Image* green = g_gr->images().get("pics/terrain_green.png");
-	const Image* water = g_gr->images().get("pics/terrain_water.png");
-	const Image* mountain = g_gr->images().get("pics/terrain_mountain.png");
-	const Image* dead = g_gr->images().get("pics/terrain_dead.png");
-	const Image* impassable = g_gr->images().get("pics/terrain_impassable.png");
-	const Image* dry = g_gr->images().get("pics/terrain_dry.png");
 
-	constexpr int kSmallPicHeight = 20;
-	constexpr int kSmallPicWidth = 20;
+	constexpr int kSmallPicSize = 20;
 
 	std::vector<std::string> tooltips;
 
-	for (size_t checkfor = 0; check[checkfor] >= 0; ++checkfor) {
-		const TerrainDescription::Type ter_is = terrain_descr.get_is();
-		if (ter_is != check[checkfor])
-			continue;
-
-		const Texture& terrain_texture = terrain_descr.get_texture(0);
-		Texture* texture = new Texture(terrain_texture.width(), terrain_texture.height());
-		blit(Rect(0, 0, terrain_texture.width(), terrain_texture.height()),
-		              terrain_texture,
-		              Rect(0, 0, terrain_texture.width(), terrain_texture.height()),
-		              1.,
-		              BlendMode::UseAlpha, texture);
-		Point pt(1, terrain_texture.height() - kSmallPicHeight - 1);
-
-		if (ter_is == TerrainDescription::Type::kGreen) {
-			blit(Rect(pt.x, pt.y, green->width(), green->height()),
-			     *green,
-			     Rect(0, 0, green->width(), green->height()),
-			     1.,
-			     BlendMode::UseAlpha,
-			     texture);
-			pt.x += kSmallPicWidth + 1;
-			/** TRANSLATORS: This is a terrain type tooltip in the editor */
-			tooltips.push_back(_("arable"));
-		} else {
-			if (ter_is & TerrainDescription::Type::kWater) {
-				blit(Rect(pt.x, pt.y, water->width(), water->height()),
-				     *water,
-				     Rect(0, 0, water->width(), water->height()),
-				     1.,
-				     BlendMode::UseAlpha,
-				     texture);
-				pt.x += kSmallPicWidth + 1;
-				/** TRANSLATORS: This is a terrain type tooltip in the editor */
-				tooltips.push_back(_("aquatic"));
-			}
-			else if (ter_is & TerrainDescription::Type::kMountain) {
-				blit(Rect(pt.x, pt.y, mountain->width(), mountain->height()),
-				     *mountain,
-				     Rect(0, 0, mountain->width(), mountain->height()),
-				     1.,
-				     BlendMode::UseAlpha,
-				     texture);
-				pt.x += kSmallPicWidth + 1;
-				/** TRANSLATORS: This is a terrain type tooltip in the editor */
-				tooltips.push_back(_("mountainous"));
-			}
-			if (ter_is & TerrainDescription::Type::kDead) {
-				blit(Rect(pt.x, pt.y, dead->width(), dead->height()),
-				     *dead,
-				     Rect(0, 0, dead->width(), dead->height()),
-				     1.,
-				     BlendMode::UseAlpha,
-				     texture);
-				pt.x += kSmallPicWidth + 1;
-				/** TRANSLATORS: This is a terrain type tooltip in the editor */
-				tooltips.push_back(_("dead"));
-			}
-			if (ter_is & TerrainDescription::Type::kImpassable) {
-				blit(Rect(pt.x, pt.y, impassable->width(), impassable->height()),
-				     *impassable,
-				     Rect(0, 0, impassable->width(), impassable->height()),
-				     1.,
-				     BlendMode::UseAlpha,
-				     texture);
-				pt.x += kSmallPicWidth + 1;
-				/** TRANSLATORS: This is a terrain type tooltip in the editor */
-				tooltips.push_back(_("impassable"));
-			}
-			if (ter_is & TerrainDescription::Type::kDry) {
-				blit(Rect(pt.x, pt.y, dry->width(), dry->height()),
-				     *dry,
-				     Rect(0, 0, dry->width(), dry->height()),
-				     1.,
-				     BlendMode::UseAlpha,
-				     texture);
-				/** TRANSLATORS: This is a terrain type tooltip in the editor */
-				 tooltips.push_back(_("treeless"));
-			}
-		}
-
-		// Make sure we delete this later on.
-		offscreen_images->emplace_back(texture);
-		break;
+	// Blit the main terrain image
+	const Texture& terrain_texture = terrain_descr.get_texture(0);
+	Texture* texture = new Texture(terrain_texture.width(), terrain_texture.height());
+	blit(Rect(0, 0, terrain_texture.width(), terrain_texture.height()),
+					  terrain_texture,
+					  Rect(0, 0, terrain_texture.width(), terrain_texture.height()),
+					  1.,
+					  BlendMode::UseAlpha, texture);
+	Point pt(1, terrain_texture.height() - kSmallPicSize - 1);
+
+	// Collect tooltips and blit small icons representing "is" values
+	for (const TerrainDescription::Type& terrain_type : terrain_descr.get_types()) {
+		tooltips.push_back(terrain_type.descname);
+
+		blit(Rect(pt.x, pt.y, terrain_type.icon->width(), terrain_type.icon->height()),
+			 *terrain_type.icon,
+			 Rect(0, 0, terrain_type.icon->width(), terrain_type.icon->height()),
+			  1.,
+			  BlendMode::UseAlpha,
+			  texture);
+		pt.x += kSmallPicSize + 1;
 	}
+	// Make sure we delete this later on.
+	offscreen_images->emplace_back(texture);
+
 	/** TRANSLATORS: %1% = terrain name, %2% = list of terrain types  */
 	const std::string tooltip = ((boost::format("%1%: %2%"))
 								  % terrain_descr.descname()

=== modified file 'src/logic/bob.cc'
--- src/logic/bob.cc	2015-11-20 19:09:59 +0000
+++ src/logic/bob.cc	2015-12-05 10:59:45 +0000
@@ -868,7 +868,7 @@
 
 
 /**
- * Cause the object to walk, honoring passable/impassable parts of the map
+ * Cause the object to walk, honoring passable/unwalkable parts of the map
  * using movecaps. If force is true, the passability check is skipped.
  *
  * \return the number of milliseconds after which the walk has ended. You must

=== modified file 'src/logic/map.cc'
--- src/logic/map.cc	2015-11-18 08:41:27 +0000
+++ src/logic/map.cc	2015-12-05 10:59:45 +0000
@@ -208,7 +208,7 @@
 				amount += terd.get_default_resource_amount();
 			}
 
-			//  If one of the neighbours is impassable, count its resource
+			//  If one of the neighbours is unwalkable, count its resource
 			//  stronger
 			//  top left neigbour
 			get_neighbour(f, WALK_NW, &f1);
@@ -216,7 +216,7 @@
 				const TerrainDescription& terr = world.terrain_descr(f1.field->terrain_r());
 				const int8_t resr = terr.get_default_resource();
 				const int default_amount = terr.get_default_resource_amount();
-				if ((terr.get_is() & TerrainDescription::Type::kImpassable) && default_amount > 0)
+				if ((terr.get_is() & TerrainDescription::Is::kUnwalkable) && default_amount > 0)
 					m[resr] += 3;
 				else
 					++m[resr];
@@ -226,7 +226,7 @@
 				const TerrainDescription& terd = world.terrain_descr(f1.field->terrain_d());
 				const int8_t resd = terd.get_default_resource();
 				const int default_amount = terd.get_default_resource_amount();
-				if ((terd.get_is() & TerrainDescription::Type::kImpassable) && default_amount > 0)
+				if ((terd.get_is() & TerrainDescription::Is::kUnwalkable) && default_amount > 0)
 					m[resd] += 3;
 				else
 					++m[resd];
@@ -239,7 +239,7 @@
 				const TerrainDescription& terd = world.terrain_descr(f1.field->terrain_d());
 				const int8_t resd = terd.get_default_resource();
 				const int default_amount = terd.get_default_resource_amount();
-				if ((terd.get_is() & TerrainDescription::Type::kImpassable) && default_amount > 0)
+				if ((terd.get_is() & TerrainDescription::Is::kUnwalkable) && default_amount > 0)
 					m[resd] += 3;
 				else
 					++m[resd];
@@ -252,7 +252,7 @@
 				const TerrainDescription& terr = world.terrain_descr(f1.field->terrain_r());
 				const int8_t resr = terr.get_default_resource();
 				const int default_amount = terr.get_default_resource_amount();
-				if ((terr.get_is() & TerrainDescription::Type::kImpassable) && default_amount > 0)
+				if ((terr.get_is() & TerrainDescription::Is::kUnwalkable) && default_amount > 0)
 					m[resr] += 3;
 				else
 					++m[resr];
@@ -1040,51 +1040,51 @@
 	const FCoords tl = tl_n(f);
 	const FCoords  l =  l_n(f);
 
-	const TerrainDescription::Type tr_d_terrain_is =
+	const TerrainDescription::Is tr_d_terrain_is =
 		world.terrain_descr(tr.field->terrain_d()).get_is();
-	const TerrainDescription::Type tl_r_terrain_is =
+	const TerrainDescription::Is tl_r_terrain_is =
 		world.terrain_descr(tl.field->terrain_r()).get_is();
-	const TerrainDescription::Type tl_d_terrain_is =
+	const TerrainDescription::Is tl_d_terrain_is =
 		world.terrain_descr(tl.field->terrain_d()).get_is();
-	const TerrainDescription::Type  l_r_terrain_is =
+	const TerrainDescription::Is  l_r_terrain_is =
 		world.terrain_descr (l.field->terrain_r()).get_is();
-	const TerrainDescription::Type  f_d_terrain_is =
+	const TerrainDescription::Is  f_d_terrain_is =
 		world.terrain_descr (f.field->terrain_d()).get_is();
-	const TerrainDescription::Type  f_r_terrain_is =
+	const TerrainDescription::Is  f_r_terrain_is =
 		world.terrain_descr (f.field->terrain_r()).get_is();
 
 	//  1b) Collect some information about the neighbours
-	uint8_t cnt_impassable = 0;
+	uint8_t cnt_unwalkable = 0;
 	uint8_t cnt_water = 0;
-	uint8_t cnt_dead = 0;
-
-	if  (tr_d_terrain_is & TerrainDescription::Type::kImpassable) ++cnt_impassable;
-	if  (tl_r_terrain_is & TerrainDescription::Type::kImpassable) ++cnt_impassable;
-	if  (tl_d_terrain_is & TerrainDescription::Type::kImpassable) ++cnt_impassable;
-	if   (l_r_terrain_is & TerrainDescription::Type::kImpassable) ++cnt_impassable;
-	if   (f_d_terrain_is & TerrainDescription::Type::kImpassable) ++cnt_impassable;
-	if   (f_r_terrain_is & TerrainDescription::Type::kImpassable) ++cnt_impassable;
-
-	if  (tr_d_terrain_is & TerrainDescription::Type::kWater)      ++cnt_water;
-	if  (tl_r_terrain_is & TerrainDescription::Type::kWater)      ++cnt_water;
-	if  (tl_d_terrain_is & TerrainDescription::Type::kWater)      ++cnt_water;
-	if   (l_r_terrain_is & TerrainDescription::Type::kWater)      ++cnt_water;
-	if   (f_d_terrain_is & TerrainDescription::Type::kWater)      ++cnt_water;
-	if   (f_r_terrain_is & TerrainDescription::Type::kWater)      ++cnt_water;
-
-	if  (tr_d_terrain_is & TerrainDescription::Type::kDead)       ++cnt_dead;
-	if  (tl_r_terrain_is & TerrainDescription::Type::kDead)       ++cnt_dead;
-	if  (tl_d_terrain_is & TerrainDescription::Type::kDead)       ++cnt_dead;
-	if   (l_r_terrain_is & TerrainDescription::Type::kDead)       ++cnt_dead;
-	if   (f_d_terrain_is & TerrainDescription::Type::kDead)       ++cnt_dead;
-	if   (f_r_terrain_is & TerrainDescription::Type::kDead)       ++cnt_dead;
+	uint8_t cnt_unreachable = 0;
+
+	if  (tr_d_terrain_is & TerrainDescription::Is::kUnwalkable) ++cnt_unwalkable;
+	if  (tl_r_terrain_is & TerrainDescription::Is::kUnwalkable) ++cnt_unwalkable;
+	if  (tl_d_terrain_is & TerrainDescription::Is::kUnwalkable) ++cnt_unwalkable;
+	if   (l_r_terrain_is & TerrainDescription::Is::kUnwalkable) ++cnt_unwalkable;
+	if   (f_d_terrain_is & TerrainDescription::Is::kUnwalkable) ++cnt_unwalkable;
+	if   (f_r_terrain_is & TerrainDescription::Is::kUnwalkable) ++cnt_unwalkable;
+
+	if  (tr_d_terrain_is & TerrainDescription::Is::kWater)      ++cnt_water;
+	if  (tl_r_terrain_is & TerrainDescription::Is::kWater)      ++cnt_water;
+	if  (tl_d_terrain_is & TerrainDescription::Is::kWater)      ++cnt_water;
+	if   (l_r_terrain_is & TerrainDescription::Is::kWater)      ++cnt_water;
+	if   (f_d_terrain_is & TerrainDescription::Is::kWater)      ++cnt_water;
+	if   (f_r_terrain_is & TerrainDescription::Is::kWater)      ++cnt_water;
+
+	if  (tr_d_terrain_is & TerrainDescription::Is::kUnreachable)       ++cnt_unreachable;
+	if  (tl_r_terrain_is & TerrainDescription::Is::kUnreachable)       ++cnt_unreachable;
+	if  (tl_d_terrain_is & TerrainDescription::Is::kUnreachable)       ++cnt_unreachable;
+	if   (l_r_terrain_is & TerrainDescription::Is::kUnreachable)       ++cnt_unreachable;
+	if   (f_d_terrain_is & TerrainDescription::Is::kUnreachable)       ++cnt_unreachable;
+	if   (f_r_terrain_is & TerrainDescription::Is::kUnreachable)       ++cnt_unreachable;
 
 
 	//  2) Passability
 
 	//  2a) If any of the neigbouring triangles is walkable this node is
 	//  walkable.
-	if (cnt_impassable < 6)
+	if (cnt_unwalkable < 6)
 		caps |= MOVECAPS_WALK;
 
 	//  2b) If all neighbouring triangles are water, the node is swimable.
@@ -1094,7 +1094,7 @@
 
 	// 2c) [OVERRIDE] If any of the neighbouring triangles is really "bad" (such
 	// as lava), we can neither walk nor swim to this node.
-	if (cnt_dead)
+	if (cnt_unreachable)
 		caps &= ~(MOVECAPS_WALK | MOVECAPS_SWIM);
 
 	//  === everything below is used to check buildability ===
@@ -1109,7 +1109,7 @@
 				&&
 				imm->get_size() >= BaseImmovable::SMALL)
 			{
-				// 3b) [OVERRIDE] check for "impassable" MapObjects
+				// 3b) [OVERRIDE] check for "unwalkable" MapObjects
 				if (!imm->get_passable())
 					caps &= ~(MOVECAPS_WALK | MOVECAPS_SWIM);
 				return static_cast<NodeCaps>(caps);
@@ -1272,7 +1272,7 @@
 	const FCoords tl = tl_n(f);
 	const FCoords  l =  l_n(f);
 
-	const TerrainDescription::Type terrains[6] = {
+	const TerrainDescription::Is terrains[6] = {
 		world.terrain_descr(tr.field->terrain_d()).get_is(),
 		world.terrain_descr(tl.field->terrain_r()).get_is(),
 		world.terrain_descr(tl.field->terrain_d()).get_is(),
@@ -1281,21 +1281,22 @@
 		world.terrain_descr (f.field->terrain_r()).get_is()
 	};
 
-	uint32_t cnt_mountain = 0;
-	uint32_t cnt_dry = 0;
+	uint32_t cnt_mineable = 0;
+	uint32_t cnt_walkable = 0;
 	for (uint32_t i = 0; i < 6; ++i) {
-		if (terrains[i] & TerrainDescription::Type::kWater)
+		if (terrains[i] & TerrainDescription::Is::kWater ||
+			 terrains[i] & TerrainDescription::Is::kUnwalkable)
 			return BaseImmovable::NONE;
-		if (terrains[i] & TerrainDescription::Type::kMountain) ++cnt_mountain;
-		if (terrains[i] & TerrainDescription::Type::kDry) ++cnt_dry;
+		if (terrains[i] & TerrainDescription::Is::kMineable) ++cnt_mineable;
+		if (terrains[i] & TerrainDescription::Is::kWalkable) ++cnt_walkable;
 	}
 
-	if (cnt_mountain == 6) {
+	if (cnt_mineable == 6) {
 		if (ismine)
 			*ismine = true;
 		return BaseImmovable::SMALL;
 	}
-	if (cnt_mountain || cnt_dry)
+	if (cnt_mineable || cnt_walkable)
 		return BaseImmovable::NONE;
 
 	// Adjust size based on neighbouring immovables

=== modified file 'src/logic/worker.cc'
--- src/logic/worker.cc	2015-12-03 08:45:37 +0000
+++ src/logic/worker.cc	2015-12-05 10:59:45 +0000
@@ -515,7 +515,7 @@
 // will also allow blocking the shoreline if it is next to the worker's
 // location. Also, the gap of 2 nodes between 2 farms will be blocked,
 // because both are next to their farm. The only real solution that I can
-// think of for this kind of bugs is to only allow impassable objects to
+// think of for this kind of bugs is to only allow unwalkable objects to
 // be placed on a node if ALL neighbouring nodes are passable. This must
 // of course be checked at the moment when the object is placed and not,
 // as in this case, only before a worker starts walking there to place an
@@ -2716,11 +2716,11 @@
 			bool is_center_mountain =
 				(world.terrain_descr(owner_area.field->terrain_d()).get_is()
 				 &
-				 TerrainDescription::Type::kMountain)
+				 TerrainDescription::Is::kMineable)
 				|
 				(world.terrain_descr(owner_area.field->terrain_r()).get_is()
 				 &
-				 TerrainDescription::Type::kMountain);
+				 TerrainDescription::Is::kMineable);
 			// Only run towards fields that are on a mountain (or not)
 			// depending on position of center
 			bool is_target_mountain;
@@ -2733,11 +2733,11 @@
 				is_target_mountain =
 					(world.terrain_descr(target.field->terrain_d()).get_is()
 					 &
-					 TerrainDescription::Type::kMountain)
+					 TerrainDescription::Is::kMineable)
 					|
 					(world.terrain_descr(target.field->terrain_r()).get_is()
 					 &
-					 TerrainDescription::Type::kMountain);
+					 TerrainDescription::Is::kMineable);
 				if (i == 0)
 					i = list.size();
 				--i;

=== modified file 'src/logic/world/terrain_description.cc'
--- src/logic/world/terrain_description.cc	2015-11-11 09:56:22 +0000
+++ src/logic/world/terrain_description.cc	2015-12-05 10:59:45 +0000
@@ -23,6 +23,7 @@
 
 #include <boost/format.hpp>
 
+#include "base/i18n.h"
 #include "graphic/animation.h"
 #include "graphic/graphic.h"
 #include "graphic/texture.h"
@@ -36,36 +37,70 @@
 namespace  {
 
 // Parse a terrain type from the giving string.
-TerrainDescription::Type terrain_type_from_string(const std::string& type) {
-	if (type == "green") {
-		return TerrainDescription::Type::kGreen;
+TerrainDescription::Is terrain_type_from_string(const std::string& type) {
+	if (type == "arable") {
+		return TerrainDescription::Is::kArable;
 	}
-	if (type == "dry") {
-		return TerrainDescription::Type::kDry;
+	if (type == "walkable") {
+		return TerrainDescription::Is::kWalkable;
 	}
 	if (type == "water") {
-		return static_cast<TerrainDescription::Type>(TerrainDescription::Type::kWater |
-																	TerrainDescription::Type::kDry |
-																	TerrainDescription::Type::kImpassable);
-	}
-	if (type == "dead") {
-		return static_cast<TerrainDescription::Type>(TerrainDescription::Type::kDead |
-																	TerrainDescription::Type::kDry |
-																	TerrainDescription::Type::kImpassable);
-	}
-	if (type == "mountain") {
-		return static_cast<TerrainDescription::Type>(TerrainDescription::Type::kDry |
-																	TerrainDescription::Type::kMountain);
-	}
-	if (type == "impassable") {
-		return static_cast<TerrainDescription::Type>(TerrainDescription::Type::kDry |
-																	TerrainDescription::Type::kImpassable);
-	}
-	throw LuaError((boost::format("invalid terrain type '%s'") % type).str());
+		return static_cast<TerrainDescription::Is>(TerrainDescription::Is::kWater |
+																	TerrainDescription::Is::kUnwalkable);
+	}
+	if (type == "unreachable") {
+		return static_cast<TerrainDescription::Is>(TerrainDescription::Is::kUnreachable |
+																	TerrainDescription::Is::kUnwalkable);
+	}
+	if (type == "mineable") {
+		return TerrainDescription::Is::kMineable;
+	}
+	if (type == "unwalkable") {
+		return TerrainDescription::Is::kUnwalkable;
+	}
+	throw LuaError((boost::format("Invalid terrain \"is\" value '%s'") % type).str());
 }
 
 }  // namespace
 
+
+TerrainDescription::Type::Type(TerrainDescription::Is _is) : is(_is) {
+	switch (is) {
+	case Is::kArable:
+		/** TRANSLATORS: This is a terrain type tooltip in the editor */
+		descname = _("arable");
+		icon = g_gr->images().get("pics/terrain_arable.png");
+		break;
+	case Is::kWalkable:
+		/** TRANSLATORS: This is a terrain type tooltip in the editor */
+		descname = _("walkable");
+		icon = g_gr->images().get("pics/terrain_walkable.png");
+		break;
+	case Is::kWater:
+		/** TRANSLATORS: This is a terrain type tooltip in the editor */
+		descname = _("navigable");
+		icon = g_gr->images().get("pics/terrain_water.png");
+		break;
+	case Is::kUnreachable:
+		/** TRANSLATORS: This is a terrain type tooltip in the editor */
+		descname = _("unreachable");
+		icon = g_gr->images().get("pics/terrain_unreachable.png");
+		break;
+	case Is::kMineable:
+		/** TRANSLATORS: This is a terrain type tooltip in the editor */
+		descname = _("mineable");
+		icon = g_gr->images().get("pics/terrain_mineable.png");
+		break;
+	case Is::kUnwalkable:
+		/** TRANSLATORS: This is a terrain type tooltip in the editor */
+		descname = _("unwalkable");
+		icon = g_gr->images().get("pics/terrain_unwalkable.png");
+		break;
+	default:
+		throw wexception("Unknown TerrainDescription::Is in TerrainDescription::Type");
+	}
+}
+
 TerrainDescription::TerrainDescription(const LuaTable& table, const Widelands::World& world)
    : name_(table.get_string("name")),
      descname_(table.get_string("descname")),
@@ -136,10 +171,35 @@
 	return texture_paths_;
 }
 
-TerrainDescription::Type TerrainDescription::get_is() const {
+TerrainDescription::Is TerrainDescription::get_is() const {
 	return is_;
 }
 
+
+const std::vector<TerrainDescription::Type> TerrainDescription::get_types() const {
+	std::vector<TerrainDescription::Type> terrain_types;
+
+	if (is_ == Widelands::TerrainDescription::Is::kArable) {
+		terrain_types.push_back(TerrainDescription::Type(TerrainDescription::Is::kArable));
+	}
+	if (is_ & Widelands::TerrainDescription::Is::kWalkable) {
+		terrain_types.push_back(TerrainDescription::Type(TerrainDescription::Is::kWalkable));
+	}
+	if (is_ & Widelands::TerrainDescription::Is::kWater) {
+		terrain_types.push_back(TerrainDescription::Type(TerrainDescription::Is::kWater));
+	}
+	if (is_ & Widelands::TerrainDescription::Is::kUnreachable) {
+		terrain_types.push_back(TerrainDescription::Type(TerrainDescription::Is::kUnreachable));
+	}
+	if (is_ & Widelands::TerrainDescription::Is::kMineable) {
+		terrain_types.push_back(TerrainDescription::Type(TerrainDescription::Is::kMineable));
+	}
+	if (is_ & Widelands::TerrainDescription::Is::kUnwalkable) {
+		terrain_types.push_back(TerrainDescription::Type(TerrainDescription::Is::kUnwalkable));
+	}
+	return terrain_types;
+}
+
 const std::string& TerrainDescription::name() const {
 	return name_;
 }

=== modified file 'src/logic/world/terrain_description.h'
--- src/logic/world/terrain_description.h	2015-11-11 09:56:22 +0000
+++ src/logic/world/terrain_description.h	2015-12-05 10:59:45 +0000
@@ -26,6 +26,7 @@
 
 #include "base/macros.h"
 #include "graphic/color.h"
+#include "graphic/graphic.h"
 #include "logic/widelands.h"
 #include "logic/world/resource_description.h"
 
@@ -42,13 +43,21 @@
 
 class TerrainDescription {
 public:
-	enum Type {
-		kGreen = 0,
-		kDry = 1,
+	enum Is {
+		kArable = 0,
+		kWalkable = 1,
 		kWater =  2,
-		kDead = 4,
-		kMountain = 8,
-		kImpassable = 16,
+		kUnreachable = 4,
+		kMineable = 8,
+		kUnwalkable = 16,
+	};
+
+	struct Type {
+		Type(TerrainDescription::Is _is);
+
+		TerrainDescription::Is is;
+		const char* descname;
+		const Image* icon;
 	};
 
 	TerrainDescription(const LuaTable& table, const World&);
@@ -75,7 +84,9 @@
 	const RGBColor& get_minimap_color(int shade);
 
 	/// Returns the type of terrain this is (water, walkable, and so on).
-	Type get_is() const;
+	Is get_is() const;
+	/// Returns a list of the types that match get_is()
+	const std::vector<TerrainDescription::Type> get_types() const;
 
 	/// Returns the valid resource with the given index.
 	DescriptionIndex get_valid_resource(uint8_t index) const;
@@ -114,7 +125,7 @@
 	const std::string name_;
 	const std::string descname_;
 	const EditorCategory* editor_category_;  ///< not owned.
-	Type is_;
+	Is is_;
 	std::vector<uint8_t> valid_resources_;
 	int default_resource_index_;
 	int default_resource_amount_;

=== modified file 'world/terrains/init.lua'
--- world/terrains/init.lua	2015-10-31 12:11:44 +0000
+++ world/terrains/init.lua	2015-12-05 10:59:45 +0000
@@ -40,13 +40,13 @@
    -- on.
    --
    -- The following properties are available:
-   -- "green": Allows building of normal buildings and roads
-   -- "mountain": Allows building of mines and roads
-   -- "dry": Allows building of roads only. Trees don't like this terrain.
+   -- "arable": Allows building of normal buildings and roads
+   -- "mineable": Allows building of mines and roads
+   -- "walkable": Allows building of roads only
    -- "water": Nothing can be built here, but ships and aquatic animals can pass
-   -- "dead": Nothing can be built here, and nothing can walk on it, and nothing will grow.
-   -- "impassable": Nothing can be built here, and nothing can walk on it
-   is = "green",
+   -- "unreachable": Nothing can be built here (not even immovables), and nothing can walk on it
+   -- "unwalkable": Nothing can be built here, and nothing can walk on it
+   is = "arable",
 
    -- The list resources that can be found in this terrain.
    valid_resources = {"water"},
@@ -79,7 +79,7 @@
    name = "wiese2",
    descname = _ "Meadow",
    editor_category = "green",
-   is = "green",
+   is = "arable",
    valid_resources = {"water"},
    default_resource = "water",
    default_resource_amount = 10,
@@ -96,7 +96,7 @@
    name = "wiese3",
    descname = _ "Meadow",
    editor_category = "green",
-   is = "green",
+   is = "arable",
    valid_resources = {"water"},
    default_resource = "water",
    default_resource_amount = 10,
@@ -112,7 +112,7 @@
    name = "wiese4",
    descname = _ "Meadow",
    editor_category = "green",
-   is = "green",
+   is = "arable",
    valid_resources = {"water"},
    default_resource = "water",
    default_resource_amount = 10,
@@ -128,7 +128,7 @@
    name = "steppe",
    descname = _ "Steppe",
    editor_category = "green",
-   is = "green",
+   is = "arable",
    valid_resources = { "water" },
    default_resource = "water",
    default_resource_amount = 5,
@@ -144,7 +144,7 @@
    name = "steppe_kahl",
    descname = _ "Barren Steppe",
    editor_category = "green",
-   is = "green",
+   is = "arable",
    valid_resources = {"water"},
    default_resource = "water",
    default_resource_amount = 4,
@@ -160,7 +160,7 @@
    name = "bergwiese",
    descname = _ "Mountain Meadow",
    editor_category = "green",
-   is = "green",
+   is = "arable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
@@ -176,7 +176,7 @@
    name = "berg1",
    descname = _ "Mountain",
    editor_category = "green",
-   is = "mountain",
+   is = "mineable",
    valid_resources = { "coal", "iron", "gold", "stones" },
    default_resource = "",
    default_resource_amount = 0,
@@ -192,7 +192,7 @@
    name = "berg2",
    descname = _ "Mountain",
    editor_category = "green",
-   is = "mountain",
+   is = "mineable",
    valid_resources = {"coal", "iron", "gold", "stones"},
    default_resource = "",
    default_resource_amount = 0,
@@ -208,7 +208,7 @@
    name = "berg3",
    descname = _ "Mountain",
    editor_category = "green",
-   is = "mountain",
+   is = "mineable",
    valid_resources = {"coal", "iron", "gold", "stones"},
    default_resource = "",
    default_resource_amount = 0,
@@ -224,7 +224,7 @@
    name = "berg4",
    descname = _ "Mountain",
    editor_category = "green",
-   is = "mountain",
+   is = "mineable",
    valid_resources = {"coal", "iron", "gold", "stones"},
    default_resource = "",
    default_resource_amount = 0,
@@ -240,7 +240,7 @@
    name = "sumpf",
    descname = _ "Swamp",
    editor_category = "green",
-   is = "impassable",
+   is = "unwalkable",
    valid_resources = {"water"},
    default_resource = "water",
    default_resource_amount = 20,
@@ -257,7 +257,7 @@
    name = "strand",
    descname = _ "Beach",
    editor_category = "green",
-   is = "dry",
+   is = "walkable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
@@ -271,7 +271,7 @@
    name = "schnee",
    descname = _ "Snow",
    editor_category = "green",
-   is = "dead",
+   is = "unreachable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
@@ -287,7 +287,7 @@
    name = "lava",
    descname = _ "Lava",
    editor_category = "green",
-   is = "dead",
+   is = "unreachable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
@@ -325,7 +325,7 @@
    name = "ashes",
    descname = _ "Ashes",
    editor_category = "wasteland",
-   is = "green",
+   is = "arable",
    valid_resources = { "water" },
    default_resource = "water",
    default_resource_amount = 5,
@@ -341,7 +341,7 @@
    name = "ashes2",
    descname = _ "Ashes",
    editor_category = "wasteland",
-   is = "green",
+   is = "arable",
    valid_resources = { "water" },
    default_resource = "water",
    default_resource_amount = 4,
@@ -357,7 +357,7 @@
    name = "hardground1",
    descname = _ "Hard Ground",
    editor_category = "wasteland",
-   is = "green",
+   is = "arable",
    valid_resources = { "water" },
    default_resource = "water",
    default_resource_amount = 10,
@@ -373,7 +373,7 @@
    name = "hardground2",
    descname = _ "Hard Ground",
    editor_category = "wasteland",
-   is = "green",
+   is = "arable",
    valid_resources = { "water" },
    default_resource = "water",
    default_resource_amount = 10,
@@ -389,7 +389,7 @@
    name = "hardground3",
    descname = _ "Hard Ground",
    editor_category = "wasteland",
-   is = "green",
+   is = "arable",
    valid_resources = { "water" },
    default_resource = "water",
    default_resource_amount = 10,
@@ -405,7 +405,7 @@
    name = "hardground4",
    descname = _ "Hard Ground",
    editor_category = "wasteland",
-   is = "green",
+   is = "arable",
    valid_resources = { "water" },
    default_resource = "water",
    default_resource_amount = 10,
@@ -421,7 +421,7 @@
    name = "hardlava",
    descname = _ "Igneous Rocks",
    editor_category = "wasteland",
-   is = "green",
+   is = "arable",
    valid_resources = { "water" },
    default_resource = "",
    default_resource_amount = 0,
@@ -437,7 +437,7 @@
    name = "wasteland_mountain1",
    descname = _ "Mountain",
    editor_category = "wasteland",
-   is = "mountain",
+   is = "mineable",
    valid_resources = { "coal", "iron", "gold", "stones" },
    default_resource = "",
    default_resource_amount = 0,
@@ -453,7 +453,7 @@
    name = "wasteland_mountain2",
    descname = _ "Mountain",
    editor_category = "wasteland",
-   is = "mountain",
+   is = "mineable",
    valid_resources = { "coal", "iron", "gold", "stones" },
    default_resource = "",
    default_resource_amount = 0,
@@ -469,7 +469,7 @@
    name = "wasteland_mountain3",
    descname = _ "Mountain",
    editor_category = "wasteland",
-   is = "mountain",
+   is = "mineable",
    valid_resources = { "coal", "iron", "gold", "stones" },
    default_resource = "",
    default_resource_amount = 0,
@@ -485,7 +485,7 @@
    name = "wasteland_mountain4",
    descname = _ "Mountain",
    editor_category = "wasteland",
-   is = "mountain",
+   is = "mineable",
    valid_resources = { "coal", "iron", "gold", "stones" },
    default_resource = "",
    default_resource_amount = 0,
@@ -501,7 +501,7 @@
    name = "wasteland_beach",
    descname = _ "Beach",
    editor_category = "wasteland",
-   is = "dry",
+   is = "walkable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
@@ -517,7 +517,7 @@
    name = "lava-stone1",
    descname = _ "Lava Rocks",
    editor_category = "wasteland",
-   is = "dead",
+   is = "unreachable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
@@ -534,7 +534,7 @@
    name = "lava-stone2",
    descname = _ "Lava Rocks",
    editor_category = "wasteland",
-   is = "dead",
+   is = "unreachable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
@@ -573,7 +573,7 @@
    name = "tundra",
    descname = _ "Tundra",
    editor_category = "winter",
-   is = "green",
+   is = "arable",
    valid_resources = { "water" },
    default_resource = "water",
    default_resource_amount = 10,
@@ -589,7 +589,7 @@
    name = "tundra2",
    descname = _ "Tundra",
    editor_category = "winter",
-   is = "green",
+   is = "arable",
    valid_resources = { "water" },
    default_resource = "water",
    default_resource_amount = 10,
@@ -605,7 +605,7 @@
    name = "tundra3",
    descname = _ "Tundra",
    editor_category = "winter",
-   is = "green",
+   is = "arable",
    valid_resources = { "water" },
    default_resource = "water",
    default_resource_amount = 10,
@@ -621,7 +621,7 @@
    name = "tundra_taiga",
    descname = _ "Tundra Taiga",
    editor_category = "winter",
-   is = "green",
+   is = "arable",
    valid_resources = { "water" },
    default_resource = "water",
    default_resource_amount = 10,
@@ -637,7 +637,7 @@
    name = "taiga",
    descname = _ "Taiga",
    editor_category = "winter",
-   is = "green",
+   is = "arable",
    valid_resources = { "water" },
    default_resource = "water",
    default_resource_amount = 10,
@@ -653,7 +653,7 @@
    name = "snow",
    descname = _ "Snow",
    editor_category = "winter",
-   is = "green",
+   is = "arable",
    valid_resources = { "water" },
    default_resource = "",
    default_resource_amount = 0,
@@ -669,7 +669,7 @@
    name = "winter_mountain1",
    descname = _ "Mountain",
    editor_category = "winter",
-   is = "mountain",
+   is = "mineable",
    valid_resources = { "coal", "iron", "gold", "stones" },
    default_resource = "",
    default_resource_amount = 0,
@@ -685,7 +685,7 @@
    name = "winter_mountain2",
    descname = _ "Mountain",
    editor_category = "winter",
-   is = "mountain",
+   is = "mineable",
    valid_resources = { "coal", "iron", "gold", "stones" },
    default_resource = "",
    default_resource_amount = 0,
@@ -701,7 +701,7 @@
    name = "winter_mountain3",
    descname = _ "Mountain",
    editor_category = "winter",
-   is = "mountain",
+   is = "mineable",
    valid_resources = { "coal", "iron", "gold", "stones" },
    default_resource = "",
    default_resource_amount = 0,
@@ -717,7 +717,7 @@
    name = "winter_mountain4",
    descname = _ "Mountain",
    editor_category = "winter",
-   is = "mountain",
+   is = "mineable",
    valid_resources = { "coal", "iron", "gold", "stones" },
    default_resource = "",
    default_resource_amount = 0,
@@ -733,7 +733,7 @@
    name = "ice",
    descname = _ "Ice",
    editor_category = "winter",
-   is = "dry",
+   is = "walkable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
@@ -749,7 +749,7 @@
    name = "winter_beach",
    descname = _ "Beach",
    editor_category = "winter",
-   is = "dry",
+   is = "walkable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
@@ -821,7 +821,7 @@
    name = "desert4",
    descname = _ "Desert",
    editor_category = "desert",
-   is = "green",
+   is = "arable",
    valid_resources = {"water"},
    default_resource = "water",
    default_resource_amount = 2,
@@ -837,7 +837,7 @@
    name = "drysoil",
    descname = _ "Dry Soil",
    editor_category = "desert",
-   is = "green",
+   is = "arable",
    valid_resources = {"water"},
    default_resource = "water",
    default_resource_amount = 4,
@@ -851,7 +851,7 @@
    name = "desert_steppe",
    descname = _ "Steppe",
    editor_category = "desert",
-   is = "green",
+   is = "arable",
    valid_resources = {"water"},
    default_resource = "water",
    default_resource_amount = 5,
@@ -867,7 +867,7 @@
    name = "meadow",
    descname = _ "Meadow",
    editor_category = "desert",
-   is = "green",
+   is = "arable",
    valid_resources = {"water"},
    default_resource = "water",
    default_resource_amount = 10,
@@ -883,7 +883,7 @@
    name = "mountainmeadow",
    descname = _ "Mountain Meadow",
    editor_category = "desert",
-   is = "green",
+   is = "arable",
    valid_resources = {"water"},
    default_resource = "",
    default_resource_amount = 0,
@@ -899,7 +899,7 @@
    name = "highmountainmeadow",
    descname = _ "High Mountain Meadow",
    editor_category = "desert",
-   is = "green",
+   is = "arable",
    valid_resources = {"water"},
    default_resource = "",
    default_resource_amount = 0,
@@ -915,7 +915,7 @@
    name = "mountain1",
    descname = _ "Mountain",
    editor_category = "desert",
-   is = "mountain",
+   is = "mineable",
    valid_resources = { "coal", "iron", "gold", "stones" },
    default_resource = "",
    default_resource_amount = 0,
@@ -931,7 +931,7 @@
    name = "mountain2",
    descname = _ "Mountain",
    editor_category = "desert",
-   is = "mountain",
+   is = "mineable",
    valid_resources = { "coal", "iron", "gold", "stones" },
    default_resource = "",
    default_resource_amount = 0,
@@ -947,7 +947,7 @@
    name = "mountain3",
    descname = _ "Mountain",
    editor_category = "desert",
-   is = "mountain",
+   is = "mineable",
    valid_resources = { "coal", "iron", "gold", "stones" },
    default_resource = "",
    default_resource_amount = 0,
@@ -963,7 +963,7 @@
    name = "mountain4",
    descname = _ "Mountain",
    editor_category = "desert",
-   is = "mountain",
+   is = "mineable",
    valid_resources = { "coal", "iron", "gold", "stones" },
    default_resource = "",
    default_resource_amount = 0,
@@ -979,7 +979,7 @@
    name = "desert1",
    descname = _ "Desert",
    editor_category = "desert",
-   is = "dry",
+   is = "walkable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
@@ -995,7 +995,7 @@
    name = "desert2",
    descname = _ "Desert",
    editor_category = "desert",
-   is = "dry",
+   is = "walkable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
@@ -1011,7 +1011,7 @@
    name = "desert3",
    descname = _ "Desert",
    editor_category = "desert",
-   is = "dry",
+   is = "walkable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,
@@ -1027,7 +1027,7 @@
    name = "desert_beach",
    descname = _ "Beach",
    editor_category = "desert",
-   is = "dry",
+   is = "walkable",
    valid_resources = {},
    default_resource = "",
    default_resource_amount = 0,