Code Review Pull Request

.exe.spec

@@ -0,0 +1,33 @@
+# -*- mode: python -*-
+
+block_cipher = None
+
+
+a = Analysis(['.exe', 'driver.py'],
+             pathex=['/home/jkunimune/DungeonCrawler'],
+             binaries=None,
+             datas=None,
+             hiddenimports=[],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=True,
+          name='.exe',
+          debug=False,
+          strip=False,
+          upx=True,
+          console=True )
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=False,
+               upx=True,
+               name='.exe')

README.md

@@ -1,2 +1,57 @@
-# DungeonCrawler
-Our final project for Software Design!
+DungeonCrawler
+=======  
+[abuchele.github.io/DungeonCrawler](abuchele.github.io/DungeonCrawler)
+
+You wake up in a dark stone room. You can't remember who you are or where you came from. All you know is that you're here to save a friend. You stand and examine the dimly-lit room. It looks like a dungeon. And the doors are pretty low. Looks like you'll have to become a Dungeon Crawler!  
+_by Anna Buchele, Justin Kunimune, Leon Lam, and Max Wei_
+
+### Install and Play:  
+  Start by downloading the github repository. Once you open it, you will have two options to play.
+
+  For best results, you will need pygame, pickle, and Python 2.7 to play this game. If you do not have pygame or pickle, use  
+  `$ sudo apt-get install pygame pickle`  
+  If you don't have Python 2.7, go to [python.org](https://www.python.org/downloads/) and download it.  
+  Once everything is installed, simply direct yourself to the directory of the repository and run `driver.py` using Python or BASH.  
+  Ex:  
+    `$ cd ~/Downloads/DungeonCrawler-master`  
+    `$ python driver.py`
+
+  Alternatively, you can open the `DungeonCrawlerCompiled.zip` archive and run the `\_ADungeonCrawler\_` executable. It will be slightly more taxing on your CPU, but you won't need to install anything.
+
+### Controls:   
+  When you start the game it will prompt you to continue from where you left off or start over. Respond by simply pressing 'y' or 'n'. If it is your first time playing, press 'n'.
+
+  Once you enter the game, controls are as follows:  
+  W - Move up
+  A - Move left
+  S - Move down
+  D - Move right
+  E - Interact
+  R - Attack
+  TAB - Equip next song
+  LSHIFT - Equip previous song
+  ESC - Pause
+  G - Fire gun (you only have one bullet; use it wisely)
+
+### Usage Rights:  
+MIT License
+
+Copyright (c) 2016 Buchimunelawei
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

TR1/framing.md

@@ -0,0 +1,22 @@
+Anna Buchele, Justin Kunimune, Leon Lam, and Max Wei present:
+
+Technical Review 1: Project Orpheus
+Dungeon Crawler: Preparation and Framing
+
+Background and Context
+Project headline: Dungeon Crawler
+The MVP for our final project is a simple roguelike game in which the player must explore a series of underground regions in order to save a friend. The adventure will be based on Greek Mythology. We also plan on implementing side-quests, NPCs, combat, stealth, fog of war, bosses, and a save system.
+Max and Leon worked on a dungeon crawler in the last project, so we are iterating on that and making it into a real game. We will include several different levels and terrains, as well as combat systems and a variety of monsters and bosses. We also hope to include background music, sprites, and side-quests.
+
+Key questions
+- What do you think of our game ideas? 
+- Is there anything we’re doing or planning on doing that is obviously a bad idea?
+- What combat system should we use? 
+- Should the game be in real-time, or turn-based?
+- Is our story compelling?
+- Which dungeon generation algorithms do you like best?
+
+Agenda
+- Introduction, background and explanation of our game ideas and story (5 minutes)
+- Show-and-tell of what we have so far (12 minutes)
+- Explanation of our questions, and receiving advice (8 minutes)

TR2/reflection-and-synthesis.md

