Changeset 12150 for code

Timestamp:

Dec 5, 2018, 11:54:14 AM (5 years ago)

Author:

stadlero

Message:

Game progression finished. still bugs.

Location:

code/branches/wagnis_HS18

Files:

• data/levels/Wagnis_testlevel.oxw (modified) (1 diff)
• src/modules/wagnis/Wagnis.cc (modified) (7 diffs)
• src/modules/wagnis/Wagnis.h (modified) (1 diff)
• src/modules/wagnis/WagnisPlayer.cc (modified) (4 diffs)
• src/modules/wagnis/WagnisPlayer.h (modified) (3 diffs)
• src/modules/wagnis/WagnisProvince.cc (modified) (2 diffs)

code/branches/wagnis_HS18/data/levels/Wagnis_testlevel.oxw

@@ -32 +32 @@
     <SpawnPoint position="-100, 45, 75" lookat="0,45,75" spawnclass=SpaceShip pawndesign=wagnisCursor />
 
-<WagnisGameboard position="20,20,20" connections_string="1=2+3, 2=1, 3=1">
+<WagnisGameboard position="20,20,20" connections_string="1=2+4+5, 2=1+3, 3=2+4, 4=3+1, 5=1+6, 6=7+5, 7=6+8, 8=7">
 
 

code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc

@@ -16 +16 @@
     this->gameStage = NOT_READY;
     this->active_player = 1;
-
-    int n = 8;
+    this->initial_reinforcements_left = 5;
+    this->empty_provinces_left = 0;
+
+    int n = 3;
     for(int i = 0;i < n;i++){
         WagnisPlayer* p = new WagnisPlayer(context);
@@ -41 +43 @@
 
     this->gameStage = CHOOSE_PROVINCE_STAGE;
+    this->empty_provinces_left = this->provinceCount();
     this->players.at(0)->gameStage = this->gameStage;
-    this->players.at(0)->is_active = true;
+    this->players.at(0)->setActive(true);
+    this->players.at(0)->reinforcements = 0;
     orxout()<<"Player "<<1<<"\'s turn. Please choose province."<<endl;
 }
@@ -66 +70 @@
     switch(this->gameStage){
         case CHOOSE_PROVINCE_STAGE:{
-            player->is_active = false;
-            if(this->active_player < this->players.size()){
-                this->active_player++;
+            player->setActive(false);
+            this->empty_provinces_left -= 1;
+            if(this->empty_provinces_left > 0){
+                //Still empty provinces left
+                orxout()<<"DEBUG: Empty provs: "<<this->empty_provinces_left<<endl;
+
+                if(this->active_player < this->players.size()){
+                    this->active_player++;
+                }else{
+                    this->active_player = 1;
+                }
+
                 WagnisPlayer* next = this->players[this->active_player - 1];
                 next->gameStage = CHOOSE_PROVINCE_STAGE;
-                next->is_active = true;
+                next->setActive(true);
+                next->reinforcements = 0;
                 orxout()<<"Player "<<next->Player_ID<<"\'s turn. Please choose province."<<endl;
             }else{
+                //no empty provinces left
+                orxout()<<"DEBUG: Empty provs: "<<this->empty_provinces_left<<endl;
                 this->active_player = 1;
                 WagnisPlayer* next = this->players[this->active_player - 1];
                 next->gameStage = REINFORCEMENT_STAGE;
                 this->gameStage = REINFORCEMENT_STAGE;
-                next->is_active = true;
+                next->setActive(true);
+                next->reinforcements = 1;
                 orxout()<<"Player "<<next->Player_ID<<"\'s turn. Reinforcement."<<endl;
             }
@@ -84 +101 @@
         }
         case REINFORCEMENT_STAGE:{
+            
+            if(this->initial_reinforcements_left > 0){
+                player->setActive(false);
+                if(this->active_player == this->players.size()){
+                    //Last player finished this round of initial troops.
+                    this->initial_reinforcements_left -= 1;
+                    WagnisPlayer* next = this->players.at(0);
+                    this->active_player = 1;
+                    next->setActive(true);
+                    next->gameStage = REINFORCEMENT_STAGE;
+                    if(this->initial_reinforcements_left > 0){
+                        //Still more troops left to place and player 1 is next.
+                        next->reinforcements = 1;
+                    }else{
+                        //No more troops left to place and player 1 is next.
+                        next->reinforcements = provincesOfPlayerCounter(1);
+                    }
+                }else{
+                    //Player who finished was not the last player
+                    WagnisPlayer* next = this->players.at(this->active_player);
+                    this->active_player += 1;
+                    next->setActive(true);
+                    next->gameStage = REINFORCEMENT_STAGE;
+                    next->reinforcements = 1;
+                }
+                break;
+            }
+            //Standard Reinforcement
+
             player->gameStage = ATTACK_STAGE;
             this->gameStage = ATTACK_STAGE;
@@ -96 +142 @@
         }
         case MOVE_STAGE:{
-            player->is_active = false;
+            player->setActive(false);
             if(this->active_player < this->players.size()){
                 this->active_player++;
@@ -106 +152 @@
             next->gameStage = REINFORCEMENT_STAGE;
             this->gameStage = REINFORCEMENT_STAGE;
-            next->is_active = true;
+            next->setActive(true);
             break;
         }
@@ -143 +189 @@
 }
 
+//Counts legit provinces(not including buttons)
+int Wagnis::provinceCount(){
+    int n = 0;
+    for(WagnisProvince* p: this->gameBoard->provs){
+        if(p != nullptr){
+            if(p->ID < 1000){
+                n++;
+            }
+        }else{
+            orxout()<<"Nullpointer found in provines!!!"<<endl;
+        }
+    }
+    return n;
+}
+
+int Wagnis::provincesOfPlayerCounter(int player){
+    int n = 0;
+    for(WagnisProvince* p:this->gameBoard->provs){
+        if(p != nullptr){
+            if(p->getOwner_ID() == player){
+                n++;
+            }
+        }else{
+            orxout()<<"Nullpointer found in provines!!!"<<endl;
+        }
+    }
+    return n;
+}
+
 
 

code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h

@@ -46 +46 @@
         private:
         int active_player;
+        int initial_reinforcements_left;
+        int empty_provinces_left;
         GameStage gameStage;
         std::vector<WagnisPlayer*> players;
         void createGame();
         bool findGameBoard();
+        int provinceCount();
+        int provincesOfPlayerCounter(int);
     };
 }

code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc

@@ -80 +80 @@
                             {
                                 this->target_province->setTroops(this->target_province->getTroops()+1);
+                                this->reinforcements -= 1;
                                 orxout()<<"Province "<<this->target_province->getID()<<" owned by Player "<<this->target_province->getOwner_ID()<<" troops: "<<this->target_province->getTroops()<<endl;
                             }
@@ -89 +90 @@
 
                         if (checkMove(ATTACK))
+                        
                         {
+                            orxout()<<"Attack move check returned valid"<<endl;
                             while ((this->origin_province->getTroops() > 1) && (this->target_province->getTroops() > 0)) //still troops available
                             {
@@ -199 +202 @@
                                 this->origin_province->setTroops(1);
                             }
+                        }else{
+                            orxout()<<"Attack move check returned false"<<endl;
                         }
                         
@@ -337 +342 @@
             return b;    
     }
+
+    void WagnisPlayer::setActive(bool b){
+        this->is_active = b;
+        if(b == true) orxout()<<"Player "<<this->Player_ID<<"\'s turn"<<endl;
+    }
+
+    bool WagnisPlayer::isActive() const {
+        return this->is_active;
+    }
 }

code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h

@@ -36 +36 @@
         void moveTroops(WagnisProvince*,WagnisProvince*);
         std::string toString();
+        void setActive(bool);
+        bool isActive() const;
 
 
@@ -42 +44 @@
         GameStage gameStage;
         bool province_selection_changed;
-        bool is_active;
         int Player_ID;
         WagnisGameboard* gameBoard;
@@ -55 +56 @@
         int second3(int, int, int);
         int second2(int, int);
+
+        private:
+        bool is_active;
     };
 }

code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc

@@ -56 +56 @@
             case 2: this->setRadarObjectColour( colour({0,255,0}, 100.0f) );
                     break;
-            case 3: this->setRadarObjectColour( colour({0,0,255}, 100.0f) );
+            case 3: this->setRadarObjectColour( colour({255,255,0}, 100.0f) );
                     break;
-            case 4: this->setRadarObjectColour( colour({255,255,0}, 100.0f) );
+            case 4: this->setRadarObjectColour( colour({0,0,255}, 100.0f) );
                     break;
             case 5: this->setRadarObjectColour( colour({255,0,255}, 100.0f) );
@@ -77 +77 @@
         this->troops = troops;
         this->setRadarName(std::to_string(troops));
-        //TEST
-        if(troops == 5){
-            Ogre::ColourValue cv = colour({255,255,255}, 100.0f);
-            this->setRadarObjectColour(cv);
-        }
-        
     }
     //set ID