widelands · bunnybot · Oct 19, 2025 · Oct 19, 2025 · Oct 19, 2025 · Oct 19, 2025
diff --git a/data/images/wui/editor/terrain_bridgeable.png b/data/images/wui/editor/terrain_bridgeable.png
diff --git a/data/images/wui/overlays/bridge_0.5.png b/data/images/wui/overlays/bridge_0.5.png
diff --git a/data/images/wui/overlays/bridge_1.png b/data/images/wui/overlays/bridge_1.png
diff --git a/data/images/wui/overlays/bridge_2.png b/data/images/wui/overlays/bridge_2.png
diff --git a/data/images/wui/overlays/bridge_4.png b/data/images/wui/overlays/bridge_4.png
diff --git a/.../maps/Forest_Valley_v2.wmf/binary/heights → data/maps/Forest_Valley.wmf/binary/heights b/.../maps/Forest_Valley_v2.wmf/binary/heights → data/maps/Forest_Valley.wmf/binary/heights
diff --git a/...ps/Forest_Valley_v2.wmf/binary/mapobjects → .../maps/Forest_Valley.wmf/binary/mapobjects b/...ps/Forest_Valley_v2.wmf/binary/mapobjects → .../maps/Forest_Valley.wmf/binary/mapobjects
diff --git a/...maps/Forest_Valley_v2.wmf/binary/resource → data/maps/Forest_Valley.wmf/binary/resource b/...maps/Forest_Valley_v2.wmf/binary/resource → data/maps/Forest_Valley.wmf/binary/resource
diff --git a/data/maps/Forest_Valley.wmf/binary/terrain b/data/maps/Forest_Valley.wmf/binary/terrain
diff --git a/data/maps/Forest_Valley_v2.wmf/elemental → data/maps/Forest_Valley.wmf/elemental b/data/maps/Forest_Valley_v2.wmf/elemental → data/maps/Forest_Valley.wmf/elemental
@@ -1,11 +1,11 @@
-# Automatically created by Widelands 1.2~git26575 (5372ade@master) Release
+# Automatically created by Widelands 1.3~git27123 (6487353@bridgeable) Release
 
 [global]
 packet_version="1"
 map_w="112"
 map_h="80"
 nr_players="2"
-name=_"Forest Valley v2.0"
+name=_"Forest Valley v2.1"
 author="tvj, tothxa"
 descr=_"A river valley surrounded by mountains with lots of resources except coal. Plenty of flat building space."
 hint=

