aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.xml9
-rw-r--r--res/resources/audio/END.ogg (renamed from res/res/snd/END.ogg)bin1155224 -> 1155224 bytes
-rw-r--r--res/resources/audio/FEED_ATHANASE.ogg (renamed from res/res/snd/FEED_ATHANASE.ogg)bin513150 -> 513150 bytes
-rw-r--r--res/resources/audio/FIND_CONSOLE.ogg (renamed from res/res/snd/FIND_CONSOLE.ogg)bin1627908 -> 1627908 bytes
-rw-r--r--res/resources/audio/FIND_DISK.ogg (renamed from res/res/snd/FIND_DISK.ogg)bin969007 -> 969007 bytes
-rw-r--r--res/resources/audio/GAME_LOST.ogg (renamed from res/res/snd/GAME_LOST.ogg)bin1849460 -> 1849460 bytes
-rw-r--r--res/resources/audio/INSTALL_CONSOLE.ogg (renamed from res/res/snd/INSTALL_CONSOLE.ogg)bin1719262 -> 1719262 bytes
-rw-r--r--res/resources/audio/INTRO.ogg (renamed from res/res/snd/INTRO.ogg)bin923189 -> 923189 bytes
-rw-r--r--res/resources/audio/RUN_CONSOLE.ogg (renamed from res/res/snd/RUN_CONSOLE.ogg)bin121718 -> 121718 bytes
-rw-r--r--res/resources/audio/WHAT_HAPPENED.ogg (renamed from res/res/snd/WHAT_HAPPENED.ogg)bin2019139 -> 2019139 bytes
-rw-r--r--res/resources/images/placeholder.jpg (renamed from res/res/img/placeholder.jpg)bin77504 -> 77504 bytes
-rw-r--r--res/resources/images/placeholder.svg (renamed from res/res/img/placeholder.svg)0
-rwxr-xr-xsrc/esieequest/Main.java12
-rw-r--r--src/esieequest/engine/Callback.java (renamed from src/esieequest/controller/Callback.java)2
-rw-r--r--src/esieequest/engine/GameEngine.java (renamed from src/esieequest/controller/GameEngine.java)22
-rw-r--r--src/esieequest/engine/Input.java (renamed from src/esieequest/controller/Input.java)4
-rw-r--r--src/esieequest/engine/commands/AleaCommand.java (renamed from src/esieequest/controller/commands/AleaCommand.java)12
-rw-r--r--src/esieequest/engine/commands/BackCommand.java (renamed from src/esieequest/controller/commands/BackCommand.java)8
-rw-r--r--src/esieequest/engine/commands/Command.java (renamed from src/esieequest/controller/commands/Command.java)10
-rw-r--r--src/esieequest/engine/commands/DoCommand.java (renamed from src/esieequest/controller/commands/DoCommand.java)10
-rw-r--r--src/esieequest/engine/commands/DropCommand.java (renamed from src/esieequest/controller/commands/DropCommand.java)10
-rw-r--r--src/esieequest/engine/commands/Executable.java (renamed from src/esieequest/controller/commands/Executable.java)6
-rw-r--r--src/esieequest/engine/commands/GoCommand.java (renamed from src/esieequest/controller/commands/GoCommand.java)12
-rw-r--r--src/esieequest/engine/commands/HelpCommand.java (renamed from src/esieequest/controller/commands/HelpCommand.java)8
-rw-r--r--src/esieequest/engine/commands/InventoryCommand.java (renamed from src/esieequest/controller/commands/InventoryCommand.java)8
-rw-r--r--src/esieequest/engine/commands/LoadCommand.java (renamed from src/esieequest/controller/commands/LoadCommand.java)8
-rw-r--r--src/esieequest/engine/commands/LookCommand.java (renamed from src/esieequest/controller/commands/LookCommand.java)8
-rw-r--r--src/esieequest/engine/commands/NewCommand.java (renamed from src/esieequest/controller/commands/NewCommand.java)12
-rw-r--r--src/esieequest/engine/commands/QuitCommand.java (renamed from src/esieequest/controller/commands/QuitCommand.java)8
-rw-r--r--src/esieequest/engine/commands/SaveCommand.java (renamed from src/esieequest/controller/commands/SaveCommand.java)8
-rw-r--r--src/esieequest/engine/commands/TakeCommand.java (renamed from src/esieequest/controller/commands/TakeCommand.java)16
-rw-r--r--src/esieequest/engine/commands/TalkCommand.java (renamed from src/esieequest/controller/commands/TalkCommand.java)10
-rw-r--r--src/esieequest/engine/commands/ToggleSoundCommand.java (renamed from src/esieequest/controller/commands/ToggleSoundCommand.java)8
-rw-r--r--src/esieequest/engine/commands/TurnCommand.java (renamed from src/esieequest/controller/commands/TurnCommand.java)12
-rw-r--r--src/esieequest/engine/commands/UseCommand.java (renamed from src/esieequest/controller/commands/UseCommand.java)10
-rw-r--r--src/esieequest/engine/commands/package-info.java (renamed from src/esieequest/controller/commands/package-info.java)2
-rw-r--r--src/esieequest/engine/package-info.java (renamed from src/esieequest/controller/package-info.java)2
-rw-r--r--src/esieequest/engine/utils/EnumUtils.java (renamed from src/esieequest/controller/utils/EnumUtils.java)2
-rw-r--r--src/esieequest/engine/utils/ListUtils.java (renamed from src/esieequest/controller/utils/ListUtils.java)4
-rw-r--r--src/esieequest/engine/utils/SerialisableList.java (renamed from src/esieequest/controller/utils/SerialisableList.java)2
-rw-r--r--src/esieequest/engine/utils/SerialisableObject.java (renamed from src/esieequest/controller/utils/SerialisableObject.java)2
-rw-r--r--src/esieequest/engine/utils/package-info.java (renamed from src/esieequest/controller/utils/package-info.java)2
-rw-r--r--src/esieequest/esieequest.gwt.xml12
-rw-r--r--src/esieequest/game/Game.java (renamed from src/esieequest/model/Game.java)24
-rw-r--r--src/esieequest/game/Player.java (renamed from src/esieequest/model/Player.java)16
-rw-r--r--src/esieequest/game/Text.java (renamed from src/esieequest/model/Text.java)2
-rw-r--r--src/esieequest/game/characters/Athanase.java (renamed from src/esieequest/model/characters/Athanase.java)12
-rw-r--r--src/esieequest/game/characters/Character.java (renamed from src/esieequest/model/characters/Character.java)14
-rw-r--r--src/esieequest/game/characters/FollowingCharacter.java (renamed from src/esieequest/model/characters/FollowingCharacter.java)8
-rw-r--r--src/esieequest/game/characters/MovingCharacter.java (renamed from src/esieequest/model/characters/MovingCharacter.java)8
-rw-r--r--src/esieequest/game/characters/SimpleCharacter.java (renamed from src/esieequest/model/characters/SimpleCharacter.java)8
-rw-r--r--src/esieequest/game/characters/Sumobot.java (renamed from src/esieequest/model/characters/Sumobot.java)14
-rw-r--r--src/esieequest/game/characters/WanderingCharacter.java (renamed from src/esieequest/model/characters/WanderingCharacter.java)8
-rw-r--r--src/esieequest/game/characters/package-info.java (renamed from src/esieequest/model/characters/package-info.java)2
-rw-r--r--src/esieequest/game/doors/Door.java (renamed from src/esieequest/model/doors/Door.java)8
-rw-r--r--src/esieequest/game/doors/HiddenDoor.java (renamed from src/esieequest/model/doors/HiddenDoor.java)4
-rw-r--r--src/esieequest/game/doors/LockedDoor.java (renamed from src/esieequest/model/doors/LockedDoor.java)14
-rw-r--r--src/esieequest/game/doors/TransporterDoor.java (renamed from src/esieequest/model/doors/TransporterDoor.java)4
-rw-r--r--src/esieequest/game/doors/TrapDoor.java (renamed from src/esieequest/model/doors/TrapDoor.java)8
-rw-r--r--src/esieequest/game/doors/package-info.java (renamed from src/esieequest/model/doors/package-info.java)2
-rw-r--r--src/esieequest/game/items/Banana.java (renamed from src/esieequest/model/items/Banana.java)6
-rw-r--r--src/esieequest/game/items/Beamer.java (renamed from src/esieequest/model/items/Beamer.java)10
-rw-r--r--src/esieequest/game/items/Disk.java (renamed from src/esieequest/model/items/Disk.java)16
-rw-r--r--src/esieequest/game/items/Inventory.java (renamed from src/esieequest/model/items/Inventory.java)10
-rw-r--r--src/esieequest/game/items/Item.java (renamed from src/esieequest/model/items/Item.java)12
-rw-r--r--src/esieequest/game/items/Note.java (renamed from src/esieequest/model/items/Note.java)8
-rw-r--r--src/esieequest/game/items/PortableConsole.java (renamed from src/esieequest/model/items/PortableConsole.java)10
-rw-r--r--src/esieequest/game/items/SimpleItem.java (renamed from src/esieequest/model/items/SimpleItem.java)10
-rw-r--r--src/esieequest/game/items/package-info.java (renamed from src/esieequest/model/items/package-info.java)2
-rw-r--r--src/esieequest/game/map/Direction.java (renamed from src/esieequest/model/map/Direction.java)2
-rw-r--r--src/esieequest/game/map/Orientation.java (renamed from src/esieequest/model/map/Orientation.java)2
-rw-r--r--src/esieequest/game/map/Room.java (renamed from src/esieequest/model/map/Room.java)18
-rw-r--r--src/esieequest/game/map/Side.java (renamed from src/esieequest/model/map/Side.java)12
-rw-r--r--src/esieequest/game/map/package-info.java (renamed from src/esieequest/model/map/package-info.java)2
-rw-r--r--src/esieequest/game/package-info.java (renamed from src/esieequest/model/package-info.java)2
-rw-r--r--src/esieequest/game/states/Quest.java (renamed from src/esieequest/model/events/Quest.java)2
-rw-r--r--src/esieequest/game/states/Scene.java (renamed from src/esieequest/model/events/Scene.java)4
-rw-r--r--src/esieequest/game/states/package-info.java (renamed from src/esieequest/model/events/package-info.java)2
-rw-r--r--src/esieequest/ui/Viewable.java (renamed from src/esieequest/view/Viewable.java)18
-rw-r--r--src/esieequest/ui/package-info.java (renamed from src/esieequest/view/package-info.java)2
-rw-r--r--src/esieequest/ui/rich/Applet.java (renamed from src/esieequest/view/app/Applet.java)2
-rw-r--r--src/esieequest/ui/rich/UserInterface.java (renamed from src/esieequest/view/app/UserInterface.java)32
-rw-r--r--src/esieequest/ui/rich/Window.java (renamed from src/esieequest/view/app/Window.java)2
-rw-r--r--src/esieequest/ui/rich/package-info.java (renamed from src/esieequest/view/app/package-info.java)2
-rw-r--r--src/esieequest/ui/text/Console.java (renamed from src/esieequest/view/text/Console.java)2
-rw-r--r--src/esieequest/ui/text/FileReader.java (renamed from src/esieequest/view/text/FileReader.java)2
-rw-r--r--src/esieequest/ui/text/TextInterface.java (renamed from src/esieequest/view/text/TextInterface.java)22
-rw-r--r--src/esieequest/ui/text/package-info.java (renamed from src/esieequest/view/text/package-info.java)2
-rw-r--r--src/esieequest/ui/web/Main.java (renamed from src/esieequest/view/web/Main.java)4
-rw-r--r--src/esieequest/ui/web/WebInterface.java (renamed from src/esieequest/view/web/WebInterface.java)30
-rw-r--r--src/esieequest/ui/web/WebInterface.ui.xml (renamed from src/esieequest/view/web/WebInterface.ui.xml)0
-rw-r--r--src/esieequest/ui/web/package-info.java (renamed from src/esieequest/view/web/package-info.java)2
92 files changed, 338 insertions, 331 deletions
diff --git a/build.xml b/build.xml
index 1f76860..829d4f5 100644
--- a/build.xml
+++ b/build.xml
@@ -28,6 +28,13 @@
28 <copy todir="war/WEB-INF/lib" file="lib/startup2.jar" /> 28 <copy todir="war/WEB-INF/lib" file="lib/startup2.jar" />
29 </target> 29 </target>
30 30
31 <target name="res" description="Copy resources to res">
32 <mkdir dir="war" />
33 <copy todir="war">
34 <fileset dir="res" />
35 </copy>
36 </target>
37
31 <target name="javac" depends="libs" description="Compile java source to bytecode"> 38 <target name="javac" depends="libs" description="Compile java source to bytecode">
32 <mkdir dir="war/WEB-INF/classes" /> 39 <mkdir dir="war/WEB-INF/classes" />
33 <javac srcdir="src" includes="**" encoding="utf-8" destdir="war/WEB-INF/classes" source="1.7" target="1.7" nowarn="true" debug="true" debuglevel="lines,vars,source"> 40 <javac srcdir="src" includes="**" encoding="utf-8" destdir="war/WEB-INF/classes" source="1.7" target="1.7" nowarn="true" debug="true" debuglevel="lines,vars,source">
@@ -38,7 +45,7 @@
38 </copy> 45 </copy>
39 </target> 46 </target>
40 47
41 <target name="gwtc" depends="javac" description="GWT compile to JavaScript (production mode)"> 48 <target name="gwtc" depends="javac,res" description="GWT compile to JavaScript (production mode)">
42 <java failonerror="true" fork="true" classname="com.google.gwt.dev.Compiler"> 49 <java failonerror="true" fork="true" classname="com.google.gwt.dev.Compiler">
43 <classpath> 50 <classpath>
44 <pathelement location="src" /> 51 <pathelement location="src" />
diff --git a/res/res/snd/END.ogg b/res/resources/audio/END.ogg
index db2b370..db2b370 100644
--- a/res/res/snd/END.ogg
+++ b/res/resources/audio/END.ogg
Binary files differ
diff --git a/res/res/snd/FEED_ATHANASE.ogg b/res/resources/audio/FEED_ATHANASE.ogg
index 94e8668..94e8668 100644
--- a/res/res/snd/FEED_ATHANASE.ogg
+++ b/res/resources/audio/FEED_ATHANASE.ogg
Binary files differ
diff --git a/res/res/snd/FIND_CONSOLE.ogg b/res/resources/audio/FIND_CONSOLE.ogg
index 39aee7e..39aee7e 100644
--- a/res/res/snd/FIND_CONSOLE.ogg
+++ b/res/resources/audio/FIND_CONSOLE.ogg
Binary files differ
diff --git a/res/res/snd/FIND_DISK.ogg b/res/resources/audio/FIND_DISK.ogg
index b852de2..b852de2 100644
--- a/res/res/snd/FIND_DISK.ogg
+++ b/res/resources/audio/FIND_DISK.ogg
Binary files differ
diff --git a/res/res/snd/GAME_LOST.ogg b/res/resources/audio/GAME_LOST.ogg
index 71dffae..71dffae 100644
--- a/res/res/snd/GAME_LOST.ogg
+++ b/res/resources/audio/GAME_LOST.ogg
Binary files differ
diff --git a/res/res/snd/INSTALL_CONSOLE.ogg b/res/resources/audio/INSTALL_CONSOLE.ogg
index fe7a296..fe7a296 100644
--- a/res/res/snd/INSTALL_CONSOLE.ogg
+++ b/res/resources/audio/INSTALL_CONSOLE.ogg
Binary files differ
diff --git a/res/res/snd/INTRO.ogg b/res/resources/audio/INTRO.ogg
index da90187..da90187 100644
--- a/res/res/snd/INTRO.ogg
+++ b/res/resources/audio/INTRO.ogg
Binary files differ
diff --git a/res/res/snd/RUN_CONSOLE.ogg b/res/resources/audio/RUN_CONSOLE.ogg
index 8c43dd1..8c43dd1 100644
--- a/res/res/snd/RUN_CONSOLE.ogg
+++ b/res/resources/audio/RUN_CONSOLE.ogg
Binary files differ
diff --git a/res/res/snd/WHAT_HAPPENED.ogg b/res/resources/audio/WHAT_HAPPENED.ogg
index 0aac689..0aac689 100644
--- a/res/res/snd/WHAT_HAPPENED.ogg
+++ b/res/resources/audio/WHAT_HAPPENED.ogg
Binary files differ
diff --git a/res/res/img/placeholder.jpg b/res/resources/images/placeholder.jpg
index a837f76..a837f76 100644
--- a/res/res/img/placeholder.jpg
+++ b/res/resources/images/placeholder.jpg
Binary files differ
diff --git a/res/res/img/placeholder.svg b/res/resources/images/placeholder.svg
index 679edec..679edec 100644
--- a/res/res/img/placeholder.svg
+++ b/res/resources/images/placeholder.svg
diff --git a/src/esieequest/Main.java b/src/esieequest/Main.java
index f8b013f..c755741 100755
--- a/src/esieequest/Main.java
+++ b/src/esieequest/Main.java
@@ -5,12 +5,12 @@ import java.util.List;
5 5
6import javax.swing.JApplet; 6import javax.swing.JApplet;
7 7
8import esieequest.controller.GameEngine; 8import esieequest.engine.GameEngine;
9import esieequest.view.Viewable; 9import esieequest.ui.Viewable;
10import esieequest.view.app.Applet; 10import esieequest.ui.