diff --git a/src/main/java/ruscz/game/gameOfProd/Cells/Npc.java b/src/main/java/ruscz/game/gameOfProd/Cells/Npc.java index 887a5ee..966b0b2 100644 --- a/src/main/java/ruscz/game/gameOfProd/Cells/Npc.java +++ b/src/main/java/ruscz/game/gameOfProd/Cells/Npc.java @@ -11,14 +11,16 @@ import java.awt.*; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import java.util.Scanner; public class Npc extends Person { private MapManager mapManager; + private String name; - public Npc(int x, int y, Map map, MapManager mapManager) { + public Npc(int x, int y, String name, Map map, MapManager mapManager) { super(x, y, map); + this.name = name; this.mapManager = mapManager; - setColor(Color.cyan); } public void move(int endX, int endY) { @@ -67,11 +69,20 @@ public class Npc extends Person { public void paint(Graphics2D g) { BufferedImage image = null; try { - image = ImageIO.read(new File("src/main/resources/characters/Fox/foxi.gif")); + File dialogFile = new File("src/main/resources/characters/" + name + ".txt"); + Scanner scanner = new Scanner(dialogFile); + scanner.nextLine(); + String[] imageInfo = scanner.nextLine().split(" "); + int width = Integer.parseInt(imageInfo[0]); + int height = Integer.parseInt(imageInfo[1]); + int direction = Integer.parseInt(imageInfo[2]); + int offsetX = Integer.parseInt(imageInfo[3]); + int offsetY = Integer.parseInt(imageInfo[4]); + image = ImageIO.read(new File("src/main/resources/characters/" + scanner.nextLine())).getSubimage(width * direction, 0, width, height); + g.drawImage(image, getX() * getSize() + (getSize() / 5) + offsetX, + getY() * getSize() - (getSize() * 3/5) + offsetY, getSize() * 3/5, getSize() * 3/2, null); } catch (IOException e) { e.printStackTrace(); } - g.drawImage(image, getX() * getSize(), - getY() * getSize(), getSize(), getSize(), null); } } diff --git a/src/main/java/ruscz/game/gameOfProd/Image/ImageDialog.java b/src/main/java/ruscz/game/gameOfProd/Image/ImageDialog.java index f21a6f4..3c71a89 100644 --- a/src/main/java/ruscz/game/gameOfProd/Image/ImageDialog.java +++ b/src/main/java/ruscz/game/gameOfProd/Image/ImageDialog.java @@ -31,7 +31,7 @@ public class ImageDialog { private void parseImage(){ try { - image = ImageIO.read(new File("src/main/resources/" + name)); + image = ImageIO.read(new File("src/main/resources/characters/" + name)); } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/ruscz/game/gameOfProd/Image/ImagePerson.java b/src/main/java/ruscz/game/gameOfProd/Image/ImagePerson.java index 775fee0..a99c908 100644 --- a/src/main/java/ruscz/game/gameOfProd/Image/ImagePerson.java +++ b/src/main/java/ruscz/game/gameOfProd/Image/ImagePerson.java @@ -25,7 +25,7 @@ public class ImagePerson { for (int i = 0; i < 3; i++) { for (int j = 0; j < 4; j++) { BufferedImage img = image.getSubimage(subimageWidth * i, subimageHeight * j, subimageWidth, subimageHeight); - imagesOfDirection[count] = img; + imagesOfDirection[count] = resize(img); count++; } } @@ -48,24 +48,24 @@ public class ImagePerson { public BufferedImage resize(BufferedImage img) { Image tmp; - if (subimageWidth > WindowOfFreeMove.CELL_SIZE * 2) { - int newHeight = subimageHeight * WindowOfFreeMove.CELL_SIZE * 2 / subimageWidth; - tmp = img.getScaledInstance(WindowOfFreeMove.CELL_SIZE * 2, newHeight, Image.SCALE_SMOOTH); + if (subimageWidth > WindowOfFreeMove.CELL_SIZE) { + int newHeight = subimageHeight * WindowOfFreeMove.CELL_SIZE / subimageWidth; + tmp = img.getScaledInstance(WindowOfFreeMove.CELL_SIZE, newHeight, Image.SCALE_SMOOTH); } else if (subimageHeight > WindowOfFreeMove.CELL_SIZE * 2) { int newWidth = subimageWidth * WindowOfFreeMove.CELL_SIZE * 2 / subimageHeight; tmp = img.getScaledInstance(newWidth, WindowOfFreeMove.CELL_SIZE * 2, Image.SCALE_SMOOTH); } else if (subimageWidth < WindowOfFreeMove.CELL_SIZE && subimageHeight < (WindowOfFreeMove.CELL_SIZE * 2)) { - int newWidth = subimageWidth * WindowOfFreeMove.CELL_SIZE * 2 / subimageHeight; + int newWidth = subimageWidth * WindowOfFreeMove.CELL_SIZE / subimageHeight * 3/2; tmp = img.getScaledInstance(newWidth, (WindowOfFreeMove.CELL_SIZE * 2), Image.SCALE_SMOOTH); } else { tmp = img.getScaledInstance(subimageWidth, subimageHeight, Image.SCALE_SMOOTH); } - BufferedImage dimg = new BufferedImage(WindowOfFreeMove.CELL_SIZE * 2, WindowOfFreeMove.CELL_SIZE * 2, BufferedImage.TYPE_INT_ARGB); + BufferedImage dimg = new BufferedImage(WindowOfFreeMove.CELL_SIZE, WindowOfFreeMove.CELL_SIZE * 2, BufferedImage.TYPE_INT_ARGB); Graphics2D g2d = dimg.createGraphics(); - g2d.drawImage(tmp, (WindowOfFreeMove.CELL_SIZE * 2 - tmp.getWidth(null)) / 2, (WindowOfFreeMove.CELL_SIZE * 2 - tmp.getHeight(null)) / 2, null); + g2d.drawImage(tmp, (WindowOfFreeMove.CELL_SIZE - tmp.getWidth(null)) / 2, (WindowOfFreeMove.CELL_SIZE * 2 - tmp.getHeight(null)) / 2, null); g2d.dispose(); return dimg; diff --git a/src/main/java/ruscz/game/gameOfProd/Map/Map.java b/src/main/java/ruscz/game/gameOfProd/Map/Map.java index 9a8c3a9..79975fb 100644 --- a/src/main/java/ruscz/game/gameOfProd/Map/Map.java +++ b/src/main/java/ruscz/game/gameOfProd/Map/Map.java @@ -110,8 +110,8 @@ public class Map { String[] trigger = line[x].split(","); map.addInteractionEvent(new TriggerCell(x, y, trigger[1], new Dialog(window.getDialogBar()), map.getImageCell(), window)); } else if (line[x].equals("SPAWN")) { + map.setIdExit(0); map.setSpawnPoint(x, y); - map.idExit = 0; } else if (line[x].contains("DOOR") && !line[x].contains("DOORTO")) { String[] door = line[x].split(","); if (door.length == 2) diff --git a/src/main/java/ruscz/game/gameOfProd/Save/LoadManager.java b/src/main/java/ruscz/game/gameOfProd/Save/LoadManager.java index 8705484..21ddcd8 100644 --- a/src/main/java/ruscz/game/gameOfProd/Save/LoadManager.java +++ b/src/main/java/ruscz/game/gameOfProd/Save/LoadManager.java @@ -1,6 +1,7 @@ package ruscz.game.gameOfProd.Save; import ruscz.game.gameOfProd.Cells.ChestCell; +import ruscz.game.gameOfProd.Cells.Npc; import ruscz.game.gameOfProd.Cells.TriggerCell; import ruscz.game.gameOfProd.Inventory.InventoryManager; import ruscz.game.gameOfProd.Inventory.Item; @@ -27,6 +28,7 @@ public class LoadManager { public void loadNewGame() { loadMaps(); + loadNpcs(); } public void loadSavedGame() { @@ -85,6 +87,23 @@ public class LoadManager { } } + private void loadNpcs() { + try { + File npcsFile = new File("src/main/resources/save/newGame/npcs.txt"); + Scanner scanner = new Scanner(npcsFile); + while (scanner.hasNextLine()) { + String name = scanner.nextLine(); + File npcFile = new File("src/main/resources/characters/" + name + ".txt"); + Scanner sc = new Scanner(npcFile); + String[] position = sc.nextLine().split(" "); + Npc npc = new Npc(Integer.parseInt(position[0]), Integer.parseInt(position[1]), name, Map.findMapByName(position[2], window), mapManager); + Map.findMapByName(position[2], window).setNpcs(npc); + } + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + } + private void loadPerson() { try { File personFile = new File("src/main/resources/save/savedGame/person.txt"); diff --git a/src/main/java/ruscz/game/gameOfProd/Windows/Camera.java b/src/main/java/ruscz/game/gameOfProd/Windows/Camera.java index f4bdb38..4c2b903 100644 --- a/src/main/java/ruscz/game/gameOfProd/Windows/Camera.java +++ b/src/main/java/ruscz/game/gameOfProd/Windows/Camera.java @@ -118,7 +118,6 @@ public class Camera { if (count >= time / 2) { stepX = (int) (-angleY); stepY = (int) (-angleX); - System.out.println(angleX + " " + angleY); count = 0; } } diff --git a/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfFreeMove.java b/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfFreeMove.java index a3f95f0..af7ac8b 100644 --- a/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfFreeMove.java +++ b/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfFreeMove.java @@ -151,26 +151,18 @@ public class WindowOfFreeMove extends JLayeredPane { if (newGame) { mapManager.getLoadManager().clearSave(); mapManager.getLoadManager().loadNewGame(); - Map m5 = Map.findMapByName("m5", this); - setMapManager(m5); + Map openspace = Map.findMapByName("openspace", this); + setMapManager(openspace); } else { mapManager.getLoadManager().loadSavedGame(); } - Map boss = Map.findMapByName("boss", this); - - int startX = 4; - int startY = 2; - mapManager.createMap(); isReadyToPaint = true; - Npc npc2 = new Npc(startX, startY, boss, mapManager); - boss.setNpcs(npc2); - musicManager = new MusicManager("Town1.wav"); - musicManager.playMusic(); +// musicManager.playMusic(); Timer timer = new Timer(10, actionEvent -> { mapManager.getActualMap().getPerson().move(); diff --git a/src/main/resources/characters/100ň100.png b/src/main/resources/characters/100ň100.png new file mode 100644 index 0000000..0ab38c6 Binary files /dev/null and b/src/main/resources/characters/100ň100.png differ diff --git a/src/main/resources/characters/boss-face.png b/src/main/resources/characters/boss-face.png new file mode 100644 index 0000000..e909378 Binary files /dev/null and b/src/main/resources/characters/boss-face.png differ diff --git a/src/main/resources/characters/boss.png b/src/main/resources/characters/boss.png new file mode 100644 index 0000000..11acedd Binary files /dev/null and b/src/main/resources/characters/boss.png differ diff --git a/src/main/resources/characters/boss.txt b/src/main/resources/characters/boss.txt new file mode 100644 index 0000000..95d5ae3 --- /dev/null +++ b/src/main/resources/characters/boss.txt @@ -0,0 +1,3 @@ +4 2 boss +50 91 0 0 30 +boss.png \ No newline at end of file diff --git a/src/main/resources/characters/boy1.png b/src/main/resources/characters/boy1.png new file mode 100644 index 0000000..85c1bff Binary files /dev/null and b/src/main/resources/characters/boy1.png differ diff --git a/src/main/resources/characters/boy1.txt b/src/main/resources/characters/boy1.txt new file mode 100644 index 0000000..2faba78 --- /dev/null +++ b/src/main/resources/characters/boy1.txt @@ -0,0 +1,3 @@ +17 20 openspace +35 86 1 0 30 +boy1.png \ No newline at end of file diff --git a/src/main/resources/characters/boy2-face.png b/src/main/resources/characters/boy2-face.png new file mode 100644 index 0000000..5fa5ee4 Binary files /dev/null and b/src/main/resources/characters/boy2-face.png differ diff --git a/src/main/resources/characters/boy2.png b/src/main/resources/characters/boy2.png new file mode 100644 index 0000000..45153ae Binary files /dev/null and b/src/main/resources/characters/boy2.png differ diff --git a/src/main/resources/characters/boy2.txt b/src/main/resources/characters/boy2.txt new file mode 100644 index 0000000..68b2bdf --- /dev/null +++ b/src/main/resources/characters/boy2.txt @@ -0,0 +1,3 @@ +5 1 openspace +35 86 0 0 0 +boy2.png \ No newline at end of file diff --git a/src/main/resources/characters/boy3-face.png b/src/main/resources/characters/boy3-face.png new file mode 100644 index 0000000..c9a32f3 Binary files /dev/null and b/src/main/resources/characters/boy3-face.png differ diff --git a/src/main/resources/characters/boy3.png b/src/main/resources/characters/boy3.png new file mode 100644 index 0000000..1fb4d22 Binary files /dev/null and b/src/main/resources/characters/boy3.png differ diff --git a/src/main/resources/characters/boy3.txt b/src/main/resources/characters/boy3.txt new file mode 100644 index 0000000..152e1bb --- /dev/null +++ b/src/main/resources/characters/boy3.txt @@ -0,0 +1,3 @@ +4 12 openspace +35 84 0 0 0 +boy3.png \ No newline at end of file diff --git a/src/main/resources/characters/boy4.png b/src/main/resources/characters/boy4.png new file mode 100644 index 0000000..68ae06e Binary files /dev/null and b/src/main/resources/characters/boy4.png differ diff --git a/src/main/resources/characters/boy4.txt b/src/main/resources/characters/boy4.txt new file mode 100644 index 0000000..fe9a0fb --- /dev/null +++ b/src/main/resources/characters/boy4.txt @@ -0,0 +1,3 @@ +2 20 openspace +35 84 1 0 30 +boy4.png \ No newline at end of file diff --git a/src/main/resources/characters/boy5.png b/src/main/resources/characters/boy5.png new file mode 100644 index 0000000..a1896ca Binary files /dev/null and b/src/main/resources/characters/boy5.png differ diff --git a/src/main/resources/characters/boy5.txt b/src/main/resources/characters/boy5.txt new file mode 100644 index 0000000..c3728ac --- /dev/null +++ b/src/main/resources/characters/boy5.txt @@ -0,0 +1,3 @@ +12 20 openspace +35 86 1 0 30 +boy5.png \ No newline at end of file diff --git a/src/main/resources/characters/girl1-face.png b/src/main/resources/characters/girl1-face.png new file mode 100644 index 0000000..10efe8c Binary files /dev/null and b/src/main/resources/characters/girl1-face.png differ diff --git a/src/main/resources/characters/girl1.png b/src/main/resources/characters/girl1.png new file mode 100644 index 0000000..f334266 Binary files /dev/null and b/src/main/resources/characters/girl1.png differ diff --git a/src/main/resources/characters/girl1.txt b/src/main/resources/characters/girl1.txt new file mode 100644 index 0000000..6041400 --- /dev/null +++ b/src/main/resources/characters/girl1.txt @@ -0,0 +1,3 @@ +6 1 openspace +35 86 2 0 0 +girl1.png \ No newline at end of file diff --git a/src/main/resources/characters/girl2.png b/src/main/resources/characters/girl2.png new file mode 100644 index 0000000..dcf6155 Binary files /dev/null and b/src/main/resources/characters/girl2.png differ diff --git a/src/main/resources/characters/girl2.txt b/src/main/resources/characters/girl2.txt new file mode 100644 index 0000000..de7e771 --- /dev/null +++ b/src/main/resources/characters/girl2.txt @@ -0,0 +1,3 @@ +7 24 openspace +35 86 1 0 30 +girl2.png \ No newline at end of file diff --git a/src/main/resources/characters/main.txt b/src/main/resources/characters/main.txt index 1c23176..e87a6c6 100644 --- a/src/main/resources/characters/main.txt +++ b/src/main/resources/characters/main.txt @@ -1,2 +1,2 @@ -32 48 -main.png \ No newline at end of file +42 93 +sprayt_38kh91.png \ No newline at end of file diff --git a/src/main/resources/characters/sprayt_38kh91.png b/src/main/resources/characters/sprayt_38kh91.png new file mode 100644 index 0000000..a552cf3 Binary files /dev/null and b/src/main/resources/characters/sprayt_38kh91.png differ diff --git a/src/main/resources/characters/ß»ÓáęÔ 38ň91.png b/src/main/resources/characters/ß»ÓáęÔ 38ň91.png new file mode 100644 index 0000000..4fd7a60 Binary files /dev/null and b/src/main/resources/characters/ß»ÓáęÔ 38ň91.png differ diff --git a/src/main/resources/characters/í«ßß.png b/src/main/resources/characters/í«ßß.png new file mode 100644 index 0000000..74d88e3 Binary files /dev/null and b/src/main/resources/characters/í«ßß.png differ diff --git a/src/main/resources/characters/ŐÓąßź«.png b/src/main/resources/characters/ŐÓąßź«.png new file mode 100644 index 0000000..240e514 Binary files /dev/null and b/src/main/resources/characters/ŐÓąßź«.png differ diff --git a/src/main/resources/dialogs/dialog.txt b/src/main/resources/dialogs/dialog.txt new file mode 100644 index 0000000..75bb898 --- /dev/null +++ b/src/main/resources/dialogs/dialog.txt @@ -0,0 +1,7 @@ + boy2-face.png +... no, I've not heard anything from him. + girl1-face.png +I mean he would't just vanish, right? + boy2-face.png +Beats me. + \ No newline at end of file diff --git a/src/main/resources/dialogs/minecraft.txt b/src/main/resources/dialogs/minecraft.txt index b2d0933..009e3aa 100644 --- a/src/main/resources/dialogs/minecraft.txt +++ b/src/main/resources/dialogs/minecraft.txt @@ -1,2 +1,3 @@ -this bad boy can fit so many minecraft servers + boy3-face.png +*slaps rack*
this bad boy can fit so many minecraft servers \ No newline at end of file diff --git a/src/main/resources/dialogs/ohhimark.txt b/src/main/resources/dialogs/ohhimark.txt index 50a4c41..c6ad33f 100644 --- a/src/main/resources/dialogs/ohhimark.txt +++ b/src/main/resources/dialogs/ohhimark.txt @@ -1,4 +1,9 @@ 100 0 35 + boss-face.png Oh, hi Mark. +I know, this is on very short notice
but as you've probably heard,
we kinda need someone on the Game of Prod. +And that someone is gonna be,
you guessed it, you. You start by tomorrow. +You can go now. +Bye. \ No newline at end of file diff --git a/src/main/resources/maps/m1.txt b/src/main/resources/maps/m1.txt index fc7d34f..a8acfed 100644 --- a/src/main/resources/maps/m1.txt +++ b/src/main/resources/maps/m1.txt @@ -3,7 +3,7 @@ BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY MOVETO,4,3,m4 BLOCK BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY BLOCK BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY BLOCK -BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY MOVETO,0,4,openspace +BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY MOVETO,7,4,openspace BLOCK EMPTY EMPTY INTER,first-dialog EMPTY INTER,dialog-test EMPTY EMPTY EMPTY BLOCK BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY BLOCK BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY BLOCK diff --git a/src/main/resources/maps/openspace-objectset.txt b/src/main/resources/maps/openspace-objectset.txt index 4137613..1bc5753 100644 --- a/src/main/resources/maps/openspace-objectset.txt +++ b/src/main/resources/maps/openspace-objectset.txt @@ -18,10 +18,10 @@ 0 476 0 0 0 0 0 0 0 0 0 0 0 0 637 754 0 722 639 8 0 477 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 -0 423 638 0 636 391 0 636 439 0 0 423 638 0 636 391 0 636 439 0 +0 0 638 0 636 391 0 636 439 0 0 0 638 0 636 391 0 636 0 0 0 722 639 0 637 754 0 637 754 0 0 722 639 0 637 754 0 637 754 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 -0 636 439 0 391 638 0 636 439 0 0 636 439 0 391 638 0 636 439 8 +0 636 439 0 391 638 0 636 0 0 0 636 439 0 391 638 0 636 439 8 0 637 754 0 722 639 0 637 754 0 0 637 754 0 722 639 0 637 754 0 0 0 7 7 7 0 7 7 7 0 0 7 7 7 0 7 7 7 0 0 \ No newline at end of file diff --git a/src/main/resources/maps/openspace.txt b/src/main/resources/maps/openspace.txt index 04ea5ad..26612ea 100644 --- a/src/main/resources/maps/openspace.txt +++ b/src/main/resources/maps/openspace.txt @@ -1,28 +1,28 @@ 20 27 BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK -BLOCK block block block EMPTY EMPTY EMPTY block BLOCK EMPTY EMPTY EMPTY BLOCK EMPTY EMPTY inter,laugh inter,laugh EMPTY EMPTY BLOCK +BLOCK block block block EMPTY block block block BLOCK EMPTY EMPTY EMPTY BLOCK EMPTY EMPTY inter,laugh inter,laugh EMPTY EMPTY BLOCK BLOCK block EMPTY EMPTY EMPTY EMPTY EMPTY block BLOCK EMPTY EMPTY EMPTY BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY BLOCK BLOCK block EMPTY EMPTY EMPTY EMPTY EMPTY block BLOCK,u EMPTY EMPTY EMPTY BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY block -BLOCK block EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY DOOR,false EMPTY EMPTY EMPTY BLOCK EMPTY block block block block EMPTY block +BLOCK block EMPTY EMPTY EMPTY EMPTY EMPTY TRIGGER,dialog DOOR,false EMPTY EMPTY EMPTY BLOCK EMPTY block block block block EMPTY block BLOCK BLOCK,d EMPTY BLOCK,d BLOCK,d BLOCK,d EMPTY BLOCK,d BLOCK EMPTY EMPTY EMPTY BLOCK EMPTY block block block block EMPTY block BLOCK BLOCK DOOR,true,locked,false BLOCK BLOCK BLOCK DOOR,true BLOCK BLOCK EMPTY EMPTY EMPTY BLOCK EMPTY block block block block EMPTY block BLOCK block EMPTY block BLOCK block EMPTY block BLOCK EMPTY EMPTY EMPTY BLOCK EMPTY block CHEST,confroom block block EMPTY block BLOCK block EMPTY block BLOCK block EMPTY block BLOCK EMPTY EMPTY EMPTY BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY BLOCK BLOCK block EMPTY block BLOCK block EMPTY block BLOCK EMPTY EMPTY EMPTY BLOCK BLOCK,d BLOCK,d BLOCK,d EMPTY BLOCK,d BLOCK,d BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK EMPTY EMPTY EMPTY BLOCK BLOCK BLOCK BLOCK DOOR,true,blue-key-card BLOCK BLOCK BLOCK -BLOCK EMPTY block block EMPTY inter,minecraft inter,minecraft EMPTY BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY BLOCK -BLOCK EMPTY block block EMPTY inter,minecraft inter,minecraft EMPTY BLOCK,u EMPTY EMPTY EMPTY EMPTY EMPTY block EMPTY EMPTY EMPTY block block +BLOCK EMPTY block block block block block EMPTY BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY BLOCK +BLOCK EMPTY block block inter,minecraft block block EMPTY BLOCK,u EMPTY EMPTY EMPTY EMPTY EMPTY block EMPTY EMPTY EMPTY block block BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY DOOR,false EMPTY EMPTY EMPTY EMPTY EMPTY block block EMPTY block block block BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY block BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK EMPTY moveto,1,2,office EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY BLOCK -BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK EMPTY moveto,0,2,m1 EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY block EMPTY block EMPTY BLOCK +BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK EMPTY moveto,7,2,m1 EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY SPAWN block EMPTY block EMPTY BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY block block EMPTY block block block BLOCK block EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY block BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY block -BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY block EMPTY EMPTY EMPTY block EMPTY EMPTY block BLOCK +BLOCK EMPTY block EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY block EMPTY EMPTY block EMPTY block EMPTY BLOCK BLOCK block block EMPTY block block EMPTY block block EMPTY EMPTY block block EMPTY block block EMPTY block block BLOCK BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY block BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY block -BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY block EMPTY block EMPTY EMPTY EMPTY block block +BLOCK EMPTY EMPTY EMPTY EMPTY EMPTY EMPTY block EMPTY EMPTY EMPTY EMPTY block EMPTY block EMPTY EMPTY EMPTY block block BLOCK block block EMPTY block block EMPTY block block EMPTY EMPTY block block EMPTY block block EMPTY block block BLOCK BLOCK BLOCK block block block BLOCK block block block BLOCK BLOCK block block block BLOCK block block block BLOCK BLOCK \ No newline at end of file diff --git a/src/main/resources/save/newGame/npcs.txt b/src/main/resources/save/newGame/npcs.txt new file mode 100644 index 0000000..e4bfa1b --- /dev/null +++ b/src/main/resources/save/newGame/npcs.txt @@ -0,0 +1,8 @@ +boy1 +boy2 +boy3 +boy4 +boy5 +girl1 +girl2 +boss \ No newline at end of file