John and alex

.gitignore

@@ -2,70 +2,13 @@
 /src/view/#AvatarCreationView.java#
 /src/view/.#AvatarCreationView.java
 /.classpath
-<<<<<<< HEAD
-/.project
-/build.xml
-/src/.classpath
-/src/.gitignore
-/src/.project
-/src/controller/.gitignore
-/src/model/.gitignore
-/src/view/.gitignore
-/.metadata/
-/src/.metadata/
-/src/Main.class
-/src/controller/Avatar.class
-/src/controller/AvatarController.class
-/src/controller/DrawableThing.class
-/src/controller/Entity.class
-/src/controller/Item.class
-/src/controller/Occupation.class
-/src/controller/Smasher.class
-/src/controller/Sneak.class
-/src/controller/StatsPack.class
-/src/controller/Summoner.class
-/src/controller/Terrain.class
-/src/model/Map.class
-/src/model/MapAvatar_Association.class
-/src/model/MapDisplay_Association.class
-/src/model/MapDrawableThing_Association.class
-/src/model/MapEntity_Association.class
-/src/model/MapItem_Association.class
-/src/model/MapMain_Association.class
-/src/model/MapTerrain_Association.class
-/src/model/MapTile.class
-/src/view/AvatarCreationView.class
-/src/view/Display.class
-/src/view/MapView.class
-/src/view/StatsView.class
-/src/view/Viewport.class
-/.settings/
-/src/controller/Terrain$Color.class
-/src/view/TestingMain.class
-/src/view/ViewPortTester.class
-/src/view/#Viewport.java#
-/src/view/ASCIIART/smasher.txt~
-/src/view/ASCIIART/sneaker.txt~
-
-/src/Vector2.class
-/src/model/MapAvatar_Relation.class
-/src/model/MapDisplay_Relation.class
-/src/model/MapDrawableThing_Relation.class
-/src/model/MapEntity_Relation.class
-/src/model/MapItem_Relation.class
-/src/model/MapMain_Relation.class
-/src/model/MapTerrain_Relation.class
-/src/src/Main.class
-/.gitignore
-=======
 /.metadata/
 /.project
 /.settings/
 /src/.classpath
 /src/.project
 /src/.settings/
 /src/src/Main.class
->>>>>>> master
 /src/src/Vector2.class
 /src/src/controller/Avatar.class
 /src/src/controller/AvatarController.class
@@ -95,3 +38,132 @@
 /src/src/view/Viewport.class
 /src/src/view/TestingMain.class
 /src/src/view/ViewPortTester.class
