From 9c21970b799a235fbc50284d97d18854e196680c Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Sat, 19 Aug 2017 22:46:38 -0500 Subject: [PATCH] Added dialog boxes. Created structures for Megamon Data. --- Megamon-core/.classpath | 15 +-- Megamon-core/assets/tilesets/Test Map 2.tmx | 13 +- Megamon-core/assets/tilesets/Test Map 3.tmx | 19 +-- Megamon-core/assets/tilesets/Test Map.tmx | 49 ++++---- Megamon-core/assets/tilesets/Tileset2.tsx | 4 + .../assets/tilesets/Tileset2.tsx.q13708 | 4 + Megamon-core/assets/tilesets/wiremantiles.png | Bin 0 -> 4207 bytes Megamon-core/src/sig/megamon/Database.java | 6 +- Megamon-core/src/sig/megamon/DialogBox.java | 67 ++++++++-- Megamon-core/src/sig/megamon/Megamon.java | 43 ++++--- .../src/sig/megamon/MegamonCreature.java | 46 +++++++ Megamon-core/src/sig/megamon/Room.java | 4 +- Megamon-core/src/sig/megamon/RoomData.java | 4 +- .../src/sig/megamon/creature/Category.java | 7 ++ .../sig/megamon/creature/CreatureMove.java | 17 +++ .../sig/megamon/creature/CreatureType.java | 119 ++++++++++++++++++ .../megamon/creature/SpriteCollection.java | 35 ++++++ Megamon-core/src/sig/megamon/ref/SignRef.java | 9 +- Megamon-desktop/.project | 2 +- 19 files changed, 383 insertions(+), 80 deletions(-) create mode 100644 Megamon-core/assets/tilesets/Tileset2.tsx create mode 100644 Megamon-core/assets/tilesets/Tileset2.tsx.q13708 create mode 100644 Megamon-core/assets/tilesets/wiremantiles.png create mode 100644 Megamon-core/src/sig/megamon/MegamonCreature.java create mode 100644 Megamon-core/src/sig/megamon/creature/Category.java create mode 100644 Megamon-core/src/sig/megamon/creature/CreatureMove.java create mode 100644 Megamon-core/src/sig/megamon/creature/CreatureType.java create mode 100644 Megamon-core/src/sig/megamon/creature/SpriteCollection.java diff --git a/Megamon-core/.classpath b/Megamon-core/.classpath index fc1f2ba..c3e1a89 100644 --- a/Megamon-core/.classpath +++ b/Megamon-core/.classpath @@ -1,10 +1,11 @@ - - - - - - - + + + + + + + + diff --git a/Megamon-core/assets/tilesets/Test Map 2.tmx b/Megamon-core/assets/tilesets/Test Map 2.tmx index f0584b5..47ab1fc 100644 --- a/Megamon-core/assets/tilesets/Test Map 2.tmx +++ b/Megamon-core/assets/tilesets/Test Map 2.tmx @@ -2,6 +2,7 @@ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -95,12 +96,12 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,113,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,124,125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,113,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,0,0,0,124,125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,0,0,0,113,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,0,0,0,124,125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,63,63,63,63,63,63,67,63,63,63,63,63,63,63,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/Megamon-core/assets/tilesets/Test Map 3.tmx b/Megamon-core/assets/tilesets/Test Map 3.tmx index 22fe2c6..58b1563 100644 --- a/Megamon-core/assets/tilesets/Test Map 3.tmx +++ b/Megamon-core/assets/tilesets/Test Map 3.tmx @@ -4,6 +4,7 @@ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -92,17 +93,17 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,132,133,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,143,0,145,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,154,155,156,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,31,31,31,31,31,31,31,0,0,31,31,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,31,31,31,31,31,31,31,31,31,31,31,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,31,31,31,31,31,31,31,31,31,31,31,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,31,31,31,31,31,31,31,31,31,31,31,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,132,133,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,143,0,145,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,31,31,31,31,31,31,31,0,0,31,31,31,0,0,154,155,156,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,31,31,31,31,31,31,31,31,31,31,31,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,31,31,31,31,31,31,31,31,31,31,31,31,0,0,132,133,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,31,31,31,31,31,31,31,31,31,31,31,31,0,0,143,0,145,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,31,31,31,31,31,31,31,31,31,31,31,31,0,0,154,155,156,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,31,31,31,31,31,31,31,31,31,31,31,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,31,31,31,31,31,31,31,31,31,31,31,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/Megamon-core/assets/tilesets/Test Map.tmx b/Megamon-core/assets/tilesets/Test Map.tmx index 4c80396..5fc4ea0 100644 --- a/Megamon-core/assets/tilesets/Test Map.tmx +++ b/Megamon-core/assets/tilesets/Test Map.tmx @@ -1,7 +1,10 @@ - + + + + 15,15,15,15,15,15,15,15,15,15,15,15,15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -55,29 +58,21 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51,50,51,51,51,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,50,51,51,51,50,51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,51,51,51,51,51,50,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,50,50,50,50,50,50,50,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,50,50,50,50,50,50,50,51,52,0,0,0,0,0,0,0,130,130,130,130,130,130,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141,141,141,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141,141,141,141,141,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141,141,141,141,141,141,141,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141,141,141,141,141,141,141,141,141,142,0,0,0,0,0,0,0,0,0,0,0,93,94,95,93,94,95,93,94,95,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141,141,141,141,141,141,141,141,141,142,0,0,0,0,0,0,0,0,0,0,0,104,105,106,104,105,106,104,105,106,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141,141,141,141,141,141,141,142,0,0,0,0,0,0,0,0,0,0,0,115,116,117,115,116,117,115,116,117,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141,141,141,141,141,141,141,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,97,97,97,97,97,97,97,97,97,97,97,97,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,108,108,108,108,108,108,108,108,108,108,108,108,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,108,108,108,108,108,108,108,108,108,108,108,108,108,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,108,108,108,108,108,108,108,108,108,108,108,108,108,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,108,108,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -96,9 +91,17 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,93,94,95,93,94,95,93,94,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,104,105,106,104,105,106,104,105,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,115,116,117,115,116,117,115,116,117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +97,97,97,97,97,97,97,97,97,97,97,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +108,108,108,108,108,108,108,108,108,108,108,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +108,108,108,108,108,108,108,108,108,108,108,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +108,108,108,108,108,108,108,108,108,108,108,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +108,108,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 15,15,15,15,15,15,15,15,15,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 15,18,18,18,18,18,18,18,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 15,18,18,18,18,18,18,18,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -106,7 +109,7 @@ 15,15,15,15,15,15,15,15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, diff --git a/Megamon-core/assets/tilesets/Tileset2.tsx b/Megamon-core/assets/tilesets/Tileset2.tsx new file mode 100644 index 0000000..230a657 --- /dev/null +++ b/Megamon-core/assets/tilesets/Tileset2.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/Megamon-core/assets/tilesets/Tileset2.tsx.q13708 b/Megamon-core/assets/tilesets/Tileset2.tsx.q13708 new file mode 100644 index 0000000..1e2d7ff --- /dev/null +++ b/Megamon-core/assets/tilesets/Tileset2.tsx.q13708 @@ -0,0 +1,4 @@ + + + + diff --git a/Megamon-core/assets/tilesets/wiremantiles.png b/Megamon-core/assets/tilesets/wiremantiles.png new file mode 100644 index 0000000000000000000000000000000000000000..50d1204abbd3da677928a07f525e7c8d13805f92 GIT binary patch literal 4207 zcmV-#5RmVQP)Ho1VKQmIH5i)^yhTB|S^NUbK>-Sx5lSgd|Ay;`X=ohgMbl~RwNZj#zeuU5k} zu^-%q_$Tri9|;le5TDGnwN1u9!5%-|Xsu_)G~ufy=lu8If06e;pU z+1|KE(wq=tlv0bu0w2Mj*PG7|S}S8PvuDOM=qqWv-h95lzdw9rH~5i}(J^jXr5>CU zx~`iUqm*h8vw1=5@*AWk9EpyFsfj_&7}M@P&k#glEPU#Tfrem$pC$H80xA2$JvX<$ zwO@nH4=)DKLYIs7oNmVnc>3>mTqh@69TDPgi$D+^i!^-jNeJZwN|R^PjG4NwgNNk` zQU?kL2;hZq=meq)8Tf`SY_V8u4+X%~e)i4U5SZQ{vNJjs0}GyrppDuzV+YOjYGup~ z*dKlLbpN&(zWn)J*Ub)L!Alx1n5Ig#ju?oJB^Ms;F>RV9`|Iu3<7X}wi&QMOI~FpM zhM@-akUDPEdxDFpX45Pq?0@&yKhh%~f9ccV@H8`qw*$JaGsZ}q6ktQcN}6Xe6XU&b ztZb@d(<~!wb`fI_263~L;^y(wO_IhHn$=!`K{%QrS3+E8Bu&U-#Wqcw#aB61uxXYE z0Y$_^R)_uhXJ_Qrn2GEeSqlcn^~xcyl|vkpHsC!Ou#^L$VtS~XqGJ`b;riJ$%e^4k zvso$igHPTdx#E>QVExbzht*RO{E=8r*L4qC&x|3F!rohwOLF+hv+>MWoU5*W0+70Or{be8kUdn#dsq zPOJ+T;*vxkHy~qrwK6hQ5^9pl+T+D(5N;T6$oo^odx8^g<8c~Sy2wqOJY&crj2AOD z%-I#sEQ-?x>?H76)YZ*QV%jf2bU%d2vp{I#Z4z98cFc)KJqOR*(Nk%&2mk#B>wU z=#%^VsDZNHeEavm{V(allA4f+Fqj(df2}nWJ`QDpg~%!tvr|v*f9Ry@?ZXr3wf00D z@_HmeOiwqPx0*wX3|42k|Dy@&@-Zh@_R-4>(Os)lVvY+U}p{^z{mVRZ6{?m|W1LcuWV;7opTyieTi; z+$&(u<~rw1362t}W)rD2j{Eh)<#n^gUqO%%a4?Ya&QdIpE~DBf1c+$-Ca>F6#ZjbT zLEUGe>2=XTYU1I@&<|R-KHMb+@t1f6?-u>VBopq?zfdK^ zL~5wxp}wZ$o#AY$neEbpfcfy@17O1a|7K$BpV#<(+G_h30Zp35xy>xt&L|J%iahtvz#YMOC9@OZtHZ+j8Vt)n`VKvYpX=C*5EaW zy%*pL1_vCE3Nv@O$E>v~$ue+g@$#I6b*5wzBw;zKq)ZZ)if5I>gl=W>xoQ%YTV5(V z2`iQ4Nm#%A{A^AXt_oCVDXxQf<-(wL$OPef!x^!6 z76Z+)=G`x)lZ^MS3kG9ISNxi&OJrfFcw8sCyv3lwq+Al8iY3~X8(A*M&8mrRuM{R> zg=B!R8WMC8PPTDmybv0zSOT?O7yp_G2@3@FLrC1Gw~V%T21e=S9PtiMeZ4>WV=kXz=#RU4(a! z82RpNd*;nc&6Gc_WZYBchQNVEhJXs=3#Ph?v1vuuMI<+j0>C zcn#&zS+~yu%+q0*yvs5Dx8)|q%0dW})WHjt8flDC0&NIVL|${xre=oH#qZh)5jIJR zNfzAO;U>ypsfQ)*P#xCX%hNSU6w-Qp${bS%uML+PVdRYp7c~;r+>_feyd~rnGfET@ zzKv9^B9$fJV0MR$`+&{Wvbi<9on+m&)ZGZ8@@Z^QqbAq2_O2O)gblBl(j|?|f=TwC z5*IA3g0P_!z)iGDo|o~diVSN>p}{yi)J;_jH8KVb#?8}K6HJf|1`J|coz;8osd61F zD*zw`GbCdqX%b1^Rw^PhB#nyIYV04uBe($sSj2cO7|Gtbu`gH(F<~Xadh=O`!YGW~ zx{bqNfNZrmt6wG78znrvVz`K41)i%78lcDpqM6|FqtGmNy|9 zDq06mSmvH7J`J!-s=0UFY>nA(VzM8EJ1o6$AswDlnR{32%yuD-$4@u5%stO_o3H|3 zwbr2~_)NTC-y02@vFb_1Y#Q$iHC$6hUUScDdkLWv+Anu9k_O6P8Dv^w2N>KLd*<|N z1#*Zq31zWB6BkmjTwpWq+zhEkaQzH2q7Csnf0A*-gj?L7B(WKC&Wpj`_|@knVWGDy zh32So-tolnELttb?Q^s=3}4PkSZ7M6QNNCGfF^lLbF{agQPwIGG$SXno9nKfkX$mk zZYCY#t`r+Z&2T`DLT*_rK1`P{X-)_+>Up0IJcxtO>&+{|c=zjdvsG#fU9C5Gc5d%l z@A-BhMSk^O9sy$2N8yge4_)fQ#ts^OD;J(v_RK>_5mW*1_pPAlT(~(2S8!ak=eXDk zO>{XIQ^%@q(~Ml+!o%WA3f{F7f&gA_hfW}>kb!UL!U(pa5RrgMI95`9LX(?_Gj`BC zZMB{HNku3#Dpp3@h8Bn2^Fuv^z#$hE(Xmd$rs4CP8};?jb+he*#bNB|5!p1+<<{@N zqep)HsaJ}=6 zO1<};jOB_~_Oyq;76f7uJ2&L#Tj+S>eotF{*BZc9l>O2CCZ-4BSVy*LFk%1@pmazY zBGE)Y{ZfmWhO6qB=c^OZVS|m z?}8(`MYLt5k^R~T#4<3?eh?OK!lsEFQh*X3E-zoc{PN|CP%XNzASl~pL^ch^4dV@Y zf8xC-IH3_dK`WLqBjqMeo-tHPXbn%Jh|}clI2TeQo_ScEABDlGlb%`o%p+lk!`L*U zQX^5ZF#yksJHV-kIbHEnoX$yDXUbAf(PST@q26Du{+XB`CaNGkifEJmNmvr~)F-F5ym|`J_uu(LGQ~-Pn4{PjMxo06r)$rW z^)H)9Roua0G8p?$fJi0~enPL?8(z!|IUEjfml{28(@11VlV!5>3ID+I0&_wi zX@Orkk!mc5pouFs^f66RGyU$`Nopj$uJ<(X1O;A3Crx%jj5iB{UsV=zF?7ut09E2u zPdhFiy1&G&_&UPDAXQe_qB+m2`%3rH`aF&X0jKHMP}WFL{3N|zb*O`B8Fsmr3!WlZbrM2 z)_Y+E9USi{L#%RxZya*DLo!K-24T0MStv1ey%Vdp-zzarnF|XEgVa)1#8QT@{e{h? z#D!L}7%?Cq3WX-+=9Sud@sX{ej-}dQ;~xX!Qd_}Eojq?(dtL9Tcpg@pa`UHXzJz8o zB&|Xy=xM8sF%Utg9mgG!0r(zP;abvrxXo3WT3I181bA+X!X={$% zrXYqfhYPB9(iOiZI%IsPY=;$>5%9iiUJm7D)kwBiN@Pq(1_-Mm$>sl7;J(!bjW@7M z@X-kB)3iP{XTy3D+<0@TDkWIKHdy>hEgo3WI(W>s+$g`vw%nxpepM%cXj?8scmXl; z=p4KyOQ9{?IAmO@0DyI3L)%oDz-UI5Py%RN2anlf%NNEXO-`ofp1Um-Qv8w7~(Y9O(gXQ}W+7uZR3cdGK>T*@6VkvX- z^^N{TjS8-%)RHuq%?yJ{WeJ5eQC^446VIzQ-3KxCjMLOy@$t~5P(1LI>OG|{SVABl zNAyz{YvMN$ZamhbR%%yiGeD2fSdFRwSR z?3^ zjY~b%CU=Gf5c6E-o(GB>c?&fm?|R{*LBlA86R5d260$SQ8)J17V5hHFAcrLH-4) literal 0 HcmV?d00001 diff --git a/Megamon-core/src/sig/megamon/Database.java b/Megamon-core/src/sig/megamon/Database.java index 80140ec..c451294 100644 --- a/Megamon-core/src/sig/megamon/Database.java +++ b/Megamon-core/src/sig/megamon/Database.java @@ -20,7 +20,11 @@ public class Database { public static void SetupInfoDatabase() { new SignRef( new Point2D.Double(9,99), - "Test Map" + "Test Map", + new String[]{ + "Hello there! You have found the invisible space that happens to be a dialog box.", + "\n\nCongratulations~!" + } ); } } diff --git a/Megamon-core/src/sig/megamon/DialogBox.java b/Megamon-core/src/sig/megamon/DialogBox.java index afe483a..49b7ce2 100644 --- a/Megamon-core/src/sig/megamon/DialogBox.java +++ b/Megamon-core/src/sig/megamon/DialogBox.java @@ -1,5 +1,10 @@ package sig.megamon; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; + import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Texture; @@ -14,35 +19,81 @@ public class DialogBox { static Texture dialog_background = new Texture("dialog.png"); static Texture dialog_box = new Texture("dialog_box.png"); static BitmapFont messageboxfont = new BitmapFont(Gdx.files.internal("fonts/messageboxfont.fnt")); + List remainingMessages; String messageBody = ""; String displayedMessage = ""; int cursor=0; int message_split_marker=0; GlyphLayout layout; - public DialogBox(String messageBody) { - this.messageBody=messageBody; + public DialogBox(String...messages) { + remainingMessages=new LinkedList(Arrays.asList(messages)); + this.messageBody = remainingMessages.remove(0); } public void run() { //TODO accept keyboard inputs for the dialog box. - /*if (layout!=null) { - if (layout.height<64 && cursor0) { + messageBody = remainingMessages.remove(0); + displayedMessage=""; + cursor=0; + } else { + DestroyMessageBox(); + } + } } - }*/ + } } + private void DestroyMessageBox() { + Megamon.messagebox=null; + } + public void draw(SpriteBatch batch) { DrawUtils.drawTextureWithColor(batch, dialog_background, (Megamon.WINDOW_WIDTH-dialog_background.getWidth())/2,0,new Color(0.5f,1f,0.5f,1f)); DrawUtils.drawTextureWithColor(batch, dialog_box, (Megamon.WINDOW_WIDTH-dialog_box.getWidth())/2,0,new Color(0.5f,1f,0.5f,1f)); //System.out.println(dialog_box.getTextureData().getWidth()); - layout = messageboxfont.draw(batch, "Can we display\nNewline characters?", (Megamon.WINDOW_WIDTH-dialog_box.getWidth())/2+96, dialog_box.getHeight()-24, 0, 30, 420, Align.left, true); + layout = messageboxfont.draw(batch, displayedMessage, (Megamon.WINDOW_WIDTH-dialog_box.getWidth())/2+96, dialog_box.getHeight()-24, 0, displayedMessage.length(), 420, Align.left, true); + if (cursor!=displayedMessage.length()) { + cursor++; + } else if (layout.height<64) { //Check if the next set of text with a space is not going to maximize the window. - cursor++; + int checkcursor = findNextSpace(messageBody,cursor)+cursor; //layout.setTe + String nextStr=""; + if (checkcursor==messageBody.length()) { + nextStr = messageBody; + } else { + nextStr = messageBody.substring(0, checkcursor+1); + } + layout.setText(messageboxfont, nextStr, Color.BLACK, 420, Align.left, true); + if (layout.height<64 && cursor!=messageBody.length()) { + displayedMessage = nextStr; + cursor++; + } } //Megamon.font.draw(batch, messageBody, (Megamon.WINDOW_WIDTH-dialog_box.getWidth())/2-dialog_box.getWidth()/2, dialog_box.getHeight()+, start, end, targetWidth, halign, wrap); } + + private int findNextSpace(String messageBody, int cursor) { + String subString=messageBody.substring(cursor, messageBody.length()); + //System.out.println("Substring is "+subString); + for (int i=0;i objects = new ArrayList(); public static Room currentLevel; public static HashMap doorDatabase = new HashMap(); public static HashMap infoDatabase = new HashMap(); @Override - public void create () { + public void create() { batch = new SpriteBatch(); img = new Texture("megamon_icon64.png"); font = new BitmapFont(Gdx.files.internal("fonts/AgencyFB.fnt")); - + //assets = new AssetManager(); /*assets.setLoader(TiledMap.class, new TmxMapLoader(new InternalFileHandleResolver())); @@ -79,7 +87,7 @@ public class Megamon extends ApplicationAdapter implements ApplicationListener{ Database.SetupDoorDatabase(); Database.SetupInfoDatabase(); currentLevel = new Room(position,"Test Map"); - messagebox = new DialogBox("This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message."); + //messagebox = new DialogBox("This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message.This is a test message."); } @Override @@ -100,21 +108,25 @@ public class Megamon extends ApplicationAdapter implements ApplicationListener{ } if (PlayerUtils.isSnappedToGrid(position)) { direction=new Point2D.Double(0, 0); - if (Gdx.input.isKeyPressed(Input.Keys.A)) { - direction=new Point2D.Double(-CHAR_SPD,0); + if (Gdx.input.isKeyPressed(MOVELEFTKEY)) { + direction=lastdirection=new Point2D.Double(-CHAR_SPD,0); } else - if (Gdx.input.isKeyPressed(Input.Keys.W)) { - direction=new Point2D.Double(0,CHAR_SPD); + if (Gdx.input.isKeyPressed(MOVEUPKEY)) { + direction=lastdirection=new Point2D.Double(0,CHAR_SPD); } else - if (Gdx.input.isKeyPressed(Input.Keys.D)) { - direction=new Point2D.Double(CHAR_SPD,0); + if (Gdx.input.isKeyPressed(MOVERIGHTKEY)) { + direction=lastdirection=new Point2D.Double(CHAR_SPD,0); } else - if (Gdx.input.isKeyPressed(Input.Keys.S)) { - direction=new Point2D.Double(0,-CHAR_SPD); + if (Gdx.input.isKeyPressed(MOVEDOWNKEY)) { + direction=lastdirection=new Point2D.Double(0,-CHAR_SPD); + } + Point2D.Double destinationposition = new Point2D.Double(position.x+Math.signum(lastdirection.x),position.y+Math.signum(lastdirection.y)); + if (Gdx.input.isKeyJustPressed(ACTIONKEY)) { + CheckForInfo(destinationposition); } if (direction.x!=0 || direction.y!=0) { //System.out.println("("+position.x+","+Math.signum(direction.x)+","+position.y+","+Math.signum(direction.y)+")"); - Point2D.Double destinationposition = new Point2D.Double(position.x+Math.signum(direction.x),position.y+Math.signum(direction.y)); + //Point2D.Double destinationposition = new Point2D.Double(position.x+Math.signum(direction.x),position.y+Math.signum(direction.y)); if (PlayerUtils.isLocationPassable(currentLevel.getMap(),destinationposition)) { position.setLocation(position.x+direction.x, position.y+direction.y); } else { @@ -122,7 +134,6 @@ public class Megamon extends ApplicationAdapter implements ApplicationListener{ } System.out.println(infoDatabase.keySet()); CheckForDoor(destinationposition); - CheckForInfo(destinationposition); } } else { position.setLocation(position.x+direction.x, position.y+direction.y); @@ -132,7 +143,7 @@ public class Megamon extends ApplicationAdapter implements ApplicationListener{ camera.position.set((float)position.x+0.5f, (float)position.y+0.5f, camera.position.z); //System.out.println("Camera position: "+camera.position); camera.update(); - System.out.println(Megamon.WINDOW_WIDTH+","+Megamon.WINDOW_HEIGHT+";"+camera.viewportWidth+","+camera.viewportHeight); + //System.out.println(Megamon.WINDOW_WIDTH+","+Megamon.WINDOW_HEIGHT+";"+camera.viewportWidth+","+camera.viewportHeight); currentLevel.renderer.setView(camera); currentLevel.renderer.render(); batch.begin(); @@ -176,7 +187,7 @@ public class Megamon extends ApplicationAdapter implements ApplicationListener{ //System.out.println("This is a door!"); SignRef info = infoDatabase.get(PlayerUtils.getDoorPositionHash(destinationposition)); //TODO Do interface stuff here. - + messagebox = new DialogBox(info.getMessages()); } } diff --git a/Megamon-core/src/sig/megamon/MegamonCreature.java b/Megamon-core/src/sig/megamon/MegamonCreature.java new file mode 100644 index 0000000..8b81780 --- /dev/null +++ b/Megamon-core/src/sig/megamon/MegamonCreature.java @@ -0,0 +1,46 @@ +package sig.megamon; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; + +import sig.megamon.creature.CreatureMove; +import sig.megamon.creature.CreatureType; +import sig.megamon.creature.SpriteCollection; + +public class MegamonCreature { + SpriteCollection sprites; + String name; + String bio; + CreatureType type1; + CreatureType type2; + int hp; + int atk; + int def; + int spd; + int spc; + List moveset; + + public MegamonCreature(String mini_icon, String sprite, String back_sprite, + String name, String bio, CreatureType type1, int base_hp, int base_atk, int base_def, int base_spd, int base_spc, + CreatureMove...moveset) { + this(mini_icon,sprite,back_sprite,name,bio,type1,CreatureType.NONE,base_hp,base_atk,base_def,base_spd,base_spc,moveset); + } + + public MegamonCreature(String mini_icon, String sprite, String back_sprite, + String name, String bio, CreatureType type1, CreatureType type2, int base_hp, int base_atk, int base_def, int base_spd, int base_spc, + CreatureMove...moveset) { + this.sprites = new SpriteCollection(mini_icon,sprite,back_sprite); + this.name = name; + this.bio = bio; + this.type1 = type1; + this.type2 = type2; + this.hp = base_hp; + this.atk = base_atk; + this.def = base_def; + this.spd = base_spd; + this.spc = base_spc; + this.moveset = new LinkedList(Arrays.asList(moveset)); + } +} diff --git a/Megamon-core/src/sig/megamon/Room.java b/Megamon-core/src/sig/megamon/Room.java index 8652d61..1d42ead 100644 --- a/Megamon-core/src/sig/megamon/Room.java +++ b/Megamon-core/src/sig/megamon/Room.java @@ -87,9 +87,7 @@ public class Room { * Frees all resources associated with this room. */ public void destroy() { - for (Object o : objects) { - o.destroy(); - } + objects.clear(); map.dispose(); renderer.dispose(); } diff --git a/Megamon-core/src/sig/megamon/RoomData.java b/Megamon-core/src/sig/megamon/RoomData.java index 5baa94b..529f9b1 100644 --- a/Megamon-core/src/sig/megamon/RoomData.java +++ b/Megamon-core/src/sig/megamon/RoomData.java @@ -8,8 +8,8 @@ import java.util.List; public enum RoomData { MAP_1("Test Map", Arrays.asList( - new Object("MEGASPINNN.png",new Point2D.Double(0, 4)), - new Object("megamonlogowip.png",new Point2D.Double(3, 7)) + new Object("MEGASPINNN.png",new Point2D.Double(0, 4)) + //new Object("megamonlogowip.png",new Point2D.Double(3, 7)) )), MAP_2("Test Map 2", new ArrayList()), diff --git a/Megamon-core/src/sig/megamon/creature/Category.java b/Megamon-core/src/sig/megamon/creature/Category.java new file mode 100644 index 0000000..33ad7bd --- /dev/null +++ b/Megamon-core/src/sig/megamon/creature/Category.java @@ -0,0 +1,7 @@ +package sig.megamon.creature; + +public enum Category { + PHYSICAL, + SPECIAL, + STATUS; +} diff --git a/Megamon-core/src/sig/megamon/creature/CreatureMove.java b/Megamon-core/src/sig/megamon/creature/CreatureMove.java new file mode 100644 index 0000000..714f75b --- /dev/null +++ b/Megamon-core/src/sig/megamon/creature/CreatureMove.java @@ -0,0 +1,17 @@ +package sig.megamon.creature; + +public class CreatureMove { + int lvLearned=0; + String name=""; + String desc=""; + CreatureType type; + Category cat; + + public CreatureMove(String name, String description, int levelLearned, CreatureType type, Category category) { + this.name=name; + this.desc=description; + this.lvLearned=levelLearned; + this.type=type; + this.cat=category; + } +} diff --git a/Megamon-core/src/sig/megamon/creature/CreatureType.java b/Megamon-core/src/sig/megamon/creature/CreatureType.java new file mode 100644 index 0000000..fa51d36 --- /dev/null +++ b/Megamon-core/src/sig/megamon/creature/CreatureType.java @@ -0,0 +1,119 @@ +package sig.megamon.creature; + +public enum CreatureType { + NORMAL, + FIRE, + WATER, + ELECTRIC, + ICE, + STRENGTH, + GROUND, + FLYING, + BUG, + DRAGON, + DARK, + SHIELD, + NONE; + + public CreatureType[] getSuperEffectiveTypes() { + switch (this) { + case BUG: + return new CreatureType[]{DARK,SHIELD}; + case DARK: + return new CreatureType[]{STRENGTH,FLYING}; + case DRAGON: + return new CreatureType[]{DRAGON}; + case ELECTRIC: + return new CreatureType[]{WATER,FLYING,DARK}; + case FIRE: + return new CreatureType[]{BUG,DARK}; + case FLYING: + return new CreatureType[]{STRENGTH,BUG}; + case GROUND: + return new CreatureType[]{FIRE,ELECTRIC}; + case ICE: + return new CreatureType[]{FLYING,DRAGON}; + case NORMAL: + return new CreatureType[]{}; + case SHIELD: + return new CreatureType[]{ICE,GROUND}; + case STRENGTH: + return new CreatureType[]{NORMAL,ICE}; + case WATER: + return new CreatureType[]{FIRE,GROUND}; + case NONE: + return new CreatureType[]{}; + default: + System.out.println("WARNING! Could not find proper effectiveness table for type "+this.name()+"! This should not be happening!"); + return new CreatureType[]{}; + } + } + + public CreatureType[] getWeakTypes() { + switch (this) { + case BUG: + return new CreatureType[]{FIRE,STRENGTH,FLYING}; + case DARK: + return new CreatureType[]{FIRE,ELECTRIC}; + case DRAGON: + return new CreatureType[]{}; + case ELECTRIC: + return new CreatureType[]{ELECTRIC,DRAGON,SHIELD}; + case FIRE: + return new CreatureType[]{FIRE,WATER,DRAGON,SHIELD}; + case FLYING: + return new CreatureType[]{ELECTRIC,DARK}; + case GROUND: + return new CreatureType[]{BUG}; + case ICE: + return new CreatureType[]{WATER,ICE}; + case NORMAL: + return new CreatureType[]{}; + case SHIELD: + return new CreatureType[]{STRENGTH,FLYING}; + case STRENGTH: + return new CreatureType[]{FLYING,BUG}; + case WATER: + return new CreatureType[]{WATER,DRAGON,SHIELD}; + case NONE: + return new CreatureType[]{}; + default: + System.out.println("WARNING! Could not find proper effectiveness table for type "+this.name()+"! This should not be happening!"); + return new CreatureType[]{}; + } + } + + public CreatureType[] getUnaffectedTypes() { + switch (this) { + case BUG: + return new CreatureType[]{}; + case DARK: + return new CreatureType[]{}; + case DRAGON: + return new CreatureType[]{}; + case ELECTRIC: + return new CreatureType[]{GROUND}; + case FIRE: + return new CreatureType[]{}; + case FLYING: + return new CreatureType[]{}; + case GROUND: + return new CreatureType[]{FLYING}; + case ICE: + return new CreatureType[]{}; + case NORMAL: + return new CreatureType[]{}; + case SHIELD: + return new CreatureType[]{}; + case STRENGTH: + return new CreatureType[]{}; + case WATER: + return new CreatureType[]{}; + case NONE: + return new CreatureType[]{}; + default: + System.out.println("WARNING! Could not find proper effectiveness table for type "+this.name()+"! This should not be happening!"); + return new CreatureType[]{}; + } + } +} diff --git a/Megamon-core/src/sig/megamon/creature/SpriteCollection.java b/Megamon-core/src/sig/megamon/creature/SpriteCollection.java new file mode 100644 index 0000000..e84b49c --- /dev/null +++ b/Megamon-core/src/sig/megamon/creature/SpriteCollection.java @@ -0,0 +1,35 @@ +package sig.megamon.creature; + +import com.badlogic.gdx.graphics.Texture; + +/** + * A collection of 3 images that represents each Megamon. + * One is the overworld/mini icon when looking at stats of the Megamon. + * One is the forward-facing sprite that players see when facing the Megamon. + * One if the backward-facing sprite that players see when they send out their Megamon. + * + */ +public class SpriteCollection { + final static String MEGAMON_ASSETS = "Megamon/"; + Texture mini_icon; + Texture sprite; + Texture back_sprite; + /** + * Provide the file names of the sprites relative to the 'Megamon' assets folder. + */ + public SpriteCollection(String mini_icon, String sprite, String back_sprite) { + this.mini_icon = new Texture(MEGAMON_ASSETS+mini_icon); + this.sprite = new Texture(MEGAMON_ASSETS+sprite); + this.back_sprite = new Texture(MEGAMON_ASSETS+back_sprite); + } + + public Texture getMiniIcon() { + return mini_icon; + } + public Texture getSprite() { + return sprite; + } + public Texture getBackSprite() { + return back_sprite; + } +} diff --git a/Megamon-core/src/sig/megamon/ref/SignRef.java b/Megamon-core/src/sig/megamon/ref/SignRef.java index 9ecde1e..48b56b5 100644 --- a/Megamon-core/src/sig/megamon/ref/SignRef.java +++ b/Megamon-core/src/sig/megamon/ref/SignRef.java @@ -5,18 +5,19 @@ import java.awt.geom.Point2D.Double; import sig.megamon.Megamon; public class SignRef extends Ref{ - String message; + String[] messages; - public SignRef(Double position, String room) { + public SignRef(Double position, String room, String...messages) { super(position, room); Megamon.infoDatabase.put(generateHash(),this); + this.messages=messages; } public String getRoom() { return roomName; } - public String getMessage() { - return message; + public String[] getMessages() { + return messages; } } diff --git a/Megamon-desktop/.project b/Megamon-desktop/.project index b8acc0d..1b78dc6 100644 --- a/Megamon-desktop/.project +++ b/Megamon-desktop/.project @@ -18,7 +18,7 @@ assets 2 - C:/Users/Joshua Sigona/Dropbox/MegaMon/Game/Megamon/assets + C:/Users/Joshua Sigona/Dropbox/MegaMon/Game/git/Megamon-core/assets