From a8f4679ee638ab821286fb393360033a026effd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?= Date: Fri, 2 Sep 2022 22:21:56 +0200 Subject: [PATCH] Extract game start point configuration to database --- data.mv.db | Bin 36864 -> 57344 bytes .../demo/runner/DemoRunner.java | 13 +++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/data.mv.db b/data.mv.db index 208c521ae4b4963c5ff6c492c0caf2cf28d9ccb6..1f6bfef39e22e0cc21a7b00bf72f820ac3f533cb 100644 GIT binary patch literal 57344 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 diff --git a/src/main/java/com/bartlomiejpluta/demo/runner/DemoRunner.java b/src/main/java/com/bartlomiejpluta/demo/runner/DemoRunner.java index c0f5e7e..81a0c7d 100644 --- a/src/main/java/com/bartlomiejpluta/demo/runner/DemoRunner.java +++ b/src/main/java/com/bartlomiejpluta/demo/runner/DemoRunner.java @@ -1,5 +1,6 @@ package com.bartlomiejpluta.demo.runner; +import DB.dao; import com.bartlomiejpluta.base.api.context.Context; import com.bartlomiejpluta.base.api.gui.GUI; import com.bartlomiejpluta.base.api.runner.GameRunner; @@ -10,6 +11,8 @@ import lombok.Getter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static java.lang.Integer.parseInt; + public class DemoRunner implements GameRunner { private static final Logger log = LoggerFactory.getLogger(DemoRunner.class); @@ -36,7 +39,7 @@ public class DemoRunner implements GameRunner { } private void configureCamera() { - context.getCamera().setScale(2f); + context.getCamera().setScale(1.5f); } private void initMenu() { @@ -59,9 +62,11 @@ public class DemoRunner implements GameRunner { guiManager.closeAll(); guiManager.enableGameMenu(); player.reset(); - context.openMap(A.maps.hero_home.uid); - context.getMap().getObjectLayer(A.maps.hero_home.layers.main).addEntity(this.player); - player.setCoordinates(11, 14); + var start = dao.start_game.find((short) 1); + var startPoint = start.getStartPoint().split(","); + context.openMap(A.maps.get(startPoint[0]).uid); + context.getMap().getObjectLayer(A.maps.getLayer(startPoint[0], startPoint[1])).addEntity(this.player); + player.setCoordinates(parseInt(startPoint[2]), parseInt(startPoint[3])); context.resume(); hud.show(); }