Added passing

101itsGabe · Sep 28, 2023 · 2dedb39 · 2dedb39
1 parent c5c02a9
commit 2dedb39
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 10 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -58,6 +58,7 @@
     "xstddef": "cpp",
     "xstring": "cpp",
     "xtr1common": "cpp",
-    "xutility": "cpp"
+    "xutility": "cpp",
+    "__locale": "cpp"
   }
 }
diff --git a/main b/main
diff --git a/main.cpp b/main.cpp
@@ -240,7 +240,9 @@ bool InitSDL()
     bool menu = false;
     bool highlight = true;
     bool move = false;
+    bool pass = false;
     Player *clickedPlayer = nullptr;
+    GM.SetBallPlayer((*PM.getPlayerList())[0]);
     while (!quit)
     {
         while (SDL_PollEvent(&e) != 0)
@@ -266,18 +268,19 @@ bool InitSDL()
                 if (tile.getMouseCheck(mouseX, mouseY) && highlight && !menu)
                 {
                     Highlight(renderer, &tile);
-                    if (e.type == SDL_MOUSEBUTTONDOWN && e.button.button == SDL_BUTTON_LEFT)
+                    if (e.type == SDL_MOUSEBUTTONDOWN && e.button.button == SDL_BUTTON_LEFT){
                         curTile = &tile;
+                        break;
+                    }
                 }
             }
-            // cout << curTile->getTileId() << endl;
-            Player &fPlayer = (*PM.getPlayerList())[0];
-            GM.SetBallPlayer(fPlayer);
+
+            GM.RenderBall(renderer, tiles);
             if (e.type == SDL_MOUSEBUTTONDOWN && e.button.button == SDL_BUTTON_LEFT)
             {
                 if (curTile)
                 {
-                    if (clicked == false)
+                    if (clicked == false && menu == false && pass == false)
                     {
                         for (Player &p : *PM.getPlayerList())
                         {
@@ -319,6 +322,7 @@ bool InitSDL()
                             cout << "Clicked Team 2" << endl;
                             GM.AddTeamScore2(GM.madeShot(curTile, clickedPlayer, *PM.getPlayerList()));
                         }
+
 
                         clicked = false;
                         menu = false;
@@ -334,6 +338,16 @@ bool InitSDL()
                         highlight = true;
                         clickedPlayer->setClicked(false);
                     }
+
+                    else if (curMenu.mouseCheck(mouseX, mouseY) == 3 && clickedPlayer->GetTile() == GM.getBallTile())
+                    {
+                        cout << "Pass" << endl;
+                        menu = false;
+                        highlight = true;
+                        pass = true;
+                    }
+
+
                 }
                 if (clickedPlayer != NULL)
                     GM.RenderShotPercent(renderer, font, windowWidth, windowHeight, clickedPlayer, PM.getPlayerList());
@@ -347,7 +361,7 @@ bool InitSDL()
                 }
             }
 
-            else if (clicked == true)
+            else if (clicked)
             {
                 highlight = true;
                 if (e.type == SDL_MOUSEBUTTONDOWN && e.button.button == SDL_BUTTON_LEFT)
@@ -365,6 +379,40 @@ bool InitSDL()
                 move = false;
             }
 
+            else if(pass){
+                clickedPlayer->setClicked(false);
+                bool playerCheck = false;
+                bool tileCheck = true;
+                menu = false;
+                if(tileCheck){
+                for (Tile &tile : *tiles)
+                {
+                    if (tile.getMouseCheck(mouseX, mouseY) && !menu)
+                    {
+                        if (e.type == SDL_MOUSEBUTTONDOWN && e.button.button == SDL_BUTTON_LEFT){
+                            curTile = &tile;
+                            playerCheck = true;
+                            tileCheck = false;
+                            break;
+                        }
+                    }
+
+                }
+                }
+                if(playerCheck){
+                for (Player &p : *PM.getPlayerList())
+                    {
+                     if(curTile && curTile->getTileId() == p.GetTile()){
+                        GM.SetBallPlayer(p);
+                        pass = false;
+                        clickedPlayer = nullptr;
+                        playerCheck = false;
+                     }       
+                }
+                }
+
+            }
+
             SDL_RenderPresent(renderer);
         }
     }

diff --git a/src/gameManager.cpp b/src/gameManager.cpp
@@ -260,11 +260,14 @@ int GameManager::ifDefense(Player &player, vector<Player> pList)
             int defense = maxDistance - (rowDiff + colDiff) + temp;
 
             // THIS DONT WORK
-            if (hoopColDiff > 0 && defenderCol > playerCol && defenderCol < hoop1Col)
+            if (defenderCol < playerCol)
             {
                 if (rowDiff + colDiff < closestDefenderDistance)
                 {
                     closestDefenderDistance = rowDiff + colDiff;
+                    if(hoopRowDif + hoopColDiff < closestDefenderDistance){
+                        closestDefenderDefense = 0;
+                    }
                     if (closestDefenderDistance == 2)
                     {
                         closestDefenderDefense = defense / 2;
@@ -273,6 +276,9 @@ int GameManager::ifDefense(Player &player, vector<Player> pList)
                         closestDefenderDefense = defense;
                 }
             }
+            else{
+                closestDefenderDefense = 0;
+            }
         }
     }
     if (closestDefenderDistance > 2)
@@ -329,4 +335,10 @@ void GameManager::RenderBall(SDL_Renderer *renderer, vector<Tile> *tList)
             }
         }
     }
-}
+}
+
+
+int GameManager::getBallTile(){
+    return ballPlayer->GetTile();
+}
+
diff --git a/src/gameManager.h b/src/gameManager.h
@@ -38,6 +38,7 @@ class GameManager
     void MoveAI(vector<Player> *);
     void RenderBall(SDL_Renderer *, vector<Tile> *);
 
+    int getBallTile();
     int madeShot(Tile *, Player *, vector<Player>);
     int check3(int);
     string WhichTeam(Player *p);

diff --git a/src/menu.cpp b/src/menu.cpp
@@ -27,6 +27,8 @@ int Menu::mouseCheck(int mX, int mY)
                 return 1;
             else if (md.name == "Move")
                 return 2;
+            else if(md.name == "Pass")
+                return 3;
         }
     }
     return 0;
@@ -39,7 +41,7 @@ MenuData Menu::getMenuData()
 
 void Menu::RenderText(SDL_Renderer *renderer, TTF_Font *font)
 {
-    vector<string> textList = {"Shoot", "Move", "Dribble"};
+    vector<string> textList = {"Shoot", "Move", "Pass"};
     int numItems = textList.size();
     int offsetConst = (menuData.menuH * 0.4) / numItems;
     SDL_Color color = {0, 0, 0};