@@ -0,0 +1,17 @@
+# Reflection and Synthesis
+## Feedback and Decisions
+The best information we got during this technical review was the feedback on our motion system. Playtesters (specifically Matt) noted that the movement was  
+* too slow,
+* did not render keys being held down properly,
+* and did not always do what was expected.
+
+We can incorporate this by tweaking the movement system to be more intuitive and smoother.
+
+One of the other game groups also gave us some useful advice about pygame.clock, which could help us to manage the speed of our game if it becomes an issue. We will look into it and see how it can be implemented.
+
+The other main piece of feedback we got was the general approval of our idea to use a guitar as a weapon, which will help us design dialogue and sprites moving forward.
+
+Other than that, the feedback was generally positive, which means we are probably doing something right and will continue on our general trajectory.
+
+## Review Process Reflection
+The review itself went quite smoothly. There was a bit of difficulty playing on one computer that did not have scipy (that import was actually vestigial, so that error was a helpful reminder to delete it), but other than that, we were able to get it running on everyone's computer and watch their reactions to the game. It helped us to gague the speed of the game and how people in the game behave with relatively little effort on our part. It was also very flexible time-wise which made it easy to stay on schedule. It seems that playtesting once a game is mostly playable is, in fact, a viable technical review method.

TerrainGeneration.py

@@ -0,0 +1,11 @@
+from coreMechanics import Dungeon
+from time import sleep
+import pickle
+
+
+method = "whole"
+test = Dungeon(120, 120, method=method)
+print test
+f = open("saves/pregeneratedDungeon.dun", 'w')
+pickle.dump(test, f)
+f.close()

_ADungeonCrawler_.py

@@ -0,0 +1,65 @@
+#!/usr/bin/python
+
+
+import time
+import pygame
+import pickle
+from pygame.locals import QUIT, KEYDOWN, MOUSEMOTION
+
+from dungeonGraphics import DungeonModelView
+from interfaceClasses import PyGameKeyboardController
+import coreMechanics
+import pickle
+
+
+
+def loadDungeon():
+    return coreMechanics.load("saves/last_save.dun")
+
+
+
+if __name__ == '__main__':
+    pygame.init()
+    screenX = 1080
+    screenY = 720
+    size = (screenX, screenY)
+    delay = 0.15 #length of each tick
+
+    screen = pygame.display.set_mode(size)
+    screen.blit(pygame.image.load("HUD_sprites/Opening.png"),(0,0)) # the opening screen
+    pygame.display.update()
+
+    running = False
+    while not running:  # start by determining where to load the dungeon from
+        for event in pygame.event.get():
+            if event.type == pygame.locals.KEYDOWN:
+                if event.key == pygame.K_y:     # last save,
+                    model = loadDungeon()
+                    running = True
+                elif event.key == pygame.K_n:
+                    model = coreMechanics.Dungeon(120, 120, method="whole")
+                    running = True                  # or brand new one?
+
+    model.terminal = False  # makes this happen without the terminal
+
+    view = DungeonModelView(model, screen, size)
+    controller = PyGameKeyboardController(model)
+    events = []
+    view.update()   # then jump into the main loop
+    while running:
+        start_time = time.time()                        # start the timer
+        end_time = start_time+delay
+
+        running = controller.handle_all_events(events)  # update all objects
+        model.update()
+        view.update()
+
+        if controller.reset:                            # reset to last save if necessary
+            model = loadDungeon()
+            controller.setModel(model)
+            view.setModel(model)
+
+        events = [] # I know what you're thinking: "What is this convoluted events variable? pygame does all that automatically. This variable should be entirely unnecessary to make the game function properly." to which I respond, "Yes, it should."
+        while time.time() < end_time: #after each update is called, this while loop runs for (delay) seconds before the next update can happen
+            events = events+pygame.event.get()
+            view.display((time.time()-start_time)/delay)

_ADungeonCrawler_.spec

@@ -0,0 +1,33 @@
+# -*- mode: python -*-
+
+block_cipher = None
+
+
+a = Analysis(['_ADungeonCrawler_.py'],
+             pathex=['/home/jkunimune/DungeonCrawler'],
+             binaries=None,
+             datas=None,
+             hiddenimports=[],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=True,
+          name='_ADungeonCrawler_',
+          debug=False,
+          strip=False,
+          upx=True,
+          console=True )
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=False,
+               upx=True,
+               name='_ADungeonCrawler_')