From 9b6e7cb283d1da8ec8f3973248297ec7fb31f4c1 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 13 Jun 2024 21:49:12 +0200 Subject: [PATCH] misc changes --- megamek/data/images/hexes/hq_saxarba.tileset | 2 +- megamek/data/scenarios/Examples/ExampleV2.mms | 6 +++--- megamek/src/megamek/common/scenario/ScenarioV2.java | 5 +---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/megamek/data/images/hexes/hq_saxarba.tileset b/megamek/data/images/hexes/hq_saxarba.tileset index dd4f3dec5a..62cde94930 100644 --- a/megamek/data/images/hexes/hq_saxarba.tileset +++ b/megamek/data/images/hexes/hq_saxarba.tileset @@ -649,7 +649,7 @@ base 8 "" "lunar" "saxarba/theme_lunar/base_lunar_8.png;saxarba/theme_lunar/base base 9 "" "lunar" "saxarba/theme_lunar/base_lunar_9.png;saxarba/theme_lunar/base_lunar_9b.png;saxarba/theme_lunar/base_lunar_9c.png;saxarba/theme_lunar/base_lunar_9d.png;saxarba/theme_lunar/base_lunar_9e.png;saxarba/theme_lunar/base_lunar_9f.png" base 10 "" "lunar" "saxarba/theme_lunar/base_lunar_10.png;saxarba/theme_lunar/base_lunar_10b.png;saxarba/theme_lunar/base_lunar_10c.png;saxarba/theme_lunar/base_lunar_10d.png;saxarba/theme_lunar/base_lunar_10e.png;saxarba/theme_lunar/base_lunar_10f.png" - +base * "sky:1" "" "atmospheric_map/sky.png" # To avoid errors super * "fluff:*" "" "saxarba/misc/blank.png" diff --git a/megamek/data/scenarios/Examples/ExampleV2.mms b/megamek/data/scenarios/Examples/ExampleV2.mms index 96ba6922fe..40effc1944 100644 --- a/megamek/data/scenarios/Examples/ExampleV2.mms +++ b/megamek/data/scenarios/Examples/ExampleV2.mms @@ -39,13 +39,13 @@ map: file: AGoAC Maps/16x17 Grassland 2.board # surprise board from the given boards; require board nodes (file:) -# can modify individual or all +# can modify individually and total map: surprise: - file: AGoAC Maps/16x17 Grassland 2.board modify: rotate - - file: AGoAC Maps/16x17 Grassland 2.board - - file: AGoAC Maps/16x17 Grassland 2.board + - file: AGoAC Maps/16x17 Grassland 3.board + - file: AGoAC Maps/16x17 Grassland 4.board modify: rotate # add modifiers to a single board diff --git a/megamek/src/megamek/common/scenario/ScenarioV2.java b/megamek/src/megamek/common/scenario/ScenarioV2.java index fbc5733294..b0e8c43157 100644 --- a/megamek/src/megamek/common/scenario/ScenarioV2.java +++ b/megamek/src/megamek/common/scenario/ScenarioV2.java @@ -44,8 +44,6 @@ public class ScenarioV2 implements Scenario { private static final String DEPLOY = "deploy"; private static final String MAP = "map"; private static final String MAPS = "maps"; - private static final String COLUMNS = "columns"; - private static final String ROWS = "rows"; private static final String UNITS = "units"; private final JsonNode node; @@ -157,8 +155,6 @@ private IGame selectGameType() { return new ASGame(); case SBF: return new SBFGame(); -// case GAMETYPE_BF: -// return new BFGame(); default: return new Game(); } @@ -250,6 +246,7 @@ private Board createBoard() throws ScenarioLoaderException { mapNode = node.get(MAPS); } + //TODO: currently, the first parsed board is used return BoardDeserializer.parse(mapNode, scenarioDirectory()).get(0); }