Skip to content

Commit

Permalink
Merge pull request #6250 from kuronekochomusuke/boardTaggerBridgeUnde…
Browse files Browse the repository at this point in the history
…rWater

add tag for UnderWaterBridge
  • Loading branch information
SJuliez authored Dec 14, 2024
2 parents df297eb + 039ecf9 commit bd5468c
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion megamek/src/megamek/utilities/BoardsTagger.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ public enum Tags {
TAG_ARMOREDBUILDING("ArmoredBuilding"),
TAG_IMPASSABLE("Impassable"),
TAG_ELEVATOR("Elevator"),
TAG_MULTIPLETHEME("MultipleTheme");
TAG_MULTIPLETHEME("MultipleTheme"),
TAG_UNDERWATERBRIDGE("UnderWaterBridge");

private String tagName;
private static final Map<String, Tags> internalTagMap;
Expand Down Expand Up @@ -233,6 +234,7 @@ private static void tagBoard(File boardFile) {
int impassable = 0;
int elevator = 0;
int multipleTheme = 0;
int underWaterBridge = 0;

for (int x = 0; x < board.getWidth(); x++) {
for (int y = 0; y < board.getHeight(); y++) {
Expand Down Expand Up @@ -291,6 +293,11 @@ private static void tagBoard(File boardFile) {
}
impassable += hex.containsTerrain(IMPASSABLE) ? 1 : 0;
elevator += hex.containsTerrain(ELEVATOR) ? 1 : 0;
if (hex.containsTerrain(WATER)
&& hex.containsTerrain(BRIDGE)
&& (hex.terrainLevel(BRIDGE_ELEV) < hex.terrainLevel(WATER))) {
underWaterBridge++;
}
}
}

Expand Down Expand Up @@ -359,6 +366,7 @@ private static void tagBoard(File boardFile) {
multipleTheme += snowTheme > 0 ? 1 : 0;
multipleTheme += volcanic > 0 ? 1 : 0;
matchingTags.put(Tags.TAG_MULTIPLETHEME, multipleTheme > 1);
matchingTags.put(Tags.TAG_UNDERWATERBRIDGE, underWaterBridge > 0);

// Remove (see below) any auto tags that might be present so that auto tags that
// no longer apply
Expand Down

0 comments on commit bd5468c

Please sign in to comment.