make invalid moors removable

paulwedeck · Aug 17, 2021 · 63a47a0 · 63a47a0
1 parent d70f9b1
commit 63a47a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/jsettlers.common/src/main/java/jsettlers/common/landscape/ELandscapeType.java b/jsettlers.common/src/main/java/jsettlers/common/landscape/ELandscapeType.java
@@ -72,7 +72,7 @@ public enum ELandscapeType {
 	public static final Set<ELandscapeType> SNOW_TYPES = EnumSet.of(SNOW, SNOWBORDER, SNOWBORDEROUTER);
 	public static final Set<ELandscapeType> MOOR_TYPES = EnumSet.of(MOOR, MOORBORDER, MOORBORDEROUTER);
 	public static final Set<ELandscapeType> MOUNTAIN_TYPES = EnumSet.of(MOUNTAIN, MOUNTAINBORDER);
-	private static final Set<ELandscapeType> FLAT_TYPES = EnumSet.of(MOOR, MOORBORDER, WATER1, WATER2, WATER3, WATER4, WATER5, WATER6, WATER7, WATER8);
+	private static final Set<ELandscapeType> FLAT_TYPES = EnumSet.of(MOOR, MOORBORDER, MOORBORDEROUTER, WATER1, WATER2, WATER3, WATER4, WATER5, WATER6, WATER7, WATER8);
 
 	public final int image;
 	public final Color color;

diff --git a/jsettlers.mapcreator/src/main/java/jsettlers/mapcreator/data/MapData.java b/jsettlers.mapcreator/src/main/java/jsettlers/mapcreator/data/MapData.java
@@ -223,7 +223,7 @@ to reduce the current layer to its root layer (GRASS to SAND and then SAND to WA
 			}
 		}
 
-		if(type.isFlat() && has_hight_diff) return false;
+		if(!landscapes[x][y].isFlat() && type.isFlat() && has_hight_diff) return false;
 
 		if(resourceAmount[x][y] > 0 && !type.canHoldResource(resources[x][y])) decreaseResourceTo(x, y, (byte) 0);
-Original file line number
+Diff line change
@@ Expand Up @@
     			}
     		}
-    		if(type.isFlat() && has_hight_diff) return false;
+    		if(!landscapes[x][y].isFlat() && type.isFlat() && has_hight_diff) return false;
     		if(resourceAmount[x][y] > 0 && !type.canHoldResource(resources[x][y])) decreaseResourceTo(x, y, (byte) 0);
@@ Expand Down @@