More DM Polish

config.json

@@ -1,26 +1,26 @@
 {
-  "game": {
-    "maze": {
-      "directory": "maps",
-      "procedural": true,
-      "maze_file": "test/itemRoom.maze"
+    "game": {
+      "maze": {
+        "directory": "maps",
+        "procedural": true,
+        "maze_file": "test/itemRoom.maze"
+      }
+    },
+    "network": {
+        "server_ip": "localhost",
+        "server_port": 2355
+    },
+    "server": {
+        "lobby_name": "Hope you're doing well!1",
+        "lobby_broadcast": true,
+        "max_players": 1,
+        "disable_dm": false
+    },
+    "client": {
+        "default_name": "Conan O'Brien",
+        "lobby_discovery": true,
+        "fullscreen": false,
+        "draw_bboxes": false,
+        "fps_counter": true
     }
-  },
-  "network": {
-    "server_ip": "localhost",
-    "server_port": 2355
-  },
-  "server": {
-    "lobby_name": "Hope you're doing well!1",
-    "lobby_broadcast": true,
-    "max_players": 1,
-    "disable_dm": true
-  },
-  "client": {
-    "default_name": "Conan O'Brien",
-    "lobby_discovery": true,
-    "fullscreen": true,
-    "draw_bboxes": false,
-    "fps_counter": true
-  }
 }

include/client/camera.hpp

@@ -89,6 +89,8 @@ class Camera {
 
     glm::mat4 getView();
 
+    void setPitch(float pitch);
+
 protected:
     // Perspective controls
     float FOV;       // Field of View Angle (degrees)

include/client/client.hpp

@@ -117,6 +117,13 @@ class Client {
      */
     void mouseCallback(GLFWwindow* window, double xposIn, double yposIn);
 
+    /**
+     * @brief Callback which handles scrolling movement. 
+     *
+     * @param window The GLFWwindow being monitered.
+     * @param xposIn The current scroll up value.
+     * @param yposIn The current scroll down value.
+     */
     void scrollCallback(GLFWwindow* window, double xposIn, double yposIn);
 
     /**
@@ -166,11 +173,28 @@ class Client {
      */
     bool connect(std::string ip_addr);
 
+    /**
+     * @brief get the reference to the Audio manager
+     */
     AudioManager* getAudioManager();
+
+    /**
+     * @brief get the reference to the Animation manager
+     */
     AnimationManager* getAnimManager() { return animManager; }
 
+    /**
+     * @brief the current position in the world the player is looking at
+     */
     void setWorldPos();
 
+    /**
+     * @brief Send down a trap event to the server 
+     * 
+     * @param hover boolean to indicate the DM is only hovering and has not placed yet
+     * @param place boolean to indicate the DM would like to place a type
+     * @param trapType ModelType to indicate the type of the trap the DM wants to place
+     */
     void sendTrapEvent(bool hover, bool place, ModelType trapType);
 
     int curr_fps;
@@ -282,7 +306,11 @@ class Client {
      */
     RadioButtonState roleSelection;
 
+    /**
+     * @brief Audio Manager to play Client sounds
+     */
     AudioManager* audioManager;
+
     AnimationManager* animManager;
 
     /* Camera object representing player's current position & orientation */
@@ -301,12 +329,15 @@ class Client {
     bool is_held_left = false;
     bool is_held_space = false;
 
+    /* DM zooming in and out flags */
     bool is_held_i = false;
     bool is_held_o = false;
 
-    bool is_pressed_p = false;
-
     bool is_left_mouse_down = false;
+    bool is_right_mouse_down = false;
+
+    /* DM Trap Orientation Traps With Directions */
+    int orientation = 0;
 
     /* Mouse position coordinates */
     float mouse_xpos = 0.0f;
@@ -328,6 +359,9 @@ class Client {
 
     std::deque<Event> events_received;
 
+    /**
+     * @brief boolean to see if a phase change from LOBBY to GAME already happened
+     */
     bool phase_change;
 };
 

include/client/gui/gui.hpp

@@ -129,8 +129,12 @@ class GUI {
      * is down. Note: this is a reference so that if a click is captured it can toggle the
      * mouse down flag to false, so that click doesn't get "double counted" in subsequent
      * frames.
+     * @param is_right_mouse_down reference to flag which stores whether or not the right mouse
+     * is down. Note: this is a reference so that if a click is captured it can toggle the
+     * mouse down flag to false, so that click doesn't get "double counted" in subsequent
+     * frames.
      */
-    void handleInputs(float mouse_xpos, float mouse_ypos, bool& is_left_mouse_down);
+    void handleInputs(float mouse_xpos, float mouse_ypos, bool& is_left_mouse_down, bool& is_right_mouse_down);
     /**
      * Renders the current state of the GUI to the screen, based on all of the widgets
      * that have been added and any changes caused by inputs.

include/client/gui/img/img.hpp

@@ -37,6 +37,7 @@ enum class ImgID {
     DMRightHotbar,
     DMMiddleHotbar,
     DMMiddleSelected,
+    DMMiddleCooldown,
     HealthBar,
     HealthTickEmpty,
     HealthTickFull,
@@ -58,8 +59,13 @@ enum class ImgID {
     Lightning,
     ArrowTrap,
     SpikeTrap,
+    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,
     Blank,
 };
+
+// Sorry for whoever has to look at this :) - ted
 #define GET_ALL_IMG_IDS() \
     { ImgID::Yoshi, ImgID::AwesomeSauce, ImgID::HealthPotion, ImgID::UnknownPotion, \
         ImgID::InvisPotion, ImgID::FireSpell, ImgID::HealSpell, ImgID::Orb, \
@@ -71,9 +77,15 @@ enum class ImgID {
         ImgID::Compass0, ImgID::Compass30, ImgID::Compass60, ImgID::Compass90, \
         ImgID::Compass120, ImgID::Compass150, ImgID::Compass180, ImgID::Compass210, \
         ImgID::Compass240, ImgID::Compass270, ImgID::Compass300, ImgID::Compass330, \
-        ImgID::DMLeftHotbar, ImgID::DMRightHotbar, ImgID::DMMiddleHotbar, ImgID::DMMiddleSelected, \
         ImgID::FloorSpikeTrap, ImgID::Sungod, ImgID::Teleporter, ImgID::Lightning, \
         ImgID::ArrowTrap, ImgID::SpikeTrap, \
+        ImgID::DMTrapBG, ImgID::Needle, \
+        ImgID::EventBG, ImgID::DMEventBG, \
+        ImgID::DMLeftHotbar, ImgID::DMRightHotbar, ImgID::DMMiddleHotbar, ImgID::DMMiddleSelected, ImgID::DMMiddleCooldown, \
+        ImgID::DMCD_10, ImgID::DMCD_9, ImgID::DMCD_8, ImgID::DMCD_7, ImgID::DMCD_6, \
+        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, \
     }
 
 /**

include/server/game/constants.hpp

@@ -87,4 +87,6 @@
 #define MAX_TRAPS 10
 #define TRAP_INVENTORY_SIZE 10
 #define TRAP_TIME 10
-#define TRAP_COOL_DOWN 5
+#define TRAP_COOL_DOWN 5
+#define ITEM_SPAWN_PROB	0.3
+#define ITEM_SPAWN_BOUND 3

include/server/game/servergamestate.hpp

@@ -339,9 +339,9 @@ class ServerGameState {
 	 */
 	std::unordered_set<std::pair<Object*, Object*>, pair_hash> collidedObjects;
 
-
-	std::unordered_map<std::pair<int, int>, std::vector<SolidSurface*>, IntPairHash> solidSurfaceInGridCells;
-
+	/**
+	 * @brief Field that stores the current trap the DM is hovering (not placed yet)
+	 */
 	Trap* currentGhostTrap;
 
 	/**

include/server/game/spawner.hpp

@@ -20,6 +20,8 @@ class Spawner {
 public:
     Item* dummyItem;
 
+    Item* smallDummyItem;
+
     Spawner();
 
     /*
@@ -54,6 +56,12 @@ class Spawner {
     void spawnDummy(ServerGameState& state);
 
 
+    /*
+     * Smaller dummy for empty check
+     */
+    void spawnSmallDummy(ServerGameState& state);
+
+
 private:
     int enemyValueCap;
     int currentEnemyValue;

include/shared/game/sharedmodel.hpp

@@ -25,10 +25,15 @@ enum class ModelType {
 	ArrowTrapLeft,
 	ArrowTrapRight,
 	SpikeTrap,
-	SunGod,
 	TeleporterTrap,
 	Dagger,
 	Sword,
 	Hammer,
-	Lightning
+	Lightning,
+	FireballTrapLeft,
+	FireballTrapRight,
+	FireballTrapUp,
+	FireballTrapDown,
+	SunGod,
+	ArrowTrap
 };

include/shared/game/sharedobject.hpp

@@ -126,10 +126,11 @@ struct SharedTrapInventory {
 	int inventory_size;
 	std::vector<ModelType> inventory;
 	std::unordered_map<CellType, std::time_t> trapsInCooldown;
+	std::unordered_map<CellType, int> trapsCooldown;
 	int trapsPlaced;
 
 	DEF_SERIALIZE(Archive& ar, const unsigned int version) {
-		ar& selected& inventory_size& inventory& trapsInCooldown& trapsPlaced;
+		ar& selected& inventory_size& inventory& trapsInCooldown& trapsPlaced & trapsCooldown;
 	}
 };
 

src/client/camera.cpp

@@ -97,6 +97,10 @@ void Camera::updatePos(glm::vec3 pos) {
     cameraPos = pos;
 }
 
+void Camera::setPitch(float pitch) {
+    this->pitch = pitch;
+}
+
 DungeonMasterCamera::DungeonMasterCamera() : Camera() {
     pitch = -89.0f;
     this->farClip = 500.0f;
@@ -148,4 +152,5 @@ void DungeonMasterCamera::update(float xpos, float ypos) {
     this->view = glm::lookAt(cameraPos, cameraPos + cameraFront, cameraUp);
 
     viewProjMat = this->projection * this->view;
-}
+}
+