Visual changes for demo 1

configurations/demo-config-1/locations/location-1/location-1.json

@@ -0,0 +1,11 @@
+{
+  "tag": "location-1",
+  "objects": [
+    { "tag": "object-1", "position": { "row": 1, "col": 8 }, "type": "collectible", "assetPath": "assets/diamond.png" },
+    { "tag": "object-2", "position": { "row": 6, "col": 3 }, "type": "collectible", "assetPath": "assets/key.png" },
+    { "tag": "object-3", "position": { "row": 1, "col": 1 }, "type": "dialog", "assetPath": "assets/zombie.png" },
+    { "tag": "object-4", "position": { "row": 3, "col": 2 }, "type": "dialog", "assetPath": "assets/zombie.png" },
+    { "tag": "object-5", "position": { "row": 8, "col": 8 }, "type": "dialog", "assetPath": "assets/chest.png" }
+  ],
+  "backgroundPath": "assets/map.png"
+}

configurations/demo-config-1/root.json

@@ -0,0 +1,14 @@
+{
+  "tag": "GameByConfig1",
+  "locationTags": [
+    "location-1"
+  ],
+  "rootLocation": "location-1",
+  "player": {
+    "tag": "player",
+    "position": { "row": 4, "col": 5 },
+    "type": "player",
+    "assetPath": "assets/knight.png",
+    "location": "location-1"
+  }
+}

src/main/java/io/rpg/Main.java

@@ -16,7 +16,7 @@ public void start(Stage stage) throws IOException {
     Configurator.setRootLevel(Level.DEBUG);
     Logger logger = LogManager.getLogger(Main.class);
 
-    Initializer worldInitializer = new Initializer("configurations/config-1", stage);
+    Initializer worldInitializer = new Initializer("configurations/demo-config-1", stage);
     Result<Game, Exception>  initializationResult = worldInitializer.initialize();
 
     if (initializationResult.isError()) {

src/main/java/io/rpg/controller/Controller.java

@@ -4,6 +4,7 @@
 import io.rpg.model.data.MouseClickedEvent;
 import io.rpg.model.data.Vector;
 import io.rpg.model.location.LocationModel;
+import io.rpg.model.object.CollectibleGameObject;
 import io.rpg.model.object.GameObject;
 import io.rpg.model.object.InteractiveGameObject;
 import io.rpg.model.object.Player;
@@ -117,13 +118,19 @@ private int getWindowCenterY() {
 
   @Override
   public void onMouseClickedEvent(MouseClickedEvent event) {
+    int SCALE = 64;
     Vector playerPos = currentModel.getPlayer().getPixelPosition();
     GameObjectView objectView = event.source();
-    GameObject object = currentModel.getObject((int) objectView.getY() / 32, (int) objectView.getX() / 32);
-    if (Math.abs(playerPos.x - objectView.getX()) / 32 <= 1.5 && Math.abs(playerPos.y - objectView.getY()) / 32 <= 1.5) {
+    GameObject object = currentModel.getObject((int) objectView.getY() / SCALE, (int) objectView.getX() / SCALE);
+    if (Math.abs(playerPos.x - objectView.getX()) / SCALE <= 1.5 && Math.abs(playerPos.y - objectView.getY()) / SCALE <= 1.5) {
       if (object instanceof InteractiveGameObject) {
         ((InteractiveGameObject) object).onAction();
       }
+
+      if (object instanceof CollectibleGameObject) {
+        popupController.openPointsPopup(5, getWindowCenterX(), getWindowCenterY());
+        objectView.setVisible(false);
+      }
     }
     logger.info("Controller notified on click from " + event.source());
   }

src/main/java/io/rpg/model/data/Vector.java

@@ -17,8 +17,9 @@ public Vector(float x, float y) {
 
   public Vector(Position position) {
     // TODO THIS MOTHT
-    this.x = position.col * 32;
-    this.y = position.row * 32;
+    int SCALE = 64;
+    this.x = position.col * SCALE;
+    this.y = position.row * SCALE;
   }
 
 }

src/main/java/io/rpg/view/GameObjectView.java

@@ -16,7 +16,7 @@ public class GameObjectView extends ImageView
   private Path path;
   private final Set<MouseClickedEvent.Observer> onClickedObservers;
 
-  private final int SCALE = 32;
+  private final int SCALE = 64;
 
   public GameObjectView(@NotNull Path assetPath, @NotNull Position position) {
     this.path = assetPath;
@@ -25,6 +25,11 @@ public GameObjectView(@NotNull Path assetPath, @NotNull Position position) {
     // todo: better position class
     this.setX(position.col * SCALE);
     this.setY(position.row * SCALE);
+
+    this.setPreserveRatio(true);
+    this.setSmooth(false);
+    this.setFitHeight(SCALE);
+
     this.onClickedObservers = new HashSet<>();
     this.setOnMouseClicked(event -> emitOnMouseClickedEvent(new MouseClickedEvent(this, event)));
   }