diff --git a/data/maps/Forest_Valley_v2.wmf/minimap.png → data/maps/Forest_Valley.wmf/minimap.png b/data/maps/Forest_Valley_v2.wmf/minimap.png → data/maps/Forest_Valley.wmf/minimap.png
diff --git a/data/maps/Forest_Valley_v2.wmf/objective → data/maps/Forest_Valley.wmf/objective b/data/maps/Forest_Valley_v2.wmf/objective → data/maps/Forest_Valley.wmf/objective
diff --git a/data/maps/Forest_Valley_v2.wmf/player_names → data/maps/Forest_Valley.wmf/player_names b/data/maps/Forest_Valley_v2.wmf/player_names → data/maps/Forest_Valley.wmf/player_names
diff --git a/...maps/Forest_Valley_v2.wmf/player_position → data/maps/Forest_Valley.wmf/player_position b/...maps/Forest_Valley_v2.wmf/player_position → data/maps/Forest_Valley.wmf/player_position
diff --git a/data/maps/Forest_Valley_v2.wmf/port_spaces → data/maps/Forest_Valley.wmf/port_spaces b/data/maps/Forest_Valley_v2.wmf/port_spaces → data/maps/Forest_Valley.wmf/port_spaces
diff --git a/data/maps/Forest_Valley.wmf/version b/data/maps/Forest_Valley.wmf/version
@@ -0,0 +1,12 @@
+# Automatically created by Widelands 1.3~git27123 (6487353@bridgeable) Release
+
+[global]
+map_source_url=
+map_release=
+map_creator_version="build-19"
+map_version_major="0"
+map_version_minor="9"
+map_version_timestamp="1761151649"
+packet_version="1"
+packet_compatibility="1"
+minimum_required_widelands_version="1.3"
diff --git a/data/maps/Forest_Valley_v2.wmf/binary/terrain b/data/maps/Forest_Valley_v2.wmf/binary/terrain
diff --git a/data/maps/Forest_Valley_v2.wmf/version b/data/maps/Forest_Valley_v2.wmf/version
diff --git a/data/tribes/initialization/atlanteans/images/bridge_pillar_busy_0.5.png b/data/tribes/initialization/atlanteans/images/bridge_pillar_busy_0.5.png
diff --git a/data/tribes/initialization/atlanteans/images/bridge_pillar_busy_1.png b/data/tribes/initialization/atlanteans/images/bridge_pillar_busy_1.png
diff --git a/data/tribes/initialization/atlanteans/images/bridge_pillar_busy_2.png b/data/tribes/initialization/atlanteans/images/bridge_pillar_busy_2.png
diff --git a/data/tribes/initialization/atlanteans/images/bridge_pillar_busy_4.png b/data/tribes/initialization/atlanteans/images/bridge_pillar_busy_4.png
diff --git a/data/tribes/initialization/atlanteans/images/bridge_pillar_normal_0.5.png b/data/tribes/initialization/atlanteans/images/bridge_pillar_normal_0.5.png
diff --git a/data/tribes/initialization/atlanteans/images/bridge_pillar_normal_1.png b/data/tribes/initialization/atlanteans/images/bridge_pillar_normal_1.png
diff --git a/data/tribes/initialization/atlanteans/images/bridge_pillar_normal_2.png b/data/tribes/initialization/atlanteans/images/bridge_pillar_normal_2.png
diff --git a/data/tribes/initialization/atlanteans/images/bridge_pillar_normal_4.png b/data/tribes/initialization/atlanteans/images/bridge_pillar_normal_4.png
diff --git a/data/tribes/initialization/atlanteans/units.lua b/data/tribes/initialization/atlanteans/units.lua
@@ -43,14 +43,19 @@
 --
 --    **name**: A string containing the internal name of the tribe.
 --
---    **animations**: Global animations. Contains subtables for ``frontier``, ``flag``, and ``pinned_note``.
---    Each animation needs the parameter ``hotspot`` (2 integer coordinates),
---    and may also define ``fps`` (integer frames per second).
---
 --    **animation_directory**: The location of the animation png files.
 --
---    **bridges**: Contains animations for ``normal_e``, ``normal_se``, ``normal_sw``,
---    ``busy_e``, ``busy_se`` and ``busy_sw``.
+--    **animations**: Global animations. Contains subtables for:
+--
+--    * ``frontier``
+--    * ``flag``
+--    * ``pinned_note``
+--    * ``bridge_normal_e``, ``bridge_normal_se``, ``bridge_normal_sw``
+--    * ``bridge_busy_e``, ``bridge_busy_se``, ``bridge_busy_sw``
+--    * (optional) ``bridge_pillar_normal``, ``bridge_pillar_busy`` .. versionadded:: 1.4
+--
+--    Each animation needs the parameter ``hotspot`` (2 integer coordinates),
+--    and may also define ``fps`` (integer frames per second).
 --
 --    **bridge_height**: The height in pixels of each bridge at it's summit at 1x scale.
 --
@@ -349,7 +354,9 @@ wl.Descriptions():new_tribe {
       bridge_normal_se = { hotspot = {8, 8} },
       bridge_busy_se = { hotspot = {8, 8} },
       bridge_normal_sw = { hotspot = {40, 8} },
-      bridge_busy_sw = { hotspot = {40, 8} }
+      bridge_busy_sw = { hotspot = {40, 8} },
+      bridge_pillar_normal = { hotspot = {14, 9} },
+      bridge_pillar_busy = { hotspot = {14, 9} },
    },
    spritesheets = {
       flag = {

diff --git a/data/tribes/initialization/empire/images/bridge_pillar_busy_0.5.png b/data/tribes/initialization/empire/images/bridge_pillar_busy_0.5.png
diff --git a/data/tribes/initialization/empire/images/bridge_pillar_busy_1.png b/data/tribes/initialization/empire/images/bridge_pillar_busy_1.png
diff --git a/data/tribes/initialization/empire/images/bridge_pillar_busy_2.png b/data/tribes/initialization/empire/images/bridge_pillar_busy_2.png
diff --git a/data/tribes/initialization/empire/images/bridge_pillar_busy_4.png b/data/tribes/initialization/empire/images/bridge_pillar_busy_4.png
diff --git a/data/tribes/initialization/empire/images/bridge_pillar_normal_0.5.png b/data/tribes/initialization/empire/images/bridge_pillar_normal_0.5.png
diff --git a/data/tribes/initialization/empire/images/bridge_pillar_normal_1.png b/data/tribes/initialization/empire/images/bridge_pillar_normal_1.png
diff --git a/data/tribes/initialization/empire/images/bridge_pillar_normal_2.png b/data/tribes/initialization/empire/images/bridge_pillar_normal_2.png
diff --git a/data/tribes/initialization/empire/images/bridge_pillar_normal_4.png b/data/tribes/initialization/empire/images/bridge_pillar_normal_4.png
diff --git a/data/tribes/initialization/empire/units.lua b/data/tribes/initialization/empire/units.lua
@@ -22,7 +22,9 @@ wl.Descriptions():new_tribe {
       bridge_normal_se = { hotspot = {8, 8} },
       bridge_busy_se = { hotspot = {8, 8} },
       bridge_normal_sw = { hotspot = {40, 8} },
-      bridge_busy_sw = { hotspot = {40, 8} }
+      bridge_busy_sw = { hotspot = {40, 8} },
+      bridge_pillar_normal = { hotspot = {14, 9} },
+      bridge_pillar_busy = { hotspot = {14, 9} },
    },
    spritesheets = {
       frontier = {

diff --git a/data/tribes/initialization/frisians/images/bridge_pillar_busy_0.5.png b/data/tribes/initialization/frisians/images/bridge_pillar_busy_0.5.png
diff --git a/data/tribes/initialization/frisians/images/bridge_pillar_busy_1.png b/data/tribes/initialization/frisians/images/bridge_pillar_busy_1.png
diff --git a/data/tribes/initialization/frisians/images/bridge_pillar_busy_2.png b/data/tribes/initialization/frisians/images/bridge_pillar_busy_2.png
diff --git a/data/tribes/initialization/frisians/images/bridge_pillar_busy_4.png b/data/tribes/initialization/frisians/images/bridge_pillar_busy_4.png
diff --git a/data/tribes/initialization/frisians/images/bridge_pillar_normal_0.5.png b/data/tribes/initialization/frisians/images/bridge_pillar_normal_0.5.png
diff --git a/data/tribes/initialization/frisians/images/bridge_pillar_normal_1.png b/data/tribes/initialization/frisians/images/bridge_pillar_normal_1.png
diff --git a/data/tribes/initialization/frisians/images/bridge_pillar_normal_2.png b/data/tribes/initialization/frisians/images/bridge_pillar_normal_2.png
diff --git a/data/tribes/initialization/frisians/images/bridge_pillar_normal_4.png b/data/tribes/initialization/frisians/images/bridge_pillar_normal_4.png
diff --git a/data/tribes/initialization/frisians/units.lua b/data/tribes/initialization/frisians/units.lua
@@ -16,7 +16,9 @@ wl.Descriptions():new_tribe {
       bridge_normal_se = { hotspot = {8, 8} },
       bridge_busy_se = { hotspot = {8, 8} },
       bridge_normal_sw = { hotspot = {40, 8} },
-      bridge_busy_sw = { hotspot = {40, 8} }
+      bridge_busy_sw = { hotspot = {40, 8} },
+      bridge_pillar_normal = { hotspot = {18, 13} },
+      bridge_pillar_busy = { hotspot = {18, 13} },
    },
    spritesheets = {
       flag = {

diff --git a/data/world/init.lua b/data/world/init.lua
@@ -507,6 +507,7 @@ local result = {
             "summer_snow",
             "lava",
             "summer_water",
+            "summer_bridgeable_water",
          }
       },
       {

diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_00.png b/data/world/terrains/summer/bridgeable_water/bridgeable_00.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_01.png b/data/world/terrains/summer/bridgeable_water/bridgeable_01.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_02.png b/data/world/terrains/summer/bridgeable_water/bridgeable_02.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_03.png b/data/world/terrains/summer/bridgeable_water/bridgeable_03.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_04.png b/data/world/terrains/summer/bridgeable_water/bridgeable_04.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_05.png b/data/world/terrains/summer/bridgeable_water/bridgeable_05.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_06.png b/data/world/terrains/summer/bridgeable_water/bridgeable_06.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_07.png b/data/world/terrains/summer/bridgeable_water/bridgeable_07.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_08.png b/data/world/terrains/summer/bridgeable_water/bridgeable_08.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_09.png b/data/world/terrains/summer/bridgeable_water/bridgeable_09.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_10.png b/data/world/terrains/summer/bridgeable_water/bridgeable_10.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_11.png b/data/world/terrains/summer/bridgeable_water/bridgeable_11.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_12.png b/data/world/terrains/summer/bridgeable_water/bridgeable_12.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_13.png b/data/world/terrains/summer/bridgeable_water/bridgeable_13.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_14.png b/data/world/terrains/summer/bridgeable_water/bridgeable_14.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_15.png b/data/world/terrains/summer/bridgeable_water/bridgeable_15.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_16.png b/data/world/terrains/summer/bridgeable_water/bridgeable_16.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_17.png b/data/world/terrains/summer/bridgeable_water/bridgeable_17.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_18.png b/data/world/terrains/summer/bridgeable_water/bridgeable_18.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_19.png b/data/world/terrains/summer/bridgeable_water/bridgeable_19.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_20.png b/data/world/terrains/summer/bridgeable_water/bridgeable_20.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_21.png b/data/world/terrains/summer/bridgeable_water/bridgeable_21.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_22.png b/data/world/terrains/summer/bridgeable_water/bridgeable_22.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_23.png b/data/world/terrains/summer/bridgeable_water/bridgeable_23.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_24.png b/data/world/terrains/summer/bridgeable_water/bridgeable_24.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_25.png b/data/world/terrains/summer/bridgeable_water/bridgeable_25.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_26.png b/data/world/terrains/summer/bridgeable_water/bridgeable_26.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_27.png b/data/world/terrains/summer/bridgeable_water/bridgeable_27.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_28.png b/data/world/terrains/summer/bridgeable_water/bridgeable_28.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_29.png b/data/world/terrains/summer/bridgeable_water/bridgeable_29.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_30.png b/data/world/terrains/summer/bridgeable_water/bridgeable_30.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_31.png b/data/world/terrains/summer/bridgeable_water/bridgeable_31.png
diff --git a/data/world/terrains/summer/bridgeable_water/bridgeable_32.png b/data/world/terrains/summer/bridgeable_water/bridgeable_32.png
diff --git a/data/world/terrains/summer/bridgeable_water/init.lua b/data/world/terrains/summer/bridgeable_water/init.lua
@@ -0,0 +1,19 @@
+push_textdomain("world")
+
+wl.Descriptions():new_terrain_type{
+   name = "summer_bridgeable_water",
+   descname = _("Bridgeable Water"),
+   is = "bridgeable",
+   valid_resources = {"resource_fish"},
+   default_resource = "resource_fish",
+   default_resource_amount = 1,
+   textures = path.list_files(path.dirname(__file__) .. "bridgeable_??.png"),
+   dither_layer = 181,
+   fps = 10,
+   temperature = 100,
+   humidity = 999,
+   fertility = 1,
+   enhancement = { diking = "summer_beach" }
+}
+
+pop_textdomain()
diff --git a/data/world/terrains/summer/bridgeable_water/register.lua b/data/world/terrains/summer/bridgeable_water/register.lua
@@ -0,0 +1,3 @@
+return {
+   summer_bridgeable_water = {}
+}
diff --git a/src/ai/ai_help_structs.cc b/src/ai/ai_help_structs.cc
@@ -39,6 +39,7 @@ constexpr int kNeuronsPos = 1;
 constexpr int kFNeuronsPos = 2;
 
 // CheckStepRoadAI
+// TODO(tothxa): Unify with main CheckStepRoad
 CheckStepRoadAI::CheckStepRoadAI(Widelands::Player* const pl, uint8_t const mc, bool const oe)
    : player(pl), movecaps(mc), open_end(oe) {
 }
@@ -55,9 +56,20 @@ bool CheckStepRoadAI::allowed(const Widelands::Map& map,
 		return false;
 	}
 
-	// Calculate cost and passability
+	// Check passability
 	if ((endcaps & movecaps) == 0) {
-		return false;
+		// Check exceptions
+		if ((movecaps & Widelands::MOVECAPS_WALK) != 0) {
+			if ((endcaps & Widelands::BUILDCAPS_BRIDGE) == 0) {
+				return false;
+			}
+		} else {
+			assert((movecaps & Widelands::MOVECAPS_SWIM) != 0);
+			if (((endcaps & Widelands::MOVECAPS_WALK) == 0) ||
+			    ((player->get_buildcaps(start) & Widelands::MOVECAPS_SWIM) == 0)) {
+				return false;
+			}
+		}
 	}
 
 	// Check for blocking immovables
@@ -82,17 +94,16 @@ bool CheckStepRoadAI::reachable_dest(const Widelands::Map& map,
                                      const Widelands::FCoords& dest) const {
 	Widelands::NodeCaps const caps = dest.field->nodecaps();
 
-	if ((caps & movecaps) == 0) {
-		if (((movecaps & Widelands::MOVECAPS_SWIM) == 0) ||
-		    ((caps & Widelands::MOVECAPS_WALK) == 0)) {
-			return false;
-		}
-		if (!map.can_reach_by_water(dest)) {
-			return false;
-		}
+	if ((caps & movecaps) != 0) {
+		return true;
 	}
 
-	return true;
+	if ((movecaps & Widelands::MOVECAPS_WALK) != 0) {
+		return (caps & Widelands::BUILDCAPS_BRIDGE) != 0;
+	}
+
+	assert((movecaps & Widelands::MOVECAPS_SWIM) != 0);
+	return map.can_reach_by_water(dest);
 }
 
 // CheckStepOwnTerritory
@@ -105,7 +116,7 @@ CheckStepOwnTerritory::CheckStepOwnTerritory(Widelands::Player* const pl,
 // Defines when movement is allowed:
 // 1. startfield is walkable (or it is the first step)
 // And endfield either:
-// 2a. is walkable
+// 2a. is walkable or bridgeable
 // 2b. has our PlayerImmovable (building or flag)
 bool CheckStepOwnTerritory::allowed(const Widelands::Map& map,
                                     Widelands::FCoords start,
@@ -121,13 +132,19 @@ bool CheckStepOwnTerritory::allowed(const Widelands::Map& map,
 		return false;
 	}
 
+	// TODO(tothxa): Needs changing if the AI is made to handle waterways
+	if ((movecaps & Widelands::MOVECAPS_WALK) == 0) {
+		NEVER_HERE();
+	}
+
 	// Start field must be walkable
-	if ((startcaps & movecaps) == 0) {
+	if (((startcaps & movecaps) == 0) && ((startcaps & Widelands::BUILDCAPS_BRIDGE) == 0)) {
 		return false;
 	}
 
 	// Endfield can not be water
-	if ((endcaps & Widelands::MOVECAPS_SWIM) != 0) {
+	if (((endcaps & Widelands::MOVECAPS_SWIM) != 0) &&
+	    ((endcaps & Widelands::BUILDCAPS_BRIDGE) == 0)) {
 		return false;
 	}
 
@@ -138,10 +155,10 @@ bool CheckStepOwnTerritory::allowed(const Widelands::Map& map,
 bool CheckStepOwnTerritory::reachable_dest(const Widelands::Map& map,
                                            const Widelands::FCoords& dest) const {
 	const uint8_t endcaps = player->get_buildcaps(dest);
-	if (Widelands::BaseImmovable const* const imm = map.get_immovable(dest)) {
+	if (Widelands::BaseImmovable const* const imm = map.get_immovable(dest); imm != nullptr) {
 		return imm->descr().type() >= Widelands::MapObjectType::FLAG;
 	}
-	return (endcaps & Widelands::MOVECAPS_WALK) != 0;
+	return (endcaps & (Widelands::MOVECAPS_WALK | Widelands::BUILDCAPS_BRIDGE)) != 0;
 }
 
 // We are looking for fields we can walk on

diff --git a/src/economy/road.cc b/src/economy/road.cc
@@ -384,8 +384,8 @@ bool Road::notify_ware(Game& game, FlagId const flagid) {
 	return false;
 }
 
-// This returns true if and only if this is road covers the specified edge and
-// both triangles adjacent to that edge are unwalkable
+// This returns true if and only if this road covers the specified edge and
+// both triangles adjacent to that edge are water or unwalkable
 bool Road::is_bridge(const EditorGameBase& egbase, const FCoords& field, uint8_t dir) const {
 	const Map& map = egbase.map();
 
@@ -439,9 +439,9 @@ bool Road::is_bridge(const EditorGameBase& egbase, const FCoords& field, uint8_t
 		NEVER_HERE();
 	}
 	return ((egbase.descriptions().get_terrain_descr(fd.field->terrain_d())->get_is() &
-	         TerrainDescription::Is::kUnwalkable) != 0) &&
+	         (TerrainDescription::Is::kWater | TerrainDescription::Is::kUnwalkable)) != 0) &&
 	       ((egbase.descriptions().get_terrain_descr(fr.field->terrain_r())->get_is() &
-	         TerrainDescription::Is::kUnwalkable) != 0);
+	         (TerrainDescription::Is::kWater | TerrainDescription::Is::kUnwalkable)) != 0);
 }
 
 /**

diff --git a/src/graphic/gl/fields_to_draw.cc b/src/graphic/gl/fields_to_draw.cc
@@ -134,6 +134,7 @@ void FieldsToDraw::reset(const Widelands::EditorGameBase& egbase,
 
 			f.ln_index = calculate_index(fx - 1, fy);
 			f.rn_index = calculate_index(fx + 1, fy);
+			f.tln_index = calculate_index(fx + (fy & 1) - 1, fy - 1);
 			f.trn_index = calculate_index(fx + (fy & 1), fy - 1);
 			f.bln_index = calculate_index(fx + (fy & 1) - 1, fy + 1);
 			f.brn_index = calculate_index(fx + (fy & 1), fy + 1);

diff --git a/src/graphic/gl/fields_to_draw.h b/src/graphic/gl/fields_to_draw.h
@@ -62,14 +62,15 @@ class FieldsToDraw {
 		// neighbor is not contained.
 		int ln_index;
 		int rn_index;
+		int tln_index;
 		int trn_index;
 		int bln_index;
 		int brn_index;
 
 		[[nodiscard]] inline bool all_neighbors_valid() const {
 			return ln_index != kInvalidIndex && rn_index != kInvalidIndex &&
-			       trn_index != kInvalidIndex && bln_index != kInvalidIndex &&
-			       brn_index != kInvalidIndex;
+			       tln_index != kInvalidIndex && trn_index != kInvalidIndex &&
+			       bln_index != kInvalidIndex && brn_index != kInvalidIndex;
 		}
 	};
 
@@ -94,6 +95,14 @@ class FieldsToDraw {
 		return &fields_[index];
 	}
 
+	// Returns the field at 'index' if it is valid, otherwise returns nullptr.
+	[[nodiscard]] inline const Field* check_field(const int index) const {
+		if (index == kInvalidIndex) {
+			return nullptr;
+		}
+		return &fields_[index];
+	}
+
 	// Calculates the index of the given field with ('fx', 'fy') being geometric
 	// coordinates in the map. Returns INVALID_INDEX if this field is not in the
 	// fields_to_draw.

diff --git a/src/logic/field.h b/src/logic/field.h
@@ -69,7 +69,8 @@ class Field {
 		Buildhelp_Big = 3,
 		Buildhelp_Mine = 4,
 		Buildhelp_Port = 5,
-		Buildhelp_None = 6
+		Buildhelp_Bridge = 6,
+		Buildhelp_None = 7
 	};
 
 	using Height = uint8_t;
-Original file line number
+Diff line change
@@ Expand Up / @@ -507,6 +507,7 @@ local result = { @@
                 "summer_snow",
                 "lava",
                 "summer_water",
+                "summer_bridgeable_water",
              }
           },
           {
@@ Expand Down @@