From 18883b66c25404fecd32623c0576d6f687f61d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?= Date: Fri, 26 Aug 2022 17:30:33 +0200 Subject: [PATCH] Apply new map binary format | remove old maps --- data.mv.db | Bin 36864 -> 45056 bytes maps/551e1afc-9cda-4d9f-8817-bfd831fc0a75.dat | Bin 28141 -> 0 bytes maps/f845355e-b9ad-4884-a217-dd3a4c18a3fa.dat | Bin 15736 -> 0 bytes project.bep | 6 ++---- .../demo/map/BaseMapHandler.java | 1 - .../demo/map/ForrestHandler.java | 5 ----- .../demo/map/ForrestTempleHandler.java | 17 ----------------- .../demo/runner/DemoRunner.java | 4 ++-- ... 7f0b8094-83a5-4690-a8ce-20fe67d8b449.png} | Bin 9 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 maps/551e1afc-9cda-4d9f-8817-bfd831fc0a75.dat delete mode 100644 maps/f845355e-b9ad-4884-a217-dd3a4c18a3fa.dat delete mode 100644 src/main/java/com/bartlomiejpluta/demo/map/ForrestHandler.java delete mode 100644 src/main/java/com/bartlomiejpluta/demo/map/ForrestTempleHandler.java rename tilesets/{d314b030-f865-432e-a356-3845f8aac7bc.png => 7f0b8094-83a5-4690-a8ce-20fe67d8b449.png} (100%) diff --git a/data.mv.db b/data.mv.db index 092a406b2eaa2f30f73f2f7893cd6836ea09aff3..cbc81f3d2d84583e10bfc8ccf6394738b4cbd50b 100644 GIT binary patch delta 4563 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 diff --git a/project.bep b/project.bep index ef4d5bc..a15381f 100644 --- a/project.bep +++ b/project.bep @@ -1,8 +1,6 @@ - BASE Demo*com.bartlomiejpluta.demo.runner.DemoRunner` -$f845355e-b9ad-4884-a217-dd3a4c18a3fa(f845355e-b9ad-4884-a217-dd3a4c18a3fa.datForrest TempleY -$551e1afc-9cda-4d9f-8817-bfd831fc0a75(551e1afc-9cda-4d9f-8817-bfd831fc0a75.datForrest"d -$d314b030-f865-432e-a356-3845f8aac7bc(d314b030-f865-432e-a356-3845f8aac7bc.pngForrest Temple ](2Z + BASE Demo*com.bartlomiejpluta.demo.runner.DemoRunner"d +$7f0b8094-83a5-4690-a8ce-20fe67d8b449(7f0b8094-83a5-4690-a8ce-20fe67d8b449.pngForrest Temple ](2Z $0dcbaf26-d634-4ca8-9691-7a8ff966f702(0dcbaf26-d634-4ca8-9691-7a8ff966f702.pngGaro (2\ $61393836-8127-4277-853f-87b48022ae43(61393836-8127-4277-853f-87b48022ae43.pngCorpse (2^ $e605b2b1-3cab-499f-882d-160ab65b49d8(e605b2b1-3cab-499f-882d-160ab65b49d8.pngSkeleton (2Z diff --git a/src/main/java/com/bartlomiejpluta/demo/map/BaseMapHandler.java b/src/main/java/com/bartlomiejpluta/demo/map/BaseMapHandler.java index b185c26..131e590 100644 --- a/src/main/java/com/bartlomiejpluta/demo/map/BaseMapHandler.java +++ b/src/main/java/com/bartlomiejpluta/demo/map/BaseMapHandler.java @@ -28,7 +28,6 @@ public abstract class BaseMapHandler implements MapHandler { protected Camera camera; protected GameMap map; protected Player player; - protected ObjectLayer mainLayer; protected CameraController cameraController; @Override diff --git a/src/main/java/com/bartlomiejpluta/demo/map/ForrestHandler.java b/src/main/java/com/bartlomiejpluta/demo/map/ForrestHandler.java deleted file mode 100644 index c03f7a2..0000000 --- a/src/main/java/com/bartlomiejpluta/demo/map/ForrestHandler.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.bartlomiejpluta.demo.map; - -public class ForrestHandler extends BaseMapHandler { - -} \ No newline at end of file diff --git a/src/main/java/com/bartlomiejpluta/demo/map/ForrestTempleHandler.java b/src/main/java/com/bartlomiejpluta/demo/map/ForrestTempleHandler.java deleted file mode 100644 index 16c9869..0000000 --- a/src/main/java/com/bartlomiejpluta/demo/map/ForrestTempleHandler.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.bartlomiejpluta.demo.map; - -import com.bartlomiejpluta.base.api.context.Context; -import com.bartlomiejpluta.base.api.map.model.GameMap; - -public class ForrestTempleHandler extends BaseMapHandler { - public static final String UID = "f845355e-b9ad-4884-a217-dd3a4c18a3fa"; - public static final A.maps.GameMapAsset_Layers_ForrestTemple LAYERS = A.maps.forrest_temple.layers; - - public static final int MAIN_LAYER = 4; - - @Override - public void onCreate(Context context, GameMap map) { - super.onCreate(context, map); - this.mainLayer = map.getObjectLayer(MAIN_LAYER); - } -} \ No newline at end of file diff --git a/src/main/java/com/bartlomiejpluta/demo/runner/DemoRunner.java b/src/main/java/com/bartlomiejpluta/demo/runner/DemoRunner.java index 82728f7..b08212d 100644 --- a/src/main/java/com/bartlomiejpluta/demo/runner/DemoRunner.java +++ b/src/main/java/com/bartlomiejpluta/demo/runner/DemoRunner.java @@ -82,8 +82,8 @@ public class DemoRunner implements GameRunner { menu.closeAll(); menu.enableGameMenu(); resetPlayer(); - context.openMap(A.maps.forrest.uid); - context.getMap().getObjectLayer(A.maps.forrest.layers.main).addEntity(this.player); +// context.openMap(A.maps.forrest.uid); +// context.getMap().getObjectLayer(A.maps.forrest.layers.main).addEntity(this.player); player.setCoordinates(5, 36); context.resume(); hud.show(); diff --git a/tilesets/d314b030-f865-432e-a356-3845f8aac7bc.png b/tilesets/7f0b8094-83a5-4690-a8ce-20fe67d8b449.png similarity index 100% rename from tilesets/d314b030-f865-432e-a356-3845f8aac7bc.png rename to tilesets/7f0b8094-83a5-4690-a8ce-20fe67d8b449.png