+/#viewinfo.org#
+/.#viewinfo.org
+/viewinfo.org
+/bin/
+/IDEA/out/
+/IDEA/source/
+/IDEA/*.sav
+/IDEA/*.log
+/IDEA/*.xml
+/IDEA/*.key
+/build.xml
+/src/src/Main$ProgramOpts.class
+/src/src/SavedGame.class
+/src/src/Testing$TT.class
+/src/src/Testing.class
+/src/src/test.class
+/src/MapPersonAtKeyboard_Relation.class
+/src/src/AreaFunctor.class
+/src/src/model/MapDrawableThing_Relation$AreaDamager.class
+/src/src/model/MapDrawableThing_Relation$AreaHealer.class
+/src/src/model/MapDrawableThing_Relation$AreaKiller.class
+/src/src/model/MapDrawableThing_Relation$AreaLeveler.class
+/Documentation.org~
+/Documentation.tex
+/Documentation.tex~
+/src/150214_1.sav
+/auto/
+/src/src/controller/DrawableThingStatsPack.class
+/src/src/controller/EntityStatsPack.class
+/src/src/SaveData.class
+<<<<<<< HEAD
+/src/src/controller/Avatar.java~
+/src/bin/NineteenCharacters.jar
+/.nfs00000000005b9364000002cb
+/src/jar-in-jar-loader.zip
+/src/.nfs00000000005b9ec70000057a
+/src/src/controller/AreaEffectItem$Effect.class
+/src/src/controller/AreaEffectItem.class
+/src/bin/src/AreaFunctor.class
+/src/bin/src/JohnsTest.class
+/src/bin/src/Main$1.class
+/src/bin/src/Main$ProgramOpts.class
+/src/bin/src/Main.class
+/src/bin/src/Repeatable.class
+/src/bin/src/SaveData.class
+/src/bin/src/SavedGame.class
+/src/bin/src/Testing.class
+/src/bin/src/Vector2.class
+/src/bin/src/controller/AreaEffectItem$1.class
+/src/bin/src/controller/AreaEffectItem$Effect.class
+/src/bin/src/controller/AreaEffectItem.class
+/src/bin/src/controller/Avatar.class
+/src/bin/src/controller/AvatarController.class
+/src/bin/src/controller/DrawableThing.class
+/src/bin/src/controller/DrawableThingStatsPack.class
+/src/bin/src/controller/Entity.class
+/src/bin/src/controller/EntityStatsPack.class
+/src/bin/src/controller/Item.class
+/src/bin/src/controller/Occupation.class
+/src/bin/src/controller/Smasher.class
+/src/bin/src/controller/Sneak.class
+/src/bin/src/controller/Summoner.class
+/src/bin/src/controller/Terrain$Color.class
+/src/bin/src/controller/Terrain.class
+/src/bin/src/model/Map.class
+/src/bin/src/model/MapAvatar_Relation.class
+/src/bin/src/model/MapDisplay_Relation.class
+/src/bin/src/model/MapDrawableThing_Relation$AreaDamager.class
+/src/bin/src/model/MapDrawableThing_Relation$AreaHealer.class
+/src/bin/src/model/MapDrawableThing_Relation$AreaKiller.class
+/src/bin/src/model/MapDrawableThing_Relation$AreaLeveler.class
+/src/bin/src/model/MapDrawableThing_Relation.class
+/src/bin/src/model/MapEntity_Relation.class
+/src/bin/src/model/MapItem_Relation.class
+/src/bin/src/model/MapMain_Relation.class
+/src/bin/src/model/MapTerrain_Relation.class
+/src/bin/src/model/MapTile.class
+/src/bin/src/test.class
+/src/bin/src/view/AvatarCreationView.class
+/src/bin/src/view/Display.class
+/src/bin/src/view/MapView.class
+/src/bin/src/view/StatsView.class
+/src/bin/src/view/TestingMain.class
+/src/bin/src/view/ViewPortTester.class
+/src/bin/src/view/Viewport.class
+/src/buildtet.xml
+/COP 4331 2015 Iteration 1 Nineteen_Characters~
+/instructions.txt~
+/src/src/JohnsTest.class
+/src/src/Repeatable.class
+/src/src/RunGame$ProgramOpts.class
+/src/src/RunGame.class
+/src/src/model/MapViewable.class
+<<<<<<< HEAD
+/src/src/entityThings/Avatar.class
+/src/src/entityThings/Avatar.class
+/src/src/userIO/TestingMain.class
+/src/src/model/IO_Package.class
+/src/src/userIO/TestingMain.class
+/src/src/userIO/TestingMain.class
+/src/src/entityThings/AreaEffectItem.class
+/src/src/entityThings/Avatar.java
+/src/src/entityThings/AvatarController.class
+/src/src/entityThings/DrawableThing.class
+/src/src/entityThings/DrawableThingStatsPack.class
+/src/src/entityThings/Entity.class
+/src/src/entityThings/EntityStatsPack.class
+/src/src/entityThings/Item.class
+/src/src/entityThings/Terrain$Color.class
+/src/src/entityThings/Terrain.class
+>>>>>>> 7d4062c930faf8d27e612a1fb901bd1004193e7b
+/src/src/userIO/TestingMain.class
+/src/src/entityThings/Avatar.class
+*.class
+/src/NineteenCharacters.jar
+/src/src/#IO_Bundle.java#
+/src/150310_1.xml
+/src/src/#Function.java#
+/src/src/#Repeatable.java#
+/src/src/GPATH
+/src/src/GRTAGS
+/src/src/GSYMS
+/src/src/GTAGS
+/src/src/io/controller/#MapEditorController.java#
+/src/src/io/controller/.#MapEditorController.java
+/src/.attach_pid30603
+/src/150315_1.xml
+/src/150315_2.xml
+/src/150315_3.xml

COP 4331 2015 Iteration 1 NineteenCharacters!

@@ -0,0 +1 @@
+CD apparently have label name limit

Documentation.org

@@ -0,0 +1,101 @@
+#+AUTHOR: Nineteen_Characters!
+* Font : This game works best with the following font
+Deja Vu monospace regular font
+* Running 
+Add any command line arguments to attempt to load a game.
+# * Running 
+# java -jar game.jar [-d [LEVEL]][-e FILE] [-l  FILE]
+
+# 	-d [LEVEL], --debug [LEVEL]
+# 		Activates debug mode, where debug outputs are sent to the error stream. Error stream may 
+# 		be redirected, as per the --err-out option. LEVEL is an integer number representing the level of 
+# 		detail requested in the debug output. If no value is specified, the default is level 1.
+
+# 	-e FILE, --err-out FILE
+# 		Redirects STDERR messages to the given file
+
+# 	-l FILE, --load FILE
+# 		Immediately attempts to load the given file as a saved game. If the game cannot be loaded, 
+# 		a new game is started instead.
+
+* Loading a game
+After having saved a game, to load it back in, simply start the game, supplying the path to the file as a parameter. 
+#+BEGIN_SRC 
+--load file
+#+END_SRC
+* Controls
+** While the Character Creation Screen is visible
+- Hit S to create an avatar of type Smasher
+- Hit W for an avatar of type Summoner(W for WIZARD)
+- Hit C for an avatar of type Sneaker(C for CAT)
+#+CAPTION: The Characters available for selection
+#+BEGIN_SRC 
+╔══════════════════════════════════════════════════════════════════════════════╗
+║      ____ _                               _       ____ _                     ║
+║     / ___| |__   ___   ___  ___  ___     / \     / ___| | __ _ ___ ___       ║
+║    | |   | '_ \ / _ \ / _ \/ __|/ _ \   / _ \   | |   | |/ _` / __/ __|      ║
+║    | |___| | | | (_) | (_) \__ \  __/  / ___ \  | |___| | (_| \__ \__ \      ║
+║     \____|_| |_|\___/ \___/|___/\___| /_/   \_\  \____|_|\__,_|___/___/      ║
+║                                                                              ║
+║                                                                              ║
+║                                                                              ║
+║                                                                              ║
+║S to Select a Smasher:                                                        ║
+║         -[.]                                                                 ║
+║         -|.|                                                                 ║
+║         -|.|                                                                 ║
+║         -|.|                                                                 ║
+║         -|.|                                                                 ║
+║         -|.|   ,'`.                                                          ║
+║         -|.|  ;\  /:                  W to Select a Summoner:                ║
+║         -|.| /  \/  \                               _,._                     ║
+║         -|.|<.<_\/_>,>                  .||,       /_ _\\                    ║
+║         -|.| \`.::,'/                  \.`',/      |'L'| |                   ║
+║         -|.|,'.'||'/.                  = ,. =      | -,| L                   ║
+║       ,-'|.|.`.____,'`.                / || \    ,-'\"/,'`.                  ║
+║     ,' .`|.| `.____,;/ \                 ||     ,'   `,,. `.                 ║
+║    ,'=-.`|.|\ .   \ |,':                 ,|____,' , ,;' \| |                 ║
+║   /_   :)|.|.`.___:,:,'|.               (3|\    _/|/'   _| |                 ║
+║  (  `-:;\|.|.`.)  |.`-':,\               ||/,-''  | >-'' _,\\                ║
+║  /.   /  ;.:--'   |    | ,`.             ||'      ==\ ,-'  ,'                ║
+║ / _>-'._.'-'.     |.   |' / )._                                              ║
+║:.'    ((.__;/     |    |._ /__ `.___                                         ║
+║`.>._.-' |)=(      |.   ;  '--.._,`-.`.                                       ║
+║         ',--'`-._ | _,:          `='`'                                       ║
+║                         _                ___       _.--.                     ║
+║C to Select a Sneaker:   \`.|\..----...-'`   `-._.-'_.-'`                     ║
+║                         /  ' `         ,       __.--'                        ║
+║                         )/' _/     \   `-_,   /                              ║
+║                         `-'" `"\_  ,_.-;_.-\_ ',                             ║
+║                             _.-'_./   {_.'   ; /                             ║
+║                            {_.-``-'         {_/                              ║
+╚══════════════════════════════════════════════════════════════════════════════╝
+#+END_SRC
+
+** While the map is visible
+*** Items
+- Hit p pick up
+- Hit E to equip item
+- Hit U to unequip
+- Hit D to drop 
+*** View Switching
+- Hit i to open the stats and inventory screen
+
+*** Movement
+#+BEGIN_SRC 
+NW   N   NE
+  \  |  /
+   7 8 9
+ W-4   6-E
+   1 2 3
+  /  |  \
+SW   S   SE
+#+END_SRC
+*** Save Game
+- Hit S
+- A Save File will be created
+- There is one save file, named save.dave
+# - Format : yyMMdd_<number>.sav
+** In the Inventory screen
+*** View Switching
+Hit i to return to the map