merge w/ dev

config.json

@@ -2,7 +2,7 @@
     "game": {
         "maze": {
             "directory": "maps",
-            "procedural": true,
+            "procedural": false,
             "maze_file": "test/itemRoom.maze"
         }
     },
@@ -20,8 +20,9 @@
     "client": {
         "default_name": "Conan O'Brien",
         "lobby_discovery": true,
-        "fullscreen": false,
+        "fullscreen": true,
         "draw_bboxes": false,
-        "fps_counter": true
+        "fps_counter": true,
+        "presentation": true
     }
 }

include/client/gui/img/img.hpp

@@ -63,6 +63,16 @@ enum class ImgID {
     DMCD_10, DMCD_9, DMCD_8, DMCD_7, DMCD_6, DMCD_5, DMCD_4, DMCD_3, DMCD_2, DMCD_1, 
     DMCD_Selected_10, DMCD_Selected_9, DMCD_Selected_8, DMCD_Selected_7, DMCD_Selected_6, 
     DMCD_Selected_5, DMCD_Selected_4, DMCD_Selected_3, DMCD_Selected_2, DMCD_Selected_1,
+    Skull, 
+    DestroyedSkull,
+    SkullBG,
+    HelpBG,
+    HelpDMBG,
+    ExitBG,
+    ExitDMBG,
+    LobbyButton,
+    Victory,
+    Defeat,
     Blank,
 };
 
@@ -87,6 +97,8 @@ enum class ImgID {
         ImgID::DMCD_5, ImgID::DMCD_4, ImgID::DMCD_3, ImgID::DMCD_2, ImgID::DMCD_1, \
         ImgID::DMCD_Selected_10, ImgID::DMCD_Selected_9, ImgID::DMCD_Selected_8, ImgID::DMCD_Selected_7, ImgID::DMCD_Selected_6, \
         ImgID::DMCD_Selected_5, ImgID::DMCD_Selected_4, ImgID::DMCD_Selected_3, ImgID::DMCD_Selected_2, ImgID::DMCD_Selected_1, \
+        ImgID::Skull, ImgID::DestroyedSkull, ImgID::SkullBG, ImgID::HelpBG, ImgID::HelpDMBG, \
+        ImgID::ExitBG, ImgID::ExitDMBG, ImgID::LobbyButton, ImgID::Victory, ImgID::Defeat, \
     }
 
 /**

include/server/game/constants.hpp

@@ -4,16 +4,9 @@
 #include <glm/gtx/string_cast.hpp>
 #include <vector>
 
-#define NUM_PLAYERS 4
-#define MAX_ENTITIES 1000
-#define MAX_COMPONENTS 32
-#define MAX_WALLS 1000
-#define MAX_TRAPS 10
-#define MAX_SPELLS 4
-
-
 /* ServerGameState Constants */
 #define MAX_ENEMY_VALUE			500
+#define NUM_PLAYERS 4
 
 /*	Maze Constants */
 #define	MAX_MAZE_COLUMNS		10000
@@ -98,7 +91,7 @@
 
 /* DM Constants */
 #define MAX_TRAPS 10
-#define TRAP_INVENTORY_SIZE 10
+#define TRAP_INVENTORY_SIZE 6
 #define TRAP_TIME 10
 #define TRAP_COOL_DOWN 5
 #define ITEM_SPAWN_PROB	0.1

include/server/game/servergamestate.hpp

@@ -371,11 +371,15 @@ class ServerGameState {
      * cell
      * @param cell is a single cell of the maze's grid where a wall + torch
      * should be placed
+	 * @param orb_pos position of the orb so that we can calculate the distance
+	 * for coloring purposes
+	 * @param exit_pos position of the exit so that we can calculate the distance
+	 * for coloring purposes
      * @param cellType determines which direction the torch should face. 
      * This means that only TorchUp, TorchDown, TorchRight, and TorchLeft
      * are acceptable values of cellType 
      */
-    void spawnTorch(GridCell *cell);
+    void spawnTorch(GridCell *cell, glm::vec3 orb_pos, glm::vec3 exit_pos);
 
     /**
      * @brief helper function to spawn a fireball trap 

include/server/game/torchlight.hpp

@@ -35,8 +35,10 @@ class Torchlight : public Object {
 	/**
      * Creates a torchight with default lighting properties.
 	 * @param corner Corner position of the surface
+     * @param dist_orb distance to orb, to see if it should be shaded blue
+     * @param dist_exit distance to the exit, to see if it should be shaded white
 	 */
-	explicit Torchlight(glm::vec3 corner);
+	explicit Torchlight(glm::vec3 corner, float dist_orb, float dist_exit);
 
 	/**
 	 * @param corner Corner position of the surface

include/shared/utilities/config.hpp

@@ -62,6 +62,7 @@ struct GameConfig {
         bool fullscreen;
         bool draw_bboxes;
         bool fps_counter;
+        bool presentation;
     } client;
 
     /**