diff --git a/.classpath b/.classpath deleted file mode 100644 index 54b79f7..0000000 --- a/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/.project b/.project deleted file mode 100644 index a75dcc4..0000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Castles and Wizards - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/Objects/Saves/Bob/character.txt b/Objects/Saves/Bob/character.txt deleted file mode 100644 index aa2c58a..0000000 --- a/Objects/Saves/Bob/character.txt +++ /dev/null @@ -1,19 +0,0 @@ -Bob -male -31.txt -1 -11 - -85 -125 -30 -5 -6.25 - -78 - -0 -0 -0 -0 -0 diff --git a/Objects/Saves/John/1.txt b/Objects/Saves/John/1.txt deleted file mode 100644 index d4b70c5..0000000 --- a/Objects/Saves/John/1.txt +++ /dev/null @@ -1,14 +0,0 @@ -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 diff --git a/Objects/Saves/John/10.txt b/Objects/Saves/John/10.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/11.txt b/Objects/Saves/John/11.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/12.txt b/Objects/Saves/John/12.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/13.txt b/Objects/Saves/John/13.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/14.txt b/Objects/Saves/John/14.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/15.txt b/Objects/Saves/John/15.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/16.txt b/Objects/Saves/John/16.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/17.txt b/Objects/Saves/John/17.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/18.txt b/Objects/Saves/John/18.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/19.txt b/Objects/Saves/John/19.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/2.txt b/Objects/Saves/John/2.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/20.txt b/Objects/Saves/John/20.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/21.txt b/Objects/Saves/John/21.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/3.txt b/Objects/Saves/John/3.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/4.txt b/Objects/Saves/John/4.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/5.txt b/Objects/Saves/John/5.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/6.txt b/Objects/Saves/John/6.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/7.txt b/Objects/Saves/John/7.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/8.txt b/Objects/Saves/John/8.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/9.txt b/Objects/Saves/John/9.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/John/character.txt b/Objects/Saves/John/character.txt deleted file mode 100644 index d4f92fa..0000000 --- a/Objects/Saves/John/character.txt +++ /dev/null @@ -1,19 +0,0 @@ -John -male -10.txt -20 -6 - -25 -125 -30 -5 -6.25 - -261 - -0 -0 -staff -0 -0 diff --git a/Objects/Saves/John/inventory.txt b/Objects/Saves/John/inventory.txt deleted file mode 100644 index 17bbd2c..0000000 --- a/Objects/Saves/John/inventory.txt +++ /dev/null @@ -1,13 +0,0 @@ -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 diff --git a/Objects/Saves/SIr Mathew/1.txt b/Objects/Saves/SIr Mathew/1.txt deleted file mode 100644 index 64f2b62..0000000 --- a/Objects/Saves/SIr Mathew/1.txt +++ /dev/null @@ -1,14 +0,0 @@ -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -2 -10 diff --git a/Objects/Saves/SIr Mathew/10.txt b/Objects/Saves/SIr Mathew/10.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/11.txt b/Objects/Saves/SIr Mathew/11.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/12.txt b/Objects/Saves/SIr Mathew/12.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/13.txt b/Objects/Saves/SIr Mathew/13.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/14.txt b/Objects/Saves/SIr Mathew/14.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/15.txt b/Objects/Saves/SIr Mathew/15.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/16.txt b/Objects/Saves/SIr Mathew/16.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/17.txt b/Objects/Saves/SIr Mathew/17.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/18.txt b/Objects/Saves/SIr Mathew/18.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/19.txt b/Objects/Saves/SIr Mathew/19.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/2.txt b/Objects/Saves/SIr Mathew/2.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/20.txt b/Objects/Saves/SIr Mathew/20.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/21.txt b/Objects/Saves/SIr Mathew/21.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/3.txt b/Objects/Saves/SIr Mathew/3.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/4.txt b/Objects/Saves/SIr Mathew/4.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/5.txt b/Objects/Saves/SIr Mathew/5.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/6.txt b/Objects/Saves/SIr Mathew/6.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/7.txt b/Objects/Saves/SIr Mathew/7.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/8.txt b/Objects/Saves/SIr Mathew/8.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/9.txt b/Objects/Saves/SIr Mathew/9.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Objects/Saves/SIr Mathew/inventory.txt b/Objects/Saves/SIr Mathew/inventory.txt deleted file mode 100644 index d4b70c5..0000000 --- a/Objects/Saves/SIr Mathew/inventory.txt +++ /dev/null @@ -1,14 +0,0 @@ -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 diff --git a/README.md b/README.md index 7901a46..58fbc54 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,8 @@ ## About +![Screenshot](./screenshot.gif) + This game was built as my grade 11 computer programing final project. The grading was based on demonstrating different programing structures such as ifs, loops, etc... I chose to build a simple RPG. Castles and Wizards is a game engine that reads pre-made text files to create its enviroment including: chests, conversations & maps. Configuration files & maps can be found inside `/Objects/...`. @@ -50,12 +52,8 @@ The game comes with a basic map editor to aid in building maps quickly. Maps are - [Java SDK](https://www.oracle.com/ca-en/java/technologies/downloads) #### Instructions -1. Compile source code: `javac src/StartUp.java` -2. Start the game: `java src/StartUp` - -#### Map Editor -1. Compile source code: `javac src/MapEditor.java` -2. Start the game: `java src/MapEditor` +1. Compile source code: `cd src && javac StartUp.java` +2. Start the game: `java StartUp` diff --git a/bin/StartUp$ButtonHandler$1.class b/bin/StartUp$ButtonHandler$1.class deleted file mode 100644 index cf570a6..0000000 Binary files a/bin/StartUp$ButtonHandler$1.class and /dev/null differ diff --git a/bin/StartUp$ButtonHandler$2.class b/bin/StartUp$ButtonHandler$2.class deleted file mode 100644 index 7de073b..0000000 Binary files a/bin/StartUp$ButtonHandler$2.class and /dev/null differ diff --git a/bin/StartUp$ButtonHandler.class b/bin/StartUp$ButtonHandler.class deleted file mode 100644 index 0091cc5..0000000 Binary files a/bin/StartUp$ButtonHandler.class and /dev/null differ diff --git a/bin/StartUp$Game$1.class b/bin/StartUp$Game$1.class deleted file mode 100644 index fc49b19..0000000 Binary files a/bin/StartUp$Game$1.class and /dev/null differ diff --git a/bin/StartUp$Game$2.class b/bin/StartUp$Game$2.class deleted file mode 100644 index 833c798..0000000 Binary files a/bin/StartUp$Game$2.class and /dev/null differ diff --git a/bin/StartUp$Game.class b/bin/StartUp$Game.class deleted file mode 100644 index bce7a73..0000000 Binary files a/bin/StartUp$Game.class and /dev/null differ diff --git a/bin/StartUp$KeyHandler.class b/bin/StartUp$KeyHandler.class deleted file mode 100644 index 3319dde..0000000 Binary files a/bin/StartUp$KeyHandler.class and /dev/null differ diff --git a/bin/StartUp.class b/bin/StartUp.class deleted file mode 100644 index 7bbeb3c..0000000 Binary files a/bin/StartUp.class and /dev/null differ diff --git a/bin/mapEditor$ButtonHandler.class b/bin/mapEditor$ButtonHandler.class deleted file mode 100644 index 3caf31e..0000000 Binary files a/bin/mapEditor$ButtonHandler.class and /dev/null differ diff --git a/bin/mapEditor.class b/bin/mapEditor.class deleted file mode 100644 index 607b5d1..0000000 Binary files a/bin/mapEditor.class and /dev/null differ diff --git a/out/production/Castles and Wizards/StartUp$1.class b/out/production/Castles and Wizards/StartUp$1.class deleted file mode 100644 index 94eee8c..0000000 Binary files a/out/production/Castles and Wizards/StartUp$1.class and /dev/null differ diff --git a/out/production/Castles and Wizards/StartUp$ButtonHandler$1.class b/out/production/Castles and Wizards/StartUp$ButtonHandler$1.class deleted file mode 100644 index 403c20a..0000000 Binary files a/out/production/Castles and Wizards/StartUp$ButtonHandler$1.class and /dev/null differ diff --git a/out/production/Castles and Wizards/StartUp$ButtonHandler$2.class b/out/production/Castles and Wizards/StartUp$ButtonHandler$2.class deleted file mode 100644 index 49c15be..0000000 Binary files a/out/production/Castles and Wizards/StartUp$ButtonHandler$2.class and /dev/null differ diff --git a/out/production/Castles and Wizards/StartUp$ButtonHandler.class b/out/production/Castles and Wizards/StartUp$ButtonHandler.class deleted file mode 100644 index ed138ee..0000000 Binary files a/out/production/Castles and Wizards/StartUp$ButtonHandler.class and /dev/null differ diff --git a/out/production/Castles and Wizards/StartUp$Game$1.class b/out/production/Castles and Wizards/StartUp$Game$1.class deleted file mode 100644 index 8db767d..0000000 Binary files a/out/production/Castles and Wizards/StartUp$Game$1.class and /dev/null differ diff --git a/out/production/Castles and Wizards/StartUp$Game$2.class b/out/production/Castles and Wizards/StartUp$Game$2.class deleted file mode 100644 index 64adbfb..0000000 Binary files a/out/production/Castles and Wizards/StartUp$Game$2.class and /dev/null differ diff --git a/out/production/Castles and Wizards/StartUp$Game.class b/out/production/Castles and Wizards/StartUp$Game.class deleted file mode 100644 index 017cd62..0000000 Binary files a/out/production/Castles and Wizards/StartUp$Game.class and /dev/null differ diff --git a/out/production/Castles and Wizards/StartUp$KeyHandler.class b/out/production/Castles and Wizards/StartUp$KeyHandler.class deleted file mode 100644 index 7ed034d..0000000 Binary files a/out/production/Castles and Wizards/StartUp$KeyHandler.class and /dev/null differ diff --git a/out/production/Castles and Wizards/StartUp.class b/out/production/Castles and Wizards/StartUp.class deleted file mode 100644 index 78d29c6..0000000 Binary files a/out/production/Castles and Wizards/StartUp.class and /dev/null differ diff --git a/out/production/Castles and Wizards/mapEditor$1.class b/out/production/Castles and Wizards/mapEditor$1.class deleted file mode 100644 index b0052a0..0000000 Binary files a/out/production/Castles and Wizards/mapEditor$1.class and /dev/null differ diff --git a/out/production/Castles and Wizards/mapEditor$ButtonHandler.class b/out/production/Castles and Wizards/mapEditor$ButtonHandler.class deleted file mode 100644 index ddaf590..0000000 Binary files a/out/production/Castles and Wizards/mapEditor$ButtonHandler.class and /dev/null differ diff --git a/out/production/Castles and Wizards/mapEditor.class b/out/production/Castles and Wizards/mapEditor.class deleted file mode 100644 index 0979c0a..0000000 Binary files a/out/production/Castles and Wizards/mapEditor.class and /dev/null differ diff --git a/screenshot.gif b/screenshot.gif new file mode 100644 index 0000000..a82c459 Binary files /dev/null and b/screenshot.gif differ diff --git a/Objects/Chests/1.txt b/src/Objects/Chests/1.txt similarity index 100% rename from Objects/Chests/1.txt rename to src/Objects/Chests/1.txt diff --git a/Objects/Chests/10.txt b/src/Objects/Chests/10.txt similarity index 100% rename from Objects/Chests/10.txt rename to src/Objects/Chests/10.txt diff --git a/Objects/Chests/11.txt b/src/Objects/Chests/11.txt similarity index 100% rename from Objects/Chests/11.txt rename to src/Objects/Chests/11.txt diff --git a/Objects/Chests/12.txt b/src/Objects/Chests/12.txt similarity index 100% rename from Objects/Chests/12.txt rename to src/Objects/Chests/12.txt diff --git a/Objects/Chests/13.txt b/src/Objects/Chests/13.txt similarity index 100% rename from Objects/Chests/13.txt rename to src/Objects/Chests/13.txt diff --git a/Objects/Chests/14.txt b/src/Objects/Chests/14.txt similarity index 100% rename from Objects/Chests/14.txt rename to src/Objects/Chests/14.txt diff --git a/Objects/Chests/15.txt b/src/Objects/Chests/15.txt similarity index 100% rename from Objects/Chests/15.txt rename to src/Objects/Chests/15.txt diff --git a/Objects/Chests/16.txt b/src/Objects/Chests/16.txt similarity index 100% rename from Objects/Chests/16.txt rename to src/Objects/Chests/16.txt diff --git a/Objects/Chests/17.txt b/src/Objects/Chests/17.txt similarity index 100% rename from Objects/Chests/17.txt rename to src/Objects/Chests/17.txt diff --git a/Objects/Chests/18.txt b/src/Objects/Chests/18.txt similarity index 100% rename from Objects/Chests/18.txt rename to src/Objects/Chests/18.txt diff --git a/Objects/Chests/19.txt b/src/Objects/Chests/19.txt similarity index 100% rename from Objects/Chests/19.txt rename to src/Objects/Chests/19.txt diff --git a/Objects/Chests/2.txt b/src/Objects/Chests/2.txt similarity index 100% rename from Objects/Chests/2.txt rename to src/Objects/Chests/2.txt diff --git a/Objects/Chests/20.txt b/src/Objects/Chests/20.txt similarity index 100% rename from Objects/Chests/20.txt rename to src/Objects/Chests/20.txt diff --git a/Objects/Chests/21.txt b/src/Objects/Chests/21.txt similarity index 100% rename from Objects/Chests/21.txt rename to src/Objects/Chests/21.txt diff --git a/Objects/Chests/3.txt b/src/Objects/Chests/3.txt similarity index 100% rename from Objects/Chests/3.txt rename to src/Objects/Chests/3.txt diff --git a/Objects/Chests/4.txt b/src/Objects/Chests/4.txt similarity index 100% rename from Objects/Chests/4.txt rename to src/Objects/Chests/4.txt diff --git a/Objects/Chests/5.txt b/src/Objects/Chests/5.txt similarity index 100% rename from Objects/Chests/5.txt rename to src/Objects/Chests/5.txt diff --git a/Objects/Chests/6.txt b/src/Objects/Chests/6.txt similarity index 100% rename from Objects/Chests/6.txt rename to src/Objects/Chests/6.txt diff --git a/Objects/Chests/7.txt b/src/Objects/Chests/7.txt similarity index 100% rename from Objects/Chests/7.txt rename to src/Objects/Chests/7.txt diff --git a/Objects/Chests/8.txt b/src/Objects/Chests/8.txt similarity index 100% rename from Objects/Chests/8.txt rename to src/Objects/Chests/8.txt diff --git a/Objects/Chests/9.txt b/src/Objects/Chests/9.txt similarity index 100% rename from Objects/Chests/9.txt rename to src/Objects/Chests/9.txt diff --git a/Objects/Images/Female/downC.gif b/src/Objects/Images/Female/downC.gif similarity index 100% rename from Objects/Images/Female/downC.gif rename to src/Objects/Images/Female/downC.gif diff --git a/Objects/Images/Female/downL.gif b/src/Objects/Images/Female/downL.gif similarity index 100% rename from Objects/Images/Female/downL.gif rename to src/Objects/Images/Female/downL.gif diff --git a/Objects/Images/Female/downR.gif b/src/Objects/Images/Female/downR.gif similarity index 100% rename from Objects/Images/Female/downR.gif rename to src/Objects/Images/Female/downR.gif diff --git a/Objects/Images/Female/fight.gif b/src/Objects/Images/Female/fight.gif similarity index 100% rename from Objects/Images/Female/fight.gif rename to src/Objects/Images/Female/fight.gif diff --git a/Objects/Images/Female/leftC.gif b/src/Objects/Images/Female/leftC.gif similarity index 100% rename from Objects/Images/Female/leftC.gif rename to src/Objects/Images/Female/leftC.gif diff --git a/Objects/Images/Female/leftL.gif b/src/Objects/Images/Female/leftL.gif similarity index 100% rename from Objects/Images/Female/leftL.gif rename to src/Objects/Images/Female/leftL.gif diff --git a/Objects/Images/Female/leftR.gif b/src/Objects/Images/Female/leftR.gif similarity index 100% rename from Objects/Images/Female/leftR.gif rename to src/Objects/Images/Female/leftR.gif diff --git a/Objects/Images/Female/rightC.gif b/src/Objects/Images/Female/rightC.gif similarity index 100% rename from Objects/Images/Female/rightC.gif rename to src/Objects/Images/Female/rightC.gif diff --git a/Objects/Images/Female/rightL.gif b/src/Objects/Images/Female/rightL.gif similarity index 100% rename from Objects/Images/Female/rightL.gif rename to src/Objects/Images/Female/rightL.gif diff --git a/Objects/Images/Female/rightR.gif b/src/Objects/Images/Female/rightR.gif similarity index 100% rename from Objects/Images/Female/rightR.gif rename to src/Objects/Images/Female/rightR.gif diff --git a/Objects/Images/Female/upC.gif b/src/Objects/Images/Female/upC.gif similarity index 100% rename from Objects/Images/Female/upC.gif rename to src/Objects/Images/Female/upC.gif diff --git a/Objects/Images/Female/upL.gif b/src/Objects/Images/Female/upL.gif similarity index 100% rename from Objects/Images/Female/upL.gif rename to src/Objects/Images/Female/upL.gif diff --git a/Objects/Images/Female/upR.gif b/src/Objects/Images/Female/upR.gif similarity index 100% rename from Objects/Images/Female/upR.gif rename to src/Objects/Images/Female/upR.gif diff --git a/Objects/Images/Male/downC.gif b/src/Objects/Images/Male/downC.gif similarity index 100% rename from Objects/Images/Male/downC.gif rename to src/Objects/Images/Male/downC.gif diff --git a/Objects/Images/Male/downL.gif b/src/Objects/Images/Male/downL.gif similarity index 100% rename from Objects/Images/Male/downL.gif rename to src/Objects/Images/Male/downL.gif diff --git a/Objects/Images/Male/downR.gif b/src/Objects/Images/Male/downR.gif similarity index 100% rename from Objects/Images/Male/downR.gif rename to src/Objects/Images/Male/downR.gif diff --git a/Objects/Images/Male/fight.gif b/src/Objects/Images/Male/fight.gif similarity index 100% rename from Objects/Images/Male/fight.gif rename to src/Objects/Images/Male/fight.gif diff --git a/Objects/Images/Male/leftC.gif b/src/Objects/Images/Male/leftC.gif similarity index 100% rename from Objects/Images/Male/leftC.gif rename to src/Objects/Images/Male/leftC.gif diff --git a/Objects/Images/Male/leftL.gif b/src/Objects/Images/Male/leftL.gif similarity index 100% rename from Objects/Images/Male/leftL.gif rename to src/Objects/Images/Male/leftL.gif diff --git a/Objects/Images/Male/leftR.gif b/src/Objects/Images/Male/leftR.gif similarity index 100% rename from Objects/Images/Male/leftR.gif rename to src/Objects/Images/Male/leftR.gif diff --git a/Objects/Images/Male/rightC.gif b/src/Objects/Images/Male/rightC.gif similarity index 100% rename from Objects/Images/Male/rightC.gif rename to src/Objects/Images/Male/rightC.gif diff --git a/Objects/Images/Male/rightL.gif b/src/Objects/Images/Male/rightL.gif similarity index 100% rename from Objects/Images/Male/rightL.gif rename to src/Objects/Images/Male/rightL.gif diff --git a/Objects/Images/Male/rightR.gif b/src/Objects/Images/Male/rightR.gif similarity index 100% rename from Objects/Images/Male/rightR.gif rename to src/Objects/Images/Male/rightR.gif diff --git a/Objects/Images/Male/upC.gif b/src/Objects/Images/Male/upC.gif similarity index 100% rename from Objects/Images/Male/upC.gif rename to src/Objects/Images/Male/upC.gif diff --git a/Objects/Images/Male/upL.gif b/src/Objects/Images/Male/upL.gif similarity index 100% rename from Objects/Images/Male/upL.gif rename to src/Objects/Images/Male/upL.gif diff --git a/Objects/Images/Male/upR.gif b/src/Objects/Images/Male/upR.gif similarity index 100% rename from Objects/Images/Male/upR.gif rename to src/Objects/Images/Male/upR.gif diff --git a/Objects/Images/Sprites/Boss1I.gif b/src/Objects/Images/Sprites/Boss1I.gif similarity index 100% rename from Objects/Images/Sprites/Boss1I.gif rename to src/Objects/Images/Sprites/Boss1I.gif diff --git a/Objects/Images/Sprites/bandit.gif b/src/Objects/Images/Sprites/bandit.gif similarity index 100% rename from Objects/Images/Sprites/bandit.gif rename to src/Objects/Images/Sprites/bandit.gif diff --git a/Objects/Images/Sprites/boss1.gif b/src/Objects/Images/Sprites/boss1.gif similarity index 100% rename from Objects/Images/Sprites/boss1.gif rename to src/Objects/Images/Sprites/boss1.gif diff --git a/Objects/Images/Sprites/boss2.gif b/src/Objects/Images/Sprites/boss2.gif similarity index 100% rename from Objects/Images/Sprites/boss2.gif rename to src/Objects/Images/Sprites/boss2.gif diff --git a/Objects/Images/Sprites/boss2I.gif b/src/Objects/Images/Sprites/boss2I.gif similarity index 100% rename from Objects/Images/Sprites/boss2I.gif rename to src/Objects/Images/Sprites/boss2I.gif diff --git a/Objects/Images/Sprites/boss3.gif b/src/Objects/Images/Sprites/boss3.gif similarity index 100% rename from Objects/Images/Sprites/boss3.gif rename to src/Objects/Images/Sprites/boss3.gif diff --git a/Objects/Images/Sprites/boss3I.gif b/src/Objects/Images/Sprites/boss3I.gif similarity index 100% rename from Objects/Images/Sprites/boss3I.gif rename to src/Objects/Images/Sprites/boss3I.gif diff --git a/Objects/Images/Sprites/orc.gif b/src/Objects/Images/Sprites/orc.gif similarity index 100% rename from Objects/Images/Sprites/orc.gif rename to src/Objects/Images/Sprites/orc.gif diff --git a/Objects/Images/Sprites/person1.gif b/src/Objects/Images/Sprites/person1.gif similarity index 100% rename from Objects/Images/Sprites/person1.gif rename to src/Objects/Images/Sprites/person1.gif diff --git a/Objects/Images/Sprites/person10.gif b/src/Objects/Images/Sprites/person10.gif similarity index 100% rename from Objects/Images/Sprites/person10.gif rename to src/Objects/Images/Sprites/person10.gif diff --git a/Objects/Images/Sprites/person11.gif b/src/Objects/Images/Sprites/person11.gif similarity index 100% rename from Objects/Images/Sprites/person11.gif rename to src/Objects/Images/Sprites/person11.gif diff --git a/Objects/Images/Sprites/person12.gif b/src/Objects/Images/Sprites/person12.gif similarity index 100% rename from Objects/Images/Sprites/person12.gif rename to src/Objects/Images/Sprites/person12.gif diff --git a/Objects/Images/Sprites/person13.gif b/src/Objects/Images/Sprites/person13.gif similarity index 100% rename from Objects/Images/Sprites/person13.gif rename to src/Objects/Images/Sprites/person13.gif diff --git a/Objects/Images/Sprites/person14.gif b/src/Objects/Images/Sprites/person14.gif similarity index 100% rename from Objects/Images/Sprites/person14.gif rename to src/Objects/Images/Sprites/person14.gif diff --git a/Objects/Images/Sprites/person15.gif b/src/Objects/Images/Sprites/person15.gif similarity index 100% rename from Objects/Images/Sprites/person15.gif rename to src/Objects/Images/Sprites/person15.gif diff --git a/Objects/Images/Sprites/person17.gif b/src/Objects/Images/Sprites/person17.gif similarity index 100% rename from Objects/Images/Sprites/person17.gif rename to src/Objects/Images/Sprites/person17.gif diff --git a/Objects/Images/Sprites/person18.gif b/src/Objects/Images/Sprites/person18.gif similarity index 100% rename from Objects/Images/Sprites/person18.gif rename to src/Objects/Images/Sprites/person18.gif diff --git a/Objects/Images/Sprites/person19.gif b/src/Objects/Images/Sprites/person19.gif similarity index 100% rename from Objects/Images/Sprites/person19.gif rename to src/Objects/Images/Sprites/person19.gif diff --git a/Objects/Images/Sprites/person2.gif b/src/Objects/Images/Sprites/person2.gif similarity index 100% rename from Objects/Images/Sprites/person2.gif rename to src/Objects/Images/Sprites/person2.gif diff --git a/Objects/Images/Sprites/person20.gif b/src/Objects/Images/Sprites/person20.gif similarity index 100% rename from Objects/Images/Sprites/person20.gif rename to src/Objects/Images/Sprites/person20.gif diff --git a/Objects/Images/Sprites/person21.gif b/src/Objects/Images/Sprites/person21.gif similarity index 100% rename from Objects/Images/Sprites/person21.gif rename to src/Objects/Images/Sprites/person21.gif diff --git a/Objects/Images/Sprites/person3.gif b/src/Objects/Images/Sprites/person3.gif similarity index 100% rename from Objects/Images/Sprites/person3.gif rename to src/Objects/Images/Sprites/person3.gif diff --git a/Objects/Images/Sprites/person4.gif b/src/Objects/Images/Sprites/person4.gif similarity index 100% rename from Objects/Images/Sprites/person4.gif rename to src/Objects/Images/Sprites/person4.gif diff --git a/Objects/Images/Sprites/person5.gif b/src/Objects/Images/Sprites/person5.gif similarity index 100% rename from Objects/Images/Sprites/person5.gif rename to src/Objects/Images/Sprites/person5.gif diff --git a/Objects/Images/Sprites/person6.gif b/src/Objects/Images/Sprites/person6.gif similarity index 100% rename from Objects/Images/Sprites/person6.gif rename to src/Objects/Images/Sprites/person6.gif diff --git a/Objects/Images/Sprites/person7.gif b/src/Objects/Images/Sprites/person7.gif similarity index 100% rename from Objects/Images/Sprites/person7.gif rename to src/Objects/Images/Sprites/person7.gif diff --git a/Objects/Images/Sprites/person8.gif b/src/Objects/Images/Sprites/person8.gif similarity index 100% rename from Objects/Images/Sprites/person8.gif rename to src/Objects/Images/Sprites/person8.gif diff --git a/Objects/Images/Sprites/person9.gif b/src/Objects/Images/Sprites/person9.gif similarity index 100% rename from Objects/Images/Sprites/person9.gif rename to src/Objects/Images/Sprites/person9.gif diff --git a/Objects/Images/Sprites/wizard.gif b/src/Objects/Images/Sprites/wizard.gif similarity index 100% rename from Objects/Images/Sprites/wizard.gif rename to src/Objects/Images/Sprites/wizard.gif diff --git a/Objects/Images/Sprites/wolf.gif b/src/Objects/Images/Sprites/wolf.gif similarity index 100% rename from Objects/Images/Sprites/wolf.gif rename to src/Objects/Images/Sprites/wolf.gif diff --git a/Objects/Images/Sprites/zombie.gif b/src/Objects/Images/Sprites/zombie.gif similarity index 100% rename from Objects/Images/Sprites/zombie.gif rename to src/Objects/Images/Sprites/zombie.gif diff --git a/Objects/Images/Tiles/Lava.jpg b/src/Objects/Images/Tiles/Lava.jpg similarity index 100% rename from Objects/Images/Tiles/Lava.jpg rename to src/Objects/Images/Tiles/Lava.jpg diff --git a/Objects/Images/Tiles/Stone.jpg b/src/Objects/Images/Tiles/Stone.jpg similarity index 100% rename from Objects/Images/Tiles/Stone.jpg rename to src/Objects/Images/Tiles/Stone.jpg diff --git a/Objects/Images/Tiles/blood.gif b/src/Objects/Images/Tiles/blood.gif similarity index 100% rename from Objects/Images/Tiles/blood.gif rename to src/Objects/Images/Tiles/blood.gif diff --git a/Objects/Images/Tiles/bolder.gif b/src/Objects/Images/Tiles/bolder.gif similarity index 100% rename from Objects/Images/Tiles/bolder.gif rename to src/Objects/Images/Tiles/bolder.gif diff --git a/Objects/Images/Tiles/bones.gif b/src/Objects/Images/Tiles/bones.gif similarity index 100% rename from Objects/Images/Tiles/bones.gif rename to src/Objects/Images/Tiles/bones.gif diff --git a/Objects/Images/Tiles/bricks.jpg b/src/Objects/Images/Tiles/bricks.jpg similarity index 100% rename from Objects/Images/Tiles/bricks.jpg rename to src/Objects/Images/Tiles/bricks.jpg diff --git a/Objects/Images/Tiles/chest.gif b/src/Objects/Images/Tiles/chest.gif similarity index 100% rename from Objects/Images/Tiles/chest.gif rename to src/Objects/Images/Tiles/chest.gif diff --git a/Objects/Images/Tiles/dirt.jpg b/src/Objects/Images/Tiles/dirt.jpg similarity index 100% rename from Objects/Images/Tiles/dirt.jpg rename to src/Objects/Images/Tiles/dirt.jpg diff --git a/Objects/Images/Tiles/fire.gif b/src/Objects/Images/Tiles/fire.gif similarity index 100% rename from Objects/Images/Tiles/fire.gif rename to src/Objects/Images/Tiles/fire.gif diff --git a/Objects/Images/Tiles/floor.jpg b/src/Objects/Images/Tiles/floor.jpg similarity index 100% rename from Objects/Images/Tiles/floor.jpg rename to src/Objects/Images/Tiles/floor.jpg diff --git a/Objects/Images/Tiles/ice.jpg b/src/Objects/Images/Tiles/ice.jpg similarity index 100% rename from Objects/Images/Tiles/ice.jpg rename to src/Objects/Images/Tiles/ice.jpg diff --git a/Objects/Images/Tiles/ladderDown.gif b/src/Objects/Images/Tiles/ladderDown.gif similarity index 100% rename from Objects/Images/Tiles/ladderDown.gif rename to src/Objects/Images/Tiles/ladderDown.gif diff --git a/Objects/Images/Tiles/ladderUp.gif b/src/Objects/Images/Tiles/ladderUp.gif similarity index 100% rename from Objects/Images/Tiles/ladderUp.gif rename to src/Objects/Images/Tiles/ladderUp.gif diff --git a/Objects/Images/Tiles/shop.gif b/src/Objects/Images/Tiles/shop.gif similarity index 100% rename from Objects/Images/Tiles/shop.gif rename to src/Objects/Images/Tiles/shop.gif diff --git a/Objects/Images/Tiles/sign.gif b/src/Objects/Images/Tiles/sign.gif similarity index 100% rename from Objects/Images/Tiles/sign.gif rename to src/Objects/Images/Tiles/sign.gif diff --git a/Objects/Images/Tiles/snow.jpg b/src/Objects/Images/Tiles/snow.jpg similarity index 100% rename from Objects/Images/Tiles/snow.jpg rename to src/Objects/Images/Tiles/snow.jpg diff --git a/Objects/Images/Tiles/snowPacked.jpg b/src/Objects/Images/Tiles/snowPacked.jpg similarity index 100% rename from Objects/Images/Tiles/snowPacked.jpg rename to src/Objects/Images/Tiles/snowPacked.jpg diff --git a/Objects/Images/Tiles/stoneH.jpg b/src/Objects/Images/Tiles/stoneH.jpg similarity index 100% rename from Objects/Images/Tiles/stoneH.jpg rename to src/Objects/Images/Tiles/stoneH.jpg diff --git a/Objects/Images/Tiles/stonePath.jpg b/src/Objects/Images/Tiles/stonePath.jpg similarity index 100% rename from Objects/Images/Tiles/stonePath.jpg rename to src/Objects/Images/Tiles/stonePath.jpg diff --git a/Objects/Images/Tiles/stoneSlab.jpg b/src/Objects/Images/Tiles/stoneSlab.jpg similarity index 100% rename from Objects/Images/Tiles/stoneSlab.jpg rename to src/Objects/Images/Tiles/stoneSlab.jpg diff --git a/Objects/Images/Tiles/stoneV.jpg b/src/Objects/Images/Tiles/stoneV.jpg similarity index 100% rename from Objects/Images/Tiles/stoneV.jpg rename to src/Objects/Images/Tiles/stoneV.jpg diff --git a/Objects/Images/Tiles/tree.jpg b/src/Objects/Images/Tiles/tree.jpg similarity index 100% rename from Objects/Images/Tiles/tree.jpg rename to src/Objects/Images/Tiles/tree.jpg diff --git a/Objects/Images/Tiles/water.gif b/src/Objects/Images/Tiles/water.gif similarity index 100% rename from Objects/Images/Tiles/water.gif rename to src/Objects/Images/Tiles/water.gif diff --git a/Objects/Images/Tiles/water.jpg b/src/Objects/Images/Tiles/water.jpg similarity index 100% rename from Objects/Images/Tiles/water.jpg rename to src/Objects/Images/Tiles/water.jpg diff --git a/Objects/Images/Tiles/wood.jpg b/src/Objects/Images/Tiles/wood.jpg similarity index 100% rename from Objects/Images/Tiles/wood.jpg rename to src/Objects/Images/Tiles/wood.jpg diff --git a/Objects/Images/armor.gif b/src/Objects/Images/armor.gif similarity index 100% rename from Objects/Images/armor.gif rename to src/Objects/Images/armor.gif diff --git a/Objects/Images/background.jpg b/src/Objects/Images/background.jpg similarity index 100% rename from Objects/Images/background.jpg rename to src/Objects/Images/background.jpg diff --git a/Objects/Images/helmet.gif b/src/Objects/Images/helmet.gif similarity index 100% rename from Objects/Images/helmet.gif rename to src/Objects/Images/helmet.gif diff --git a/Objects/Images/loading.gif b/src/Objects/Images/loading.gif similarity index 100% rename from Objects/Images/loading.gif rename to src/Objects/Images/loading.gif diff --git a/Objects/Images/melee.gif b/src/Objects/Images/melee.gif similarity index 100% rename from Objects/Images/melee.gif rename to src/Objects/Images/melee.gif diff --git a/Objects/Images/range.gif b/src/Objects/Images/range.gif similarity index 100% rename from Objects/Images/range.gif rename to src/Objects/Images/range.gif diff --git a/Objects/Images/shield.gif b/src/Objects/Images/shield.gif similarity index 100% rename from Objects/Images/shield.gif rename to src/Objects/Images/shield.gif diff --git a/Objects/Maps/00.txt b/src/Objects/Maps/00.txt similarity index 100% rename from Objects/Maps/00.txt rename to src/Objects/Maps/00.txt diff --git a/Objects/Maps/10.txt b/src/Objects/Maps/10.txt similarity index 100% rename from Objects/Maps/10.txt rename to src/Objects/Maps/10.txt diff --git a/Objects/Maps/11.txt b/src/Objects/Maps/11.txt similarity index 100% rename from Objects/Maps/11.txt rename to src/Objects/Maps/11.txt diff --git a/Objects/Maps/12.txt b/src/Objects/Maps/12.txt similarity index 100% rename from Objects/Maps/12.txt rename to src/Objects/Maps/12.txt diff --git a/Objects/Maps/16.txt b/src/Objects/Maps/16.txt similarity index 100% rename from Objects/Maps/16.txt rename to src/Objects/Maps/16.txt diff --git a/Objects/Maps/17.txt b/src/Objects/Maps/17.txt similarity index 100% rename from Objects/Maps/17.txt rename to src/Objects/Maps/17.txt diff --git a/Objects/Maps/20.txt b/src/Objects/Maps/20.txt similarity index 100% rename from Objects/Maps/20.txt rename to src/Objects/Maps/20.txt diff --git a/Objects/Maps/22.txt b/src/Objects/Maps/22.txt similarity index 100% rename from Objects/Maps/22.txt rename to src/Objects/Maps/22.txt diff --git a/Objects/Maps/23.txt b/src/Objects/Maps/23.txt similarity index 100% rename from Objects/Maps/23.txt rename to src/Objects/Maps/23.txt diff --git a/Objects/Maps/26.txt b/src/Objects/Maps/26.txt similarity index 100% rename from Objects/Maps/26.txt rename to src/Objects/Maps/26.txt diff --git a/Objects/Maps/27.txt b/src/Objects/Maps/27.txt similarity index 100% rename from Objects/Maps/27.txt rename to src/Objects/Maps/27.txt diff --git a/Objects/Maps/30.txt b/src/Objects/Maps/30.txt similarity index 100% rename from Objects/Maps/30.txt rename to src/Objects/Maps/30.txt diff --git a/Objects/Maps/31.txt b/src/Objects/Maps/31.txt similarity index 100% rename from Objects/Maps/31.txt rename to src/Objects/Maps/31.txt diff --git a/Objects/Maps/32.txt b/src/Objects/Maps/32.txt similarity index 100% rename from Objects/Maps/32.txt rename to src/Objects/Maps/32.txt diff --git a/Objects/Maps/33.txt b/src/Objects/Maps/33.txt similarity index 100% rename from Objects/Maps/33.txt rename to src/Objects/Maps/33.txt diff --git a/Objects/Maps/34.txt b/src/Objects/Maps/34.txt similarity index 100% rename from Objects/Maps/34.txt rename to src/Objects/Maps/34.txt diff --git a/Objects/Maps/35.txt b/src/Objects/Maps/35.txt similarity index 100% rename from Objects/Maps/35.txt rename to src/Objects/Maps/35.txt diff --git a/Objects/Maps/36.txt b/src/Objects/Maps/36.txt similarity index 100% rename from Objects/Maps/36.txt rename to src/Objects/Maps/36.txt diff --git a/Objects/Maps/37.txt b/src/Objects/Maps/37.txt similarity index 100% rename from Objects/Maps/37.txt rename to src/Objects/Maps/37.txt diff --git a/Objects/Maps/42.txt b/src/Objects/Maps/42.txt similarity index 100% rename from Objects/Maps/42.txt rename to src/Objects/Maps/42.txt diff --git a/Objects/Maps/43.txt b/src/Objects/Maps/43.txt similarity index 100% rename from Objects/Maps/43.txt rename to src/Objects/Maps/43.txt diff --git a/Objects/Maps/44.txt b/src/Objects/Maps/44.txt similarity index 100% rename from Objects/Maps/44.txt rename to src/Objects/Maps/44.txt diff --git a/Objects/Maps/46.txt b/src/Objects/Maps/46.txt similarity index 100% rename from Objects/Maps/46.txt rename to src/Objects/Maps/46.txt diff --git a/Objects/Maps/51.txt b/src/Objects/Maps/51.txt similarity index 100% rename from Objects/Maps/51.txt rename to src/Objects/Maps/51.txt diff --git a/Objects/Maps/52.txt b/src/Objects/Maps/52.txt similarity index 100% rename from Objects/Maps/52.txt rename to src/Objects/Maps/52.txt diff --git a/Objects/Maps/54.txt b/src/Objects/Maps/54.txt similarity index 100% rename from Objects/Maps/54.txt rename to src/Objects/Maps/54.txt diff --git a/Objects/Maps/56.txt b/src/Objects/Maps/56.txt similarity index 100% rename from Objects/Maps/56.txt rename to src/Objects/Maps/56.txt diff --git a/Objects/Maps/57.txt b/src/Objects/Maps/57.txt similarity index 100% rename from Objects/Maps/57.txt rename to src/Objects/Maps/57.txt diff --git a/Objects/Maps/58.txt b/src/Objects/Maps/58.txt similarity index 100% rename from Objects/Maps/58.txt rename to src/Objects/Maps/58.txt diff --git a/Objects/Maps/62.txt b/src/Objects/Maps/62.txt similarity index 100% rename from Objects/Maps/62.txt rename to src/Objects/Maps/62.txt diff --git a/Objects/Maps/63.txt b/src/Objects/Maps/63.txt similarity index 100% rename from Objects/Maps/63.txt rename to src/Objects/Maps/63.txt diff --git a/Objects/Maps/64.txt b/src/Objects/Maps/64.txt similarity index 100% rename from Objects/Maps/64.txt rename to src/Objects/Maps/64.txt diff --git a/Objects/Maps/65.txt b/src/Objects/Maps/65.txt similarity index 100% rename from Objects/Maps/65.txt rename to src/Objects/Maps/65.txt diff --git a/Objects/Maps/66.txt b/src/Objects/Maps/66.txt similarity index 100% rename from Objects/Maps/66.txt rename to src/Objects/Maps/66.txt diff --git a/Objects/Maps/67.txt b/src/Objects/Maps/67.txt similarity index 100% rename from Objects/Maps/67.txt rename to src/Objects/Maps/67.txt diff --git a/Objects/Maps/68.txt b/src/Objects/Maps/68.txt similarity index 100% rename from Objects/Maps/68.txt rename to src/Objects/Maps/68.txt diff --git a/Objects/Maps/72.txt b/src/Objects/Maps/72.txt similarity index 100% rename from Objects/Maps/72.txt rename to src/Objects/Maps/72.txt diff --git a/Objects/Maps/73.txt b/src/Objects/Maps/73.txt similarity index 100% rename from Objects/Maps/73.txt rename to src/Objects/Maps/73.txt diff --git a/Objects/Maps/74.txt b/src/Objects/Maps/74.txt similarity index 100% rename from Objects/Maps/74.txt rename to src/Objects/Maps/74.txt diff --git a/Objects/Maps/76.txt b/src/Objects/Maps/76.txt similarity index 100% rename from Objects/Maps/76.txt rename to src/Objects/Maps/76.txt diff --git a/Objects/Maps/77.txt b/src/Objects/Maps/77.txt similarity index 100% rename from Objects/Maps/77.txt rename to src/Objects/Maps/77.txt diff --git a/Objects/Maps/78.txt b/src/Objects/Maps/78.txt similarity index 100% rename from Objects/Maps/78.txt rename to src/Objects/Maps/78.txt diff --git a/Objects/Maps/82.txt b/src/Objects/Maps/82.txt similarity index 100% rename from Objects/Maps/82.txt rename to src/Objects/Maps/82.txt diff --git a/Objects/Maps/83.txt b/src/Objects/Maps/83.txt similarity index 100% rename from Objects/Maps/83.txt rename to src/Objects/Maps/83.txt diff --git a/Objects/Maps/84.txt b/src/Objects/Maps/84.txt similarity index 100% rename from Objects/Maps/84.txt rename to src/Objects/Maps/84.txt diff --git a/Objects/Maps/85.txt b/src/Objects/Maps/85.txt similarity index 100% rename from Objects/Maps/85.txt rename to src/Objects/Maps/85.txt diff --git a/Objects/Maps/86.txt b/src/Objects/Maps/86.txt similarity index 100% rename from Objects/Maps/86.txt rename to src/Objects/Maps/86.txt diff --git a/Objects/Maps/87.txt b/src/Objects/Maps/87.txt similarity index 100% rename from Objects/Maps/87.txt rename to src/Objects/Maps/87.txt diff --git a/Objects/Maps/88.txt b/src/Objects/Maps/88.txt similarity index 100% rename from Objects/Maps/88.txt rename to src/Objects/Maps/88.txt diff --git a/Objects/Maps/MapInfo/00.txt b/src/Objects/Maps/MapInfo/00.txt similarity index 100% rename from Objects/Maps/MapInfo/00.txt rename to src/Objects/Maps/MapInfo/00.txt diff --git a/Objects/Maps/MapInfo/10.txt b/src/Objects/Maps/MapInfo/10.txt similarity index 100% rename from Objects/Maps/MapInfo/10.txt rename to src/Objects/Maps/MapInfo/10.txt diff --git a/Objects/Maps/MapInfo/11.txt b/src/Objects/Maps/MapInfo/11.txt similarity index 100% rename from Objects/Maps/MapInfo/11.txt rename to src/Objects/Maps/MapInfo/11.txt diff --git a/Objects/Maps/MapInfo/12.txt b/src/Objects/Maps/MapInfo/12.txt similarity index 100% rename from Objects/Maps/MapInfo/12.txt rename to src/Objects/Maps/MapInfo/12.txt diff --git a/Objects/Maps/MapInfo/16.txt b/src/Objects/Maps/MapInfo/16.txt similarity index 100% rename from Objects/Maps/MapInfo/16.txt rename to src/Objects/Maps/MapInfo/16.txt diff --git a/Objects/Maps/MapInfo/17.txt b/src/Objects/Maps/MapInfo/17.txt similarity index 100% rename from Objects/Maps/MapInfo/17.txt rename to src/Objects/Maps/MapInfo/17.txt diff --git a/Objects/Maps/MapInfo/20.txt b/src/Objects/Maps/MapInfo/20.txt similarity index 100% rename from Objects/Maps/MapInfo/20.txt rename to src/Objects/Maps/MapInfo/20.txt diff --git a/Objects/Maps/MapInfo/22.txt b/src/Objects/Maps/MapInfo/22.txt similarity index 100% rename from Objects/Maps/MapInfo/22.txt rename to src/Objects/Maps/MapInfo/22.txt diff --git a/Objects/Maps/MapInfo/26.txt b/src/Objects/Maps/MapInfo/26.txt similarity index 100% rename from Objects/Maps/MapInfo/26.txt rename to src/Objects/Maps/MapInfo/26.txt diff --git a/Objects/Maps/MapInfo/27.txt b/src/Objects/Maps/MapInfo/27.txt similarity index 100% rename from Objects/Maps/MapInfo/27.txt rename to src/Objects/Maps/MapInfo/27.txt diff --git a/Objects/Maps/MapInfo/30.txt b/src/Objects/Maps/MapInfo/30.txt similarity index 100% rename from Objects/Maps/MapInfo/30.txt rename to src/Objects/Maps/MapInfo/30.txt diff --git a/Objects/Maps/MapInfo/31.txt b/src/Objects/Maps/MapInfo/31.txt similarity index 100% rename from Objects/Maps/MapInfo/31.txt rename to src/Objects/Maps/MapInfo/31.txt diff --git a/Objects/Maps/MapInfo/32.txt b/src/Objects/Maps/MapInfo/32.txt similarity index 100% rename from Objects/Maps/MapInfo/32.txt rename to src/Objects/Maps/MapInfo/32.txt diff --git a/Objects/Maps/MapInfo/35.txt b/src/Objects/Maps/MapInfo/35.txt similarity index 100% rename from Objects/Maps/MapInfo/35.txt rename to src/Objects/Maps/MapInfo/35.txt diff --git a/Objects/Maps/MapInfo/36.txt b/src/Objects/Maps/MapInfo/36.txt similarity index 100% rename from Objects/Maps/MapInfo/36.txt rename to src/Objects/Maps/MapInfo/36.txt diff --git a/Objects/Maps/MapInfo/37.txt b/src/Objects/Maps/MapInfo/37.txt similarity index 100% rename from Objects/Maps/MapInfo/37.txt rename to src/Objects/Maps/MapInfo/37.txt diff --git a/Objects/Maps/MapInfo/42.txt b/src/Objects/Maps/MapInfo/42.txt similarity index 100% rename from Objects/Maps/MapInfo/42.txt rename to src/Objects/Maps/MapInfo/42.txt diff --git a/Objects/Maps/MapInfo/46.txt b/src/Objects/Maps/MapInfo/46.txt similarity index 100% rename from Objects/Maps/MapInfo/46.txt rename to src/Objects/Maps/MapInfo/46.txt diff --git a/Objects/Maps/MapInfo/51.txt b/src/Objects/Maps/MapInfo/51.txt similarity index 100% rename from Objects/Maps/MapInfo/51.txt rename to src/Objects/Maps/MapInfo/51.txt diff --git a/Objects/Maps/MapInfo/52.txt b/src/Objects/Maps/MapInfo/52.txt similarity index 100% rename from Objects/Maps/MapInfo/52.txt rename to src/Objects/Maps/MapInfo/52.txt diff --git a/Objects/Maps/MapInfo/56.txt b/src/Objects/Maps/MapInfo/56.txt similarity index 100% rename from Objects/Maps/MapInfo/56.txt rename to src/Objects/Maps/MapInfo/56.txt diff --git a/Objects/Maps/MapInfo/57.txt b/src/Objects/Maps/MapInfo/57.txt similarity index 100% rename from Objects/Maps/MapInfo/57.txt rename to src/Objects/Maps/MapInfo/57.txt diff --git a/Objects/Maps/MapInfo/58.txt b/src/Objects/Maps/MapInfo/58.txt similarity index 100% rename from Objects/Maps/MapInfo/58.txt rename to src/Objects/Maps/MapInfo/58.txt diff --git a/Objects/Maps/MapInfo/62.txt b/src/Objects/Maps/MapInfo/62.txt similarity index 100% rename from Objects/Maps/MapInfo/62.txt rename to src/Objects/Maps/MapInfo/62.txt diff --git a/Objects/Maps/MapInfo/66.txt b/src/Objects/Maps/MapInfo/66.txt similarity index 100% rename from Objects/Maps/MapInfo/66.txt rename to src/Objects/Maps/MapInfo/66.txt diff --git a/Objects/Maps/MapInfo/68.txt b/src/Objects/Maps/MapInfo/68.txt similarity index 100% rename from Objects/Maps/MapInfo/68.txt rename to src/Objects/Maps/MapInfo/68.txt diff --git a/Objects/Maps/MapInfo/72.txt b/src/Objects/Maps/MapInfo/72.txt similarity index 100% rename from Objects/Maps/MapInfo/72.txt rename to src/Objects/Maps/MapInfo/72.txt diff --git a/Objects/Maps/MapInfo/73.txt b/src/Objects/Maps/MapInfo/73.txt similarity index 100% rename from Objects/Maps/MapInfo/73.txt rename to src/Objects/Maps/MapInfo/73.txt diff --git a/Objects/Maps/MapInfo/76.txt b/src/Objects/Maps/MapInfo/76.txt similarity index 100% rename from Objects/Maps/MapInfo/76.txt rename to src/Objects/Maps/MapInfo/76.txt diff --git a/Objects/Maps/MapInfo/77.txt b/src/Objects/Maps/MapInfo/77.txt similarity index 100% rename from Objects/Maps/MapInfo/77.txt rename to src/Objects/Maps/MapInfo/77.txt diff --git a/Objects/Maps/MapInfo/78.txt b/src/Objects/Maps/MapInfo/78.txt similarity index 100% rename from Objects/Maps/MapInfo/78.txt rename to src/Objects/Maps/MapInfo/78.txt diff --git a/Objects/Maps/MapInfo/82.txt b/src/Objects/Maps/MapInfo/82.txt similarity index 100% rename from Objects/Maps/MapInfo/82.txt rename to src/Objects/Maps/MapInfo/82.txt diff --git a/Objects/Maps/MapInfo/83.txt b/src/Objects/Maps/MapInfo/83.txt similarity index 100% rename from Objects/Maps/MapInfo/83.txt rename to src/Objects/Maps/MapInfo/83.txt diff --git a/Objects/Maps/MapInfo/84.txt b/src/Objects/Maps/MapInfo/84.txt similarity index 100% rename from Objects/Maps/MapInfo/84.txt rename to src/Objects/Maps/MapInfo/84.txt diff --git a/Objects/Maps/MapInfo/85.txt b/src/Objects/Maps/MapInfo/85.txt similarity index 100% rename from Objects/Maps/MapInfo/85.txt rename to src/Objects/Maps/MapInfo/85.txt diff --git a/Objects/Maps/MapInfo/86.txt b/src/Objects/Maps/MapInfo/86.txt similarity index 100% rename from Objects/Maps/MapInfo/86.txt rename to src/Objects/Maps/MapInfo/86.txt diff --git a/Objects/Maps/MapInfo/87.txt b/src/Objects/Maps/MapInfo/87.txt similarity index 100% rename from Objects/Maps/MapInfo/87.txt rename to src/Objects/Maps/MapInfo/87.txt diff --git a/Objects/Maps/MapInfo/88.txt b/src/Objects/Maps/MapInfo/88.txt similarity index 100% rename from Objects/Maps/MapInfo/88.txt rename to src/Objects/Maps/MapInfo/88.txt diff --git a/Objects/Maps/cave.txt b/src/Objects/Maps/cave.txt similarity index 100% rename from Objects/Maps/cave.txt rename to src/Objects/Maps/cave.txt diff --git a/Objects/Maps/forest.txt b/src/Objects/Maps/forest.txt similarity index 100% rename from Objects/Maps/forest.txt rename to src/Objects/Maps/forest.txt diff --git a/Objects/Saves/Bob/1.txt b/src/Objects/Saves/Zak/1.txt similarity index 100% rename from Objects/Saves/Bob/1.txt rename to src/Objects/Saves/Zak/1.txt diff --git a/Objects/Saves/Bob/10.txt b/src/Objects/Saves/Zak/10.txt similarity index 100% rename from Objects/Saves/Bob/10.txt rename to src/Objects/Saves/Zak/10.txt diff --git a/Objects/Saves/Bob/11.txt b/src/Objects/Saves/Zak/11.txt similarity index 100% rename from Objects/Saves/Bob/11.txt rename to src/Objects/Saves/Zak/11.txt diff --git a/Objects/Saves/Bob/12.txt b/src/Objects/Saves/Zak/12.txt similarity index 100% rename from Objects/Saves/Bob/12.txt rename to src/Objects/Saves/Zak/12.txt diff --git a/Objects/Saves/Bob/13.txt b/src/Objects/Saves/Zak/13.txt similarity index 100% rename from Objects/Saves/Bob/13.txt rename to src/Objects/Saves/Zak/13.txt diff --git a/Objects/Saves/Bob/14.txt b/src/Objects/Saves/Zak/14.txt similarity index 100% rename from Objects/Saves/Bob/14.txt rename to src/Objects/Saves/Zak/14.txt diff --git a/Objects/Saves/Bob/15.txt b/src/Objects/Saves/Zak/15.txt similarity index 100% rename from Objects/Saves/Bob/15.txt rename to src/Objects/Saves/Zak/15.txt diff --git a/Objects/Saves/Bob/16.txt b/src/Objects/Saves/Zak/16.txt similarity index 100% rename from Objects/Saves/Bob/16.txt rename to src/Objects/Saves/Zak/16.txt diff --git a/Objects/Saves/Bob/17.txt b/src/Objects/Saves/Zak/17.txt similarity index 100% rename from Objects/Saves/Bob/17.txt rename to src/Objects/Saves/Zak/17.txt diff --git a/Objects/Saves/Bob/18.txt b/src/Objects/Saves/Zak/18.txt similarity index 100% rename from Objects/Saves/Bob/18.txt rename to src/Objects/Saves/Zak/18.txt diff --git a/Objects/Saves/Bob/19.txt b/src/Objects/Saves/Zak/19.txt similarity index 100% rename from Objects/Saves/Bob/19.txt rename to src/Objects/Saves/Zak/19.txt diff --git a/Objects/Saves/Bob/2.txt b/src/Objects/Saves/Zak/2.txt similarity index 100% rename from Objects/Saves/Bob/2.txt rename to src/Objects/Saves/Zak/2.txt diff --git a/Objects/Saves/Bob/20.txt b/src/Objects/Saves/Zak/20.txt similarity index 100% rename from Objects/Saves/Bob/20.txt rename to src/Objects/Saves/Zak/20.txt diff --git a/Objects/Saves/Bob/21.txt b/src/Objects/Saves/Zak/21.txt similarity index 100% rename from Objects/Saves/Bob/21.txt rename to src/Objects/Saves/Zak/21.txt diff --git a/Objects/Saves/Bob/3.txt b/src/Objects/Saves/Zak/3.txt similarity index 100% rename from Objects/Saves/Bob/3.txt rename to src/Objects/Saves/Zak/3.txt diff --git a/Objects/Saves/Bob/4.txt b/src/Objects/Saves/Zak/4.txt similarity index 100% rename from Objects/Saves/Bob/4.txt rename to src/Objects/Saves/Zak/4.txt diff --git a/Objects/Saves/Bob/5.txt b/src/Objects/Saves/Zak/5.txt similarity index 100% rename from Objects/Saves/Bob/5.txt rename to src/Objects/Saves/Zak/5.txt diff --git a/Objects/Saves/Bob/6.txt b/src/Objects/Saves/Zak/6.txt similarity index 100% rename from Objects/Saves/Bob/6.txt rename to src/Objects/Saves/Zak/6.txt diff --git a/Objects/Saves/Bob/7.txt b/src/Objects/Saves/Zak/7.txt similarity index 100% rename from Objects/Saves/Bob/7.txt rename to src/Objects/Saves/Zak/7.txt diff --git a/Objects/Saves/Bob/8.txt b/src/Objects/Saves/Zak/8.txt similarity index 100% rename from Objects/Saves/Bob/8.txt rename to src/Objects/Saves/Zak/8.txt diff --git a/Objects/Saves/Bob/9.txt b/src/Objects/Saves/Zak/9.txt similarity index 100% rename from Objects/Saves/Bob/9.txt rename to src/Objects/Saves/Zak/9.txt diff --git a/Objects/Saves/SIr Mathew/character.txt b/src/Objects/Saves/Zak/character.txt similarity index 62% rename from Objects/Saves/SIr Mathew/character.txt rename to src/Objects/Saves/Zak/character.txt index c87ab81..cdf5e3e 100644 --- a/Objects/Saves/SIr Mathew/character.txt +++ b/src/Objects/Saves/Zak/character.txt @@ -1,7 +1,7 @@ -SIr Mathew +Zak male -00.txt -9 +10.txt +11 11 125 @@ -9,7 +9,9 @@ male 30 5 6.25 -0 + +200 + 0 0 0 diff --git a/Objects/Saves/Bob/inventory.txt b/src/Objects/Saves/Zak/inventory.txt similarity index 100% rename from Objects/Saves/Bob/inventory.txt rename to src/Objects/Saves/Zak/inventory.txt diff --git a/src/StartUp$ButtonHandler$1.class b/src/StartUp$ButtonHandler$1.class new file mode 100644 index 0000000..9510057 Binary files /dev/null and b/src/StartUp$ButtonHandler$1.class differ diff --git a/src/StartUp$ButtonHandler$2.class b/src/StartUp$ButtonHandler$2.class new file mode 100644 index 0000000..fcc4b43 Binary files /dev/null and b/src/StartUp$ButtonHandler$2.class differ diff --git a/src/StartUp$ButtonHandler.class b/src/StartUp$ButtonHandler.class new file mode 100644 index 0000000..9376909 Binary files /dev/null and b/src/StartUp$ButtonHandler.class differ diff --git a/src/StartUp$Game$1.class b/src/StartUp$Game$1.class new file mode 100644 index 0000000..0a3ce55 Binary files /dev/null and b/src/StartUp$Game$1.class differ diff --git a/src/StartUp$Game$2.class b/src/StartUp$Game$2.class new file mode 100644 index 0000000..687adc2 Binary files /dev/null and b/src/StartUp$Game$2.class differ diff --git a/src/StartUp$Game.class b/src/StartUp$Game.class new file mode 100644 index 0000000..6dcf9af Binary files /dev/null and b/src/StartUp$Game.class differ diff --git a/src/StartUp$KeyHandler.class b/src/StartUp$KeyHandler.class new file mode 100644 index 0000000..4cd4e48 Binary files /dev/null and b/src/StartUp$KeyHandler.class differ diff --git a/src/StartUp.class b/src/StartUp.class new file mode 100644 index 0000000..46c2b9a Binary files /dev/null and b/src/StartUp.class differ diff --git a/src/StartUp.java b/src/StartUp.java index 6279757..fa7744e 100644 --- a/src/StartUp.java +++ b/src/StartUp.java @@ -216,7 +216,7 @@ public class StartUp implements Runnable { armor = scan1.next(); // armor equipped shield = scan1.next(); // shield equipped scan1.close(); - + // apply stat "boosts" for equiped items if (helmet.equals("helmet")) { helmetVal = 10; @@ -370,7 +370,7 @@ public class StartUp implements Runnable { panel6.setVisible(mapToggle); mapLoader(); // Load the map - + // buffer character sprite images new ImageIcon(animatedDir + "upC.gif"); new ImageIcon(animatedDir + "upR.gif"); @@ -442,7 +442,7 @@ public class StartUp implements Runnable { } catch (Exception e) { } } - + //load overlapping image if (value[x][y] == 11) { // bolder placeHolder[x][y].setIcon(new ImageIcon(dir @@ -460,7 +460,7 @@ public class StartUp implements Runnable { placeHolder[x][y].setIcon(new ImageIcon(dir + "Images/Tiles/shop.gif")); } - + // load tiles that have a corresponding action if (value[x][y] == 15 || value[x][y] >= 17 && value[x][y] <= 22) { @@ -482,7 +482,7 @@ public class StartUp implements Runnable { } else { scan3.nextLine(); } - + //test to see if the players observation is high enough to see pathway } else if (value[x][y] == 21) { if (observation < Integer @@ -595,7 +595,7 @@ public class StartUp implements Runnable { bonus.setForeground(color1); inv.add(bonus); JLabel info = new JLabel("Health: " + curHealth + "/" + health - + " Money: £" + money, SwingConstants.CENTER); + + " Money: $" + money, SwingConstants.CENTER); info.setFont(new Font("Times New Roman", Font.BOLD, 30)); info.setForeground(new Color(255, 255, 255, 255)); inv.add(info, BorderLayout.SOUTH); @@ -636,7 +636,7 @@ public class StartUp implements Runnable { } else if (value[xSpot][ySpot] >= 8 && value[xSpot][ySpot] <= 10) { steps++; } - + // chance of being attacked if (randomSteps == steps) { steps = 0; @@ -722,10 +722,10 @@ public class StartUp implements Runnable { } else if (i == 12 && chestItems[i] > 0) { mdl.addElement("Potion x" + chestItems[i]); } else if (i == 13 && chestItems[i] > 0) { - mdl.addElement("£" + chestItems[i]); + mdl.addElement("$" + chestItems[i]); } } - + // update chest to being empty PrintWriter out3 = null; try { @@ -925,7 +925,7 @@ public class StartUp implements Runnable { Thread.sleep(100); fpanel2.setBounds(450, 0, 400, 300); Thread.sleep(250); - + // he missed if (agility + eAccuracy >= (int) (Math.random() * 99) + 1) { // Possibility of your agility stat going up @@ -989,7 +989,7 @@ public class StartUp implements Runnable { dirX = +1; dirY = 0; } - + // change image to the direction the character Sprite.setIcon(new ImageIcon(animatedDir + move + "C.gif")); new Thread(new Runnable() { @@ -1431,7 +1431,7 @@ public class StartUp implements Runnable { frame2.setVisible(false); frame2.dispose(); money = money + (int)((Math.random()*300)+1); - mdl.addElement("You now have £" + money); + mdl.addElement("You now have $" + money); } else { Thread.sleep(900); Game.opponent(); @@ -1501,7 +1501,7 @@ public class StartUp implements Runnable { System.exit(0); } money = money + (int)((Math.random()*300)+1); - mdl.addElement("You now have £" + money); + mdl.addElement("You now have $" + money); } else { Thread.sleep(900); Game.opponent(); diff --git a/src/mapEditor$ButtonHandler.class b/src/mapEditor$ButtonHandler.class new file mode 100644 index 0000000..5427891 Binary files /dev/null and b/src/mapEditor$ButtonHandler.class differ diff --git a/src/mapEditor.class b/src/mapEditor.class new file mode 100644 index 0000000..d74d8fb Binary files /dev/null and b/src/mapEditor.class differ