Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@
{ "tag": "object-6", "position": { "row": 9, "col": 9 }, "assetPath": "assets/bush.png" }
],
"backgroundPath": "assets/map.png",
"north": "location-2",
"directionToLocationMap": {
"NORTH": "location-2",
"SOUTH": "location-3"
},
"width": 10,
"height": 10
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
{ "tag": "object-8", "position": { "row": 8, "col": 8 }, "assetPath": "assets/coin.png" }
],
"backgroundPath": "assets/map.png",
"directionToLocationMap": {
"SOUTH": "location-1"
},
"north": "location-3",
"width": 10,
"height": 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
{ "tag": "object-3", "position": { "row": 1, "col": 1 }, "assetPath": "assets/zombie.png" }
],
"backgroundPath": "assets/map.png",
"directionToLocationMap": {
"NORTH": "location-1"
},
"width": 10,
"height": 10
}
4 changes: 3 additions & 1 deletion src/main/java/io/rpg/Initializer.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import io.rpg.config.model.LocationConfig;
import io.rpg.controller.PlayerController;
import io.rpg.model.actions.LocationChangeAction;
import io.rpg.model.data.MapDirection;
import io.rpg.model.location.LocationModel;
import io.rpg.model.object.GameObject;
import io.rpg.model.object.Player;
Expand All @@ -27,6 +28,7 @@

import java.io.IOException;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;

Expand Down Expand Up @@ -80,11 +82,11 @@ public Result<Game, Exception> initialize() {
List<GameObjectView> gameObjectViews = loadGameObjectViewsForLocation(locationConfig);

registerGameObjectViewsToModel(gameObjects, gameObjectViews);

LocationModel model = new LocationModel.Builder()
.setTag(locationConfig.getTag())
.setBounds(new Point2D(locationConfig.getWidth(), locationConfig.getHeight()))
.setGameObjects(gameObjects)
.setDirectionToLocationMap(locationConfig.getDirectionToLocationMap())
.build();

LocationView view = loadLocationViewFromConfig(locationConfig);
Expand Down
17 changes: 14 additions & 3 deletions src/main/java/io/rpg/config/model/LocationConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@


import com.kkafara.rt.Result;
import io.rpg.model.data.MapDirection;
import io.rpg.util.ErrorMessageBuilder;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.nio.file.Files;
import java.nio.file.Path;
import java.util.LinkedHashSet;
import java.util.Optional;
import java.util.Set;
import java.util.*;

public class LocationConfig {
public static final int MAX_HEIGHT = 10;
Expand All @@ -21,6 +20,9 @@ public class LocationConfig {
@NotNull
private Set<GameObjectConfig> objects;

@NotNull
private HashMap<MapDirection, String> directionToLocationMap;

@Nullable
private Path path;

Expand Down Expand Up @@ -56,6 +58,15 @@ public Set<GameObjectConfig> getObjects() {
return objects;
}

@NotNull
public HashMap<MapDirection, String> getDirectionToLocationMap() {
// same as objects in getObjects the direction map might be null if loaded via Gson
if (directionToLocationMap == null) {
directionToLocationMap = new HashMap<>();
}
return directionToLocationMap;
}

public void addObjectConfig(@NotNull GameObjectConfig config) {
objects.add(config);
}
Expand Down
18 changes: 8 additions & 10 deletions src/main/java/io/rpg/model/location/LocationModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@
import io.rpg.model.data.Position;
import io.rpg.model.object.GameObject;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.*;

import javafx.beans.value.ChangeListener;
import javafx.geometry.Point2D;
import org.apache.logging.log4j.LogManager;
Expand All @@ -30,7 +25,7 @@ public class LocationModel extends BaseActionEmitter implements LocationModelSta
private List<GameObject> gameObjects;
private final HashMap<GameObject, ChangeListener<Point2D>> positionListeners;
private final HashMap<Position, GameObject> positionGameObjectMap;
private final HashMap<MapDirection, String> directionToLocationMap;
private HashMap<MapDirection, String> directionToLocationMap;
public Point2D bounds;
private final Set<LocationModelStateChange.Observer> locationModelStateChangeObservers;

Expand All @@ -46,8 +41,6 @@ private LocationModel() {
this.positionListeners = new HashMap<>();
this.positionGameObjectMap = new HashMap<>();
this.directionToLocationMap = new HashMap<>();

directionToLocationMap.put(MapDirection.EAST, "location-1");
}

public String getTag() {
Expand Down Expand Up @@ -245,6 +238,11 @@ public Builder setTag(@NotNull String tag) {
return this;
}

public Builder setDirectionToLocationMap(@NotNull HashMap<MapDirection, String> directionToLocationMap) {
locationModel.directionToLocationMap = directionToLocationMap;
return this;
}

public LocationModel build() {
Result<Void, Void> result = locationModel.validate();

Expand Down