diff --git a/src/main/java/ruscz/game/gameOfProd/Cells/InteractionCell.java b/src/main/java/ruscz/game/gameOfProd/Cells/InteractionCell.java index 215fd09..250abb9 100644 --- a/src/main/java/ruscz/game/gameOfProd/Cells/InteractionCell.java +++ b/src/main/java/ruscz/game/gameOfProd/Cells/InteractionCell.java @@ -38,7 +38,7 @@ public class InteractionCell extends Cell { public void readDialogFile(String name) { try { - File dialogFile = new File("src/main/resources/" + name + ".txt"); + File dialogFile = new File("src/main/resources/dialogs/" + name + ".txt"); scanner = new Scanner(dialogFile); readNextLine(); } catch (FileNotFoundException e) { diff --git a/src/main/java/ruscz/game/gameOfProd/Image/ImagePerson.java b/src/main/java/ruscz/game/gameOfProd/Image/ImagePerson.java index 3aff670..b1d929f 100644 --- a/src/main/java/ruscz/game/gameOfProd/Image/ImagePerson.java +++ b/src/main/java/ruscz/game/gameOfProd/Image/ImagePerson.java @@ -5,10 +5,13 @@ import java.awt.*; import java.awt.image.*; import java.io.File; import java.io.IOException; +import java.util.Scanner; public class ImagePerson { private BufferedImage image; private BufferedImage[] imagesOfDirection; + private int subimageWidth; + private int subimageHeight; public void setAllImagesOfDirection(Rectangle[] rectangles){ imagesOfDirection = new BufferedImage[12]; @@ -16,14 +19,23 @@ public class ImagePerson { if (rectangles.length < 12) throw new IllegalArgumentException(); - for (int i = 0; i < imagesOfDirection.length; i++) { - imagesOfDirection[i] = image.getSubimage(rectangles[i].x, rectangles[i].y, rectangles[i].height, rectangles[i].width); + int count = 0; + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 4; j++) { + imagesOfDirection[count] = image.getSubimage(subimageWidth * i, subimageHeight * j, subimageWidth, subimageHeight); + count++; + } } } public ImagePerson(String name, Rectangle[] rectangles) { try { - image = ImageIO.read(new File("src/main/resources/" + name)); + File dialogFile = new File("src/main/resources/characters/" + name + ".txt"); + Scanner scanner = new Scanner(dialogFile); + String[] subimageSize = scanner.nextLine().split(" "); + subimageWidth = Integer.parseInt(subimageSize[0]); + subimageHeight = Integer.parseInt(subimageSize[1]); + image = ImageIO.read(new File("src/main/resources/characters/" + scanner.nextLine())); } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfFreeMove.java b/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfFreeMove.java index d321cbd..0ecca05 100644 --- a/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfFreeMove.java +++ b/src/main/java/ruscz/game/gameOfProd/Windows/WindowOfFreeMove.java @@ -6,11 +6,8 @@ import ruscz.game.gameOfProd.Map.Map; import ruscz.game.gameOfProd.Map.MapPainter; import ruscz.game.gameOfProd.Sounds.MusicManager; -import javax.sound.midi.MidiChannel; import javax.swing.*; import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.util.LinkedList; @@ -154,27 +151,27 @@ public class WindowOfFreeMove extends JFrame { } Map m1 = Map.loadMapFromFile("m1", this); - m1.getPerson().setImagePerson("mainpng.png", rec); + m1.getPerson().setImagePerson("main", rec); m1.setName("m1"); Map m2 = Map.loadMapFromFile("m2", this); - m2.getPerson().setImagePerson("mainpng.png", rec); + m2.getPerson().setImagePerson("main", rec); m2.setName("m2"); Map m3 = Map.loadMapFromFile("m3", this); - m3.getPerson().setImagePerson("mainpng.png", rec); + m3.getPerson().setImagePerson("main", rec); m3.setName("m3"); Map m4 = Map.loadMapFromFile("m4", this); - m4.getPerson().setImagePerson("mainpng.png", rec); + m4.getPerson().setImagePerson("main", rec); m4.setName("m4"); Map m5 = Map.loadMapFromFile("m5", this); - m5.getPerson().setImagePerson("mainpng.png", rec); + m5.getPerson().setImagePerson("main", rec); m5.setName("m5"); Map m6 = Map.loadMapFromFile("m6", this); - m6.getPerson().setImagePerson("mainpng.png", rec); + m6.getPerson().setImagePerson("main", rec); m6.setName("m6"); mapLinkedList = new LinkedList<>(); diff --git a/src/main/resources/characters/main.png b/src/main/resources/characters/main.png new file mode 100644 index 0000000..b0752a1 Binary files /dev/null and b/src/main/resources/characters/main.png differ diff --git a/src/main/resources/characters/main.txt b/src/main/resources/characters/main.txt new file mode 100644 index 0000000..1c23176 --- /dev/null +++ b/src/main/resources/characters/main.txt @@ -0,0 +1,2 @@ +32 48 +main.png \ No newline at end of file diff --git a/src/main/resources/mainpng.png b/src/main/resources/characters/mainpng.png similarity index 100% rename from src/main/resources/mainpng.png rename to src/main/resources/characters/mainpng.png diff --git a/src/main/resources/boobs.txt b/src/main/resources/dialogs/boobs.txt similarity index 100% rename from src/main/resources/boobs.txt rename to src/main/resources/dialogs/boobs.txt diff --git a/src/main/resources/dialog-test.txt b/src/main/resources/dialogs/dialog-test.txt similarity index 100% rename from src/main/resources/dialog-test.txt rename to src/main/resources/dialogs/dialog-test.txt diff --git a/src/main/resources/first-dialog.txt b/src/main/resources/dialogs/first-dialog.txt similarity index 100% rename from src/main/resources/first-dialog.txt rename to src/main/resources/dialogs/first-dialog.txt diff --git a/src/main/resources/javascript.txt b/src/main/resources/dialogs/javascript.txt similarity index 100% rename from src/main/resources/javascript.txt rename to src/main/resources/dialogs/javascript.txt diff --git a/src/main/resources/qa-tester.txt b/src/main/resources/dialogs/qa-tester.txt similarity index 100% rename from src/main/resources/qa-tester.txt rename to src/main/resources/dialogs/qa-tester.txt diff --git a/src/main/resources/roses-are-red.txt b/src/main/resources/dialogs/roses-are-red.txt similarity index 100% rename from src/main/resources/roses-are-red.txt rename to src/main/resources/dialogs/roses-are-red.txt diff --git a/src/main/resources/main-walk-down-long.gif b/src/main/resources/main-walk-down-long.gif deleted file mode 100644 index 3cf4744..0000000 Binary files a/src/main/resources/main-walk-down-long.gif and /dev/null differ diff --git a/src/main/resources/main-walk-down.gif b/src/main/resources/main-walk-down.gif deleted file mode 100644 index e4f3108..0000000 Binary files a/src/main/resources/main-walk-down.gif and /dev/null differ diff --git a/src/main/resources/main-walk-left-long.gif b/src/main/resources/main-walk-left-long.gif deleted file mode 100644 index 19ccaf8..0000000 Binary files a/src/main/resources/main-walk-left-long.gif and /dev/null differ diff --git a/src/main/resources/main-walk-left.gif b/src/main/resources/main-walk-left.gif deleted file mode 100644 index 0f9e9d8..0000000 Binary files a/src/main/resources/main-walk-left.gif and /dev/null differ diff --git a/src/main/resources/main-walk-right-long.gif b/src/main/resources/main-walk-right-long.gif deleted file mode 100644 index 08490df..0000000 Binary files a/src/main/resources/main-walk-right-long.gif and /dev/null differ diff --git a/src/main/resources/main-walk-right.gif b/src/main/resources/main-walk-right.gif deleted file mode 100644 index fbe5a13..0000000 Binary files a/src/main/resources/main-walk-right.gif and /dev/null differ diff --git a/src/main/resources/main-walk-up-long.gif b/src/main/resources/main-walk-up-long.gif deleted file mode 100644 index 3d92c37..0000000 Binary files a/src/main/resources/main-walk-up-long.gif and /dev/null differ diff --git a/src/main/resources/main-walk-up.gif b/src/main/resources/main-walk-up.gif deleted file mode 100644 index 2b81683..0000000 Binary files a/src/main/resources/main-walk-up.gif and /dev/null differ