From d431d930599c80d211d46781523e719f77a1652e Mon Sep 17 00:00:00 2001 From: nooralindeflaten Date: Wed, 21 Apr 2021 14:43:40 +0200 Subject: [PATCH 1/2] added two new maps for the game, dizzy dash and checkmate --- src/main/resources/Checkmate.tmx | 164 ++++++++++++++++++++++++++++++ src/main/resources/Dizzy-Dash.tmx | 144 ++++++++++++++++++++++++++ 2 files changed, 308 insertions(+) create mode 100644 src/main/resources/Checkmate.tmx create mode 100644 src/main/resources/Dizzy-Dash.tmx diff --git a/src/main/resources/Checkmate.tmx b/src/main/resources/Checkmate.tmx new file mode 100644 index 0000000..1873c9a --- /dev/null +++ b/src/main/resources/Checkmate.tmx @@ -0,0 +1,164 @@ + + + + + +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,6,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,6,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,6,0,0,0, +0,0,0,0,0,6,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,97,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,98,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,19,14,14,14,14,14,14,14,14,20,0, +0,13,0,0,0,0,0,0,0,0,21,0, +0,13,0,0,0,0,0,0,0,0,21,0, +0,13,0,0,0,0,0,0,0,0,21,0, +0,13,0,0,0,0,0,0,0,0,21,0, +0,13,0,0,0,0,0,0,0,0,21,0, +0,13,0,0,0,0,0,0,0,0,21,0, +0,13,0,0,0,0,0,0,0,0,21,0, +0,13,0,0,0,0,0,0,0,0,21,0, +0,27,22,22,22,22,22,22,22,22,28,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,52,0,52,0,0,0,51,0,0,0, +0,0,0,0,0,52,0,51,0,51,0,0, +0,0,52,0,52,0,0,0,51,0,0,0, +0,0,0,52,0,0,0,51,0,51,0,0, +0,0,52,0,52,0,0,0,0,0,0,0, +0,0,0,52,0,0,0,51,0,51,0,0, +0,0,52,0,52,0,51,0,51,0,0,0, +0,0,0,52,0,52,0,51,0,51,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +131,129,0,123,0,121,122,0,124,0,130,132, +0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,31,0,31,0,0,31,0,31,0,0, +0,0,0,29,0,29,29,0,29,0,0,0, +30,0,0,0,0,0,51,0,0,0,0,23, +0,23,0,0,0,0,0,0,0,0,30,0, +30,0,0,0,0,0,0,0,0,0,0,23, +0,23,0,0,0,0,0,0,0,0,30,0, +0,23,0,0,0,0,0,0,0,0,30,0, +30,0,0,0,0,0,0,0,0,0,0,23, +0,23,0,0,0,0,0,0,0,0,30,0, +30,0,0,0,0,0,0,0,0,0,0,23, +0,0,0,31,0,31,31,0,31,0,0,0, +0,0,29,0,29,0,0,29,0,29,0,0, +0,0,31,0,31,0,0,31,0,31,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,30,0,30,0,30,30,30,0,30,0,30, +0,0,29,0,29,0,0,29,0,29,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,15, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,7,0,0,0,0,0,0, +0,0,0,0,0,0,7,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +15,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0 + + + diff --git a/src/main/resources/Dizzy-Dash.tmx b/src/main/resources/Dizzy-Dash.tmx new file mode 100644 index 0000000..a908a13 --- /dev/null +++ b/src/main/resources/Dizzy-Dash.tmx @@ -0,0 +1,144 @@ + + + + + +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,19,14,14,20,0,0,19,14,14,20,0, +0,13,0,0,21,0,0,13,0,0,21,0, +0,13,0,0,21,0,0,13,0,0,21,0, +0,27,22,22,28,0,0,27,22,22,28,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,19,14,14,20,0,0,19,14,14,20,0, +0,13,0,0,21,0,0,13,0,0,21,0, +0,13,0,0,21,0,0,13,0,0,21,0, +0,27,22,22,28,0,0,27,22,22,28,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +52,52,36,0,0,0,0,0,0,33,51,51, +0,0,41,52,52,0,0,51,51,44,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,97,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,99,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,98,0, +131,0,0,0,0,0,0,0,0,0,0,132, +0,129,0,0,0,0,0,0,0,0,130,0, +0,0,0,123,0,0,0,0,124,0,0,0, +0,0,0,0,0,121,122,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,15,0,0,0,0,0,7,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,7,0,0,0,0,0,15,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,54,0,0,53,0,0,54,0,0,0, +0,0,0,54,0,0,0,0,0,54,0,0, +0,0,0,0,0,0,53,0,0,0,0,0, +0,0,0,0,53,0,0,0,0,53,0,0, +0,0,53,0,0,0,0,53,0,0,0,0, +0,0,0,0,0,53,0,0,0,0,0,0, +0,0,54,0,0,0,0,0,54,0,0,0, +0,0,0,54,0,0,53,0,0,54,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,47,0,39,39,0,0,0,0,0, +0,0,0,47,0,0,0,0,0,0,0,0, +0,0,0,47,0,0,0,0,47,0,0,0, +0,0,0,47,0,0,0,0,47,0,0,0, +0,0,0,0,0,0,0,0,47,0,0,0, +0,0,0,0,0,39,39,0,47,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,31,0,31,0,0,31,0,31,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +30,0,0,29,0,0,0,0,0,0,0,23, +0,0,0,0,0,30,23,0,0,0,0,0, +30,0,0,0,0,0,0,0,0,0,0,23, +0,0,0,0,0,0,0,0,31,0,0,0, +0,0,0,29,0,0,0,0,0,0,0,0, +30,0,0,0,0,0,0,0,0,0,0,23, +0,0,0,0,0,30,23,0,0,0,0,0, +30,0,0,0,0,0,0,0,31,0,0,23, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,29,0,29,0,0,29,0,29,0,0, +0,0,31,0,24,0,0,16,0,31,0,0, +0,30,30,0,0,0,0,0,0,23,23,0, +0,0,0,0,0,0,30,0,0,0,0,0, +0,0,0,0,0,0,30,0,0,0,0,0 + + + From 2cbbd85376beb495421fc9ef775e9976d2722b0c Mon Sep 17 00:00:00 2001 From: nooralindeflaten Date: Thu, 22 Apr 2021 16:29:47 +0200 Subject: [PATCH 2/2] changed default board to risky exchange --- .../roborally/app/RoboRallyGame.java | 4 +- .../roborally/board/BoardClientImpl.java | 21 +- .../roborally/gui/screens/GameScreen.java | 1 - src/main/resources/RiskyExchangeBoard.tmx | 428 +++++++++--------- 4 files changed, 245 insertions(+), 209 deletions(-) diff --git a/src/main/java/inf112/isolasjonsteamet/roborally/app/RoboRallyGame.java b/src/main/java/inf112/isolasjonsteamet/roborally/app/RoboRallyGame.java index 1099527..a2c8ec4 100644 --- a/src/main/java/inf112/isolasjonsteamet/roborally/app/RoboRallyGame.java +++ b/src/main/java/inf112/isolasjonsteamet/roborally/app/RoboRallyGame.java @@ -77,7 +77,7 @@ public void create() { //Create new player switchToPlayer(1); - board = new BoardClientImpl(ImmutableList.copyOf(players), "example.tmx"); + board = new BoardClientImpl(ImmutableList.copyOf(players), "RiskyExchangeBoard.tmx"); var viewport = new ScalingViewport(Scaling.fit, Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); @@ -89,7 +89,7 @@ public void create() { stage.addActor(table); table.top(); - table.add(new MapRendererWidget(board, 100)); + table.add(new MapRendererWidget(board, 35)); table.row(); var bottomConsole = new PrintStreamLabel(3, System.out, skin, "default-font", Color.WHITE); diff --git a/src/main/java/inf112/isolasjonsteamet/roborally/board/BoardClientImpl.java b/src/main/java/inf112/isolasjonsteamet/roborally/board/BoardClientImpl.java index c732770..f16a183 100644 --- a/src/main/java/inf112/isolasjonsteamet/roborally/board/BoardClientImpl.java +++ b/src/main/java/inf112/isolasjonsteamet/roborally/board/BoardClientImpl.java @@ -19,11 +19,18 @@ */ public class BoardClientImpl extends BoardImpl implements ClientBoard { - private final TiledMap map; + private TiledMap map; public TiledMapTileLayer boardLayer; public TiledMapTileLayer playerLayer; public TiledMapTileLayer holeLayer; public TiledMapTileLayer flagLayer; + public TiledMapTileLayer wallLayer; + public TiledMapTileLayer laserLayer; + public TiledMapTileLayer wrenchLayer; + public TiledMapTileLayer wrench2Layer; + public TiledMapTileLayer gearLayer; + public TiledMapTileLayer startLayer; + public TiledMapTileLayer conveyorLayer; public TiledMapTileLayer.Cell playerWonCell; public TiledMapTileLayer.Cell playerDiedCell; @@ -35,7 +42,8 @@ public class BoardClientImpl extends BoardImpl implements ClientBoard { */ public BoardClientImpl(List players, String boardFilename) { super(players, new ArrayList<>()); - map = new TmxMapLoader().load(boardFilename); + TmxMapLoader mapLoader = new TmxMapLoader(); + map = mapLoader.load(boardFilename); loadCells(); tiles = tilesFromMap(boardFilename); height = playerLayer.getHeight(); @@ -50,6 +58,14 @@ private void loadCells() { playerLayer = (TiledMapTileLayer) map.getLayers().get("Player"); holeLayer = (TiledMapTileLayer) map.getLayers().get("Hole"); flagLayer = (TiledMapTileLayer) map.getLayers().get("Flag"); + wallLayer = (TiledMapTileLayer) map.getLayers().get("Wall"); + laserLayer = (TiledMapTileLayer) map.getLayers().get("Laser"); + wrenchLayer = (TiledMapTileLayer) map.getLayers().get("Wrench"); + wrench2Layer = (TiledMapTileLayer) map.getLayers().get("Wrench2"); + gearLayer = (TiledMapTileLayer) map.getLayers().get("Gear"); + startLayer = (TiledMapTileLayer) map.getLayers().get("Start"); + conveyorLayer = (TiledMapTileLayer) map.getLayers().get("Conveyor"); + var tileSize = getTextureTileSize(); @@ -96,6 +112,7 @@ private ImmutableList>> tilesFromMap(String boardFilename) { if (flagLayer.getCell(x, y) != null) { acc.add(Tiles.FLAG); + } accY.add(ImmutableList.copyOf(acc)); diff --git a/src/main/java/inf112/isolasjonsteamet/roborally/gui/screens/GameScreen.java b/src/main/java/inf112/isolasjonsteamet/roborally/gui/screens/GameScreen.java index 49d866d..473956f 100644 --- a/src/main/java/inf112/isolasjonsteamet/roborally/gui/screens/GameScreen.java +++ b/src/main/java/inf112/isolasjonsteamet/roborally/gui/screens/GameScreen.java @@ -38,7 +38,6 @@ public void resume() { @Override public void show() { - } @Override diff --git a/src/main/resources/RiskyExchangeBoard.tmx b/src/main/resources/RiskyExchangeBoard.tmx index 1083054..a3b7ac9 100644 --- a/src/main/resources/RiskyExchangeBoard.tmx +++ b/src/main/resources/RiskyExchangeBoard.tmx @@ -1,204 +1,224 @@ - - - - - -5,5,5,5,5,5,5,5,5,5,5,5, -5,5,5,5,5,5,5,5,5,5,5,5, -5,5,5,5,5,5,5,5,5,5,5,5, -5,5,5,5,5,5,5,5,5,5,5,5, -5,5,5,5,5,5,5,5,5,5,5,5, -5,5,5,5,5,5,5,5,5,5,5,5, -5,5,5,5,5,5,5,5,5,5,5,5, -5,5,5,5,5,5,5,5,5,5,5,5, -5,5,5,5,5,5,5,5,5,5,5,5, -5,5,5,5,5,5,5,5,5,5,5,5, -5,5,5,5,5,5,5,5,5,5,5,5, -5,5,5,5,5,5,5,5,5,5,5,5, -5,5,5,5,5,5,5,5,5,5,5,5, -5,5,5,5,5,5,5,5,5,5,5,5, -5,5,5,5,5,5,5,5,5,5,5,5, -5,5,5,5,5,5,5,5,5,5,5,5 - - - - -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,6,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -6,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0 - - - - -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,55,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,71,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,63,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0 - - - - -0,0,0,49,0,50,49,0,50,0,49,0, -51,0,0,49,0,50,49,0,50,0,0,51, -0,0,0,49,0,50,49,0,50,0,0,0, -52,52,52,0,0,50,49,0,50,14,14,14, -0,0,0,0,0,50,49,0,0,0,0,0, -51,51,51,51,51,0,0,51,51,51,51,51, -0,52,52,52,52,0,0,14,14,14,14,14, -0,0,0,0,0,21,49,0,0,0,0,0, -51,51,51,0,0,21,49,0,0,51,51,51, -0,0,0,49,0,21,49,0,50,0,0,0, -0,0,0,49,0,21,49,0,50,0,0,52, -0,0,0,49,0,21,0,0,50,0,49,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -52,52,36,0,0,0,0,0,0,33,51,51, -0,0,41,52,52,0,0,51,51,44,0,0 - - - - -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -131,0,0,0,0,0,0,0,0,0,0,132, -0,129,0,0,0,0,0,0,0,0,130,0, -0,0,0,123,0,0,0,0,124,0,0,0, -0,0,0,0,0,121,122,0,0,0,0,0 - - - - -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,54,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,53,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,53,0,0,0,0,53,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,54,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0 - - - - -15,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,15, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0 - - - - -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,7,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0 - - - - -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,39,39,39, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0 - - - - -0,0,31,0,31,0,0,31,0,31,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -30,0,0,0,0,0,0,0,0,30,0,23, -0,0,0,0,0,0,0,0,0,0,0,0, -30,0,0,0,8,0,0,32,0,0,0,23, -0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0, -30,0,0,0,16,0,0,24,0,0,0,23, -0,0,0,0,0,0,0,0,0,0,0,0, -30,0,0,0,0,0,0,0,0,0,31,23, -0,29,0,0,0,0,0,0,0,0,0,0, -0,0,29,0,29,0,0,29,0,29,0,0, -0,0,31,0,24,0,0,16,0,31,0,0, -0,30,30,0,0,0,0,0,0,23,23,0, -0,0,0,0,0,0,30,0,0,0,0,0, -0,0,0,0,0,0,30,0,0,0,0,0 - - - + + + + + +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5, +5,5,5,5,5,5,5,5,5,5,5,5 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,6,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +6,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,55,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,71,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,63,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,0,49,0,50,49,0,50,0,49,0, +51,0,0,49,0,50,49,0,50,0,0,51, +0,0,0,49,0,50,49,0,50,0,0,0, +52,52,52,0,0,50,49,0,50,14,14,14, +0,0,0,0,0,50,49,0,0,0,0,0, +51,51,51,51,51,0,0,51,51,51,51,51, +0,52,52,52,52,0,0,14,14,14,14,14, +0,0,0,0,0,21,49,0,0,0,0,0, +51,51,51,0,0,21,49,0,0,51,51,51, +0,0,0,49,0,21,49,0,50,0,0,0, +0,0,0,49,0,21,49,0,50,0,0,52, +0,0,0,49,0,21,0,0,50,0,49,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +52,52,36,0,0,0,0,0,0,33,51,51, +0,0,41,52,52,0,0,51,51,44,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +131,0,0,0,0,0,0,0,0,0,0,132, +0,129,0,0,0,0,0,0,0,0,130,0, +0,0,0,123,0,0,0,0,124,0,0,0, +0,0,0,0,0,121,122,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,54,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,53,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,53,0,0,0,0,53,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,54,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0 + + + + +15,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,15, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,7,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,39,39,39, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,31,0,31,0,0,31,0,31,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +30,0,0,0,0,0,0,0,0,30,0,23, +0,0,0,0,0,0,0,0,0,0,0,0, +30,0,0,0,8,0,0,32,0,0,0,23, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +30,0,0,0,16,0,0,24,0,0,0,23, +0,0,0,0,0,0,0,0,0,0,0,0, +30,0,0,0,0,0,0,0,0,0,31,23, +0,29,0,0,0,0,0,0,0,0,0,0, +0,0,29,0,29,0,0,29,0,29,0,0, +0,0,31,0,24,0,0,16,0,31,0,0, +0,30,30,0,0,0,0,0,0,23,23,0, +0,0,0,0,0,0,30,0,0,0,0,0, +0,0,0,0,0,0,30,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0 + + +