Merge remote-tracking branch 'group_8/main' into development

MSU-CSE491 · Dec 7, 2023 · 4e30d72 · 4e30d72
2 parents 7a413cd + 3faa1c4
commit 4e30d72
Show file tree

Hide file tree

Showing 12 changed files with 493 additions and 296 deletions.
diff --git a/assets/grids/team8_grid_large.grid b/assets/grids/team8_grid_large.grid
@@ -1,5 +1,5 @@
-^^^      ^^^~~     ^^^^^^^^^^^^^^           ^^^^^^
-^         ^^~~     ^^^^^^^^^^^^^^^^^^^       ^^^^^
+^^^      ^^^~~     ^^^^^^^^^^^^^^}          ^^^^^^
+^  }      ^^~~     ^^^^^^^^^^^^^^^^^^^       ^^^^^
    ^^^     ~~~     ^^^^^^^^^^^^^                  
   ^^^^^    ~~^         ^^^^^                    ^^
   ^^^^    ~~~^^^         ^     ^^              ^^^
@@ -8,13 +8,13 @@
 ^     ~~~^^^^^^^^^       ^^^^^^^^^^       ^^^^^^^^
 ^   ^^~~              ^^^^^^^^^^^^         ^^^^^^^
 ^  ^^^~~      ^^^     ^^^^^^^        ^^^      ^^^^
-^   ^^^~~~^^^^^^^^^              ^^^^^^^^^^^^~~~~~
+^ { ^^^~~~^^^^^^^^^              ^^^^^^^^^^^^~~~~~
 ^^  ^^^^~~~~^^^^^^^^^^       ^^^^^^^^^^^^^~~~~~~~~
 ^^^   ^   ~~~~~^^^^^^^^^   ^^^^^^^^^~~~~~~~~~^^^^^
 ^^^        ^^~~~~~~^^^^^  ^^^^^~~~~~~~^^^^^^^  ^^^
 ^     ^         ~~~~~~~~##~~~~~~~^^^^^^^^^^    ^^^
 ^^   ^^^^^           ~~~##~~~~^^^^^^^^^       ^^^^
 ^^  ^^^^^^^^^^                     ^^           ^^
-^    ^^^^^^^^^^^^^          ^^^          ^        
+^    ^^^^^^^^^^^^^          ^^^          ^  {     
 ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^^^^^       
 ^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        
diff --git a/assets/grids/team8_grid_v2.grid b/assets/grids/team8_grid_v2.grid
diff --git a/assets/walls/portal3,png.png → assets/walls/portal3.png b/assets/walls/portal3,png.png → assets/walls/portal3.png
diff --git a/source/Interfaces/MainInterface.cpp b/source/Interfaces/MainInterface.cpp
@@ -64,8 +64,9 @@ namespace i_2D {
             if (item_ptr->HasProperty("symbol")) {
                 c = item_ptr->GetProperty<char>("symbol");
             }
-            if(pos.CellX() >= 0 && pos.CellY() <= 0 && 
-                pos.CellX() < grid.GetWidth() && pos.CellY() < grid.GetHeight()){
+            if(pos.CellX() >= 0 && pos.CellY() >= 0 && 
+                pos.CellX() < grid.GetWidth() && pos.CellY() < grid.GetHeight() && 
+                !item_ptr->IsOwned()){
               symbol_grid[pos.CellY()][pos.CellX()] = c;
             }
         }
@@ -77,7 +78,9 @@ namespace i_2D {
             if (agent_ptr->HasProperty("symbol")) {
                 c = agent_ptr->GetProperty<char>("symbol");
             }
-            symbol_grid[pos.CellY()][pos.CellX()] = c;
+            if (!agent_ptr->HasProperty("deleted")){
+                symbol_grid[pos.CellY()][pos.CellX()] = c;
+            }
         }
         return symbol_grid;
     }
@@ -379,6 +382,33 @@ namespace i_2D {
             case sf::Keyboard::Right:
                 action_id = GetActionID("right");
                 break;
+            case sf::Keyboard::H:
+                action_id = GetActionID("heal");
+                break;
+            case sf::Keyboard::T:
+                action_id = GetActionID("stats");
+                break;
+            case sf::Keyboard::C:
+                action_id = GetActionID("use_axe");
+                break;
+            case sf::Keyboard::V:
+                action_id = GetActionID("use_boat");
+                break;
+            case sf::Keyboard::F:
+                action_id = GetActionID("attack");
+                break;
+            case sf::Keyboard::G:
+                action_id = GetActionID("special");
+                break;
+            case sf::Keyboard::B:
+                action_id = GetActionID("buff");
+                break;
+            case sf::Keyboard::R:
+                action_id = GetActionID("run");
+                break;
+            case sf::Keyboard::Y:
+                action_id = GetActionID("help");
+                break;
             default:
                 break; // The user pressed an unknown key.
         }
@@ -483,10 +513,10 @@ namespace i_2D {
             }
 
             // Check if the mouse is over specific menu items
-            if (mMenu.GetMenu()[4]->isMouseOver(mWindow) or (mGridWidth == mGridHeight and mGridWidth > ROW)){
-                mGridSizeLarge = true;
+            if (mMenu.GetMenu()[4]->isMouseOver(mWindow)){
+                SetLargeGrid(true);
             } else if (mMenu.GetMenu()[3]->isMouseOver(mWindow)) {
-                mGridSizeLarge = false;
+                SetLargeGrid(false);
             } else {
                 // Handle mouse button press for the general menu
                 mMenu.HandleMouseButtonPressed(mWindow);

diff --git a/source/Interfaces/MainInterface.hpp b/source/Interfaces/MainInterface.hpp
@@ -113,6 +113,8 @@ namespace i_2D {
 
         void ChooseTexture();
 
+        bool SetLargeGrid(bool b){ mGridSizeLarge = b; } 
+
         void Notify(const std::string & message,
                     const std::string & /*msg_type*/="none") override
         {

diff --git a/source/Interfaces/TextureHolder.cpp b/source/Interfaces/TextureHolder.cpp
@@ -111,6 +111,11 @@ namespace i_2D
         LoadTexture("pathTexture", "../assets/Ground_tiles/Sand1.png");
         LoadTexture("portal1Texture", "../assets/walls/portal1.png");
         LoadTexture("portal2Texture", "../assets/walls/portal2.png");
+        LoadTexture("portal3Texture", "../assets/walls/portal3.png");
+        LoadTexture("portal4Texture", "../assets/walls/portal4.png");
+        LoadTexture("healthTexture", "../assets/walls/teleport.png");
+        LoadTexture("rockTexture", "../assets/walls/gray_wall.png");
+        LoadTexture("swordTexture", "../assets/weapons/longsword.png");
         textures['P'] = GetTexture("axeTexture");
         textures['U'] = GetTexture("boatTexture");
         textures['#'] = GetTexture("wallTexture");
@@ -121,6 +126,11 @@ namespace i_2D
         textures[' '] = GetTexture("pathTexture");
         textures['{'] = GetTexture("portal1Texture");
         textures['}'] = GetTexture("portal2Texture");
+        textures['('] = GetTexture("portal3Texture");
+        textures[')'] = GetTexture("portal4Texture");
+        textures['j'] = GetTexture("healthTexture");
+        textures['t'] = GetTexture("swordTexture");
+        textures['$'] = GetTexture("rockTexture");
 
         return textures;
     }

diff --git a/source/Interfaces/TrashInterface.hpp b/source/Interfaces/TrashInterface.hpp
@@ -54,7 +54,7 @@ namespace cse491 {
         if(agent_ptr->HasProperty("symbol")){
           c = agent_ptr->GetProperty<char>("symbol");
         }
-        if (!agent_ptr->HasProperty("Deleted")){
+        if (!agent_ptr->HasProperty("deleted")){
           symbol_grid[pos.CellY()][pos.CellX()] = c;
         }
       }