Changeset 12170 for code/branches

Timestamp:

Dec 7, 2018, 5:14:21 PM (6 years ago)

Author:

stadlero

Message:

Reinforcements counter works

Location:

code/branches/wagnis_HS18/src/modules/wagnis

Files:

• Wagnis.cc (modified) (6 diffs)
• Wagnis.h (modified) (1 diff)
• WagnisGameboard.cc (modified) (2 diffs)
• WagnisGameboard.h (modified) (2 diffs)
• WagnisProvince.cc (modified) (1 diff)

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

@@ -118 +118 @@
                     }else{
                         //No more troops left to place and player 1 is next.
-                        next->reinforcements = provincesOfPlayerCounter(1);
+                        next->reinforcements = this->reinforcementsCounter(1);
                     }
                 }else{
@@ -152 +152 @@
                     this->active_player = 1;
                 }
-                tc = provincesOfPlayerCounter(this->active_player);
+                
+                tc = 0;
+                for(WagnisProvince* p: this->gameBoard->provs){
+                    if(p->getOwner_ID() == this->active_player){
+                        tc++;
+                    }
+                }
             }while(tc == 0); //Skip players without provinces.
 
@@ -165 +171 @@
                 this->gameStage = REINFORCEMENT_STAGE;
                 next->setActive(true);
-                next->reinforcements = tc;
+                next->reinforcements = reinforcementsCounter(next->Player_ID);
             }
             
@@ -186 +192 @@
 
     this->gameBoard->initializeNeighbors();
+    this->gameBoard->initializeContinents();
     
     orxout() << "Game creation finished" << endl;
@@ -215 +222 @@
 }
 
-int Wagnis::provincesOfPlayerCounter(int player){
+int Wagnis::reinforcementsCounter(int player){
     int n = 0;
     for(WagnisProvince* p:this->gameBoard->provs){
@@ -226 +233 @@
         }
     }
+
+    n = n/3;
+    if(n<3)n=3;
+
+    int i = 0;
+    bool b = true;
+
+    for(std::vector<WagnisProvince*>* cont_vec:this->gameBoard->continents){
+        for(WagnisProvince* p: *(cont_vec)){
+            if(p->getOwner_ID() != player) b = false;
+        }
+
+        if(b) n += this->getContinentValue(i);
+        b = true; i++;
+    }
+
     return n;
 }
 
-
-
-
-
-
-
-
-
-
-
+int Wagnis::getContinentValue(int cont){
+    switch(cont){
+        case 1: return 7;
+        case 2: return 5;
+        case 3: return 5;
+        case 4: return 3;
+        case 5: return 2;
+        case 6: return 2;
+        default: return 0;
+    }
+    return 0;   
+}
 
 

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

@@ -52 +52 @@
         bool findGameBoard();
         int provinceCount();
-        int provincesOfPlayerCounter(int);
+        int reinforcementsCounter(int);
+        int getContinentValue(int);
     };
 }

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

@@ -14 +14 @@
         this->connections_string = "";
     }
-    WagnisGameboard::~WagnisGameboard(){}
+    WagnisGameboard::~WagnisGameboard(){
+        for(std::vector<WagnisProvince*>* vec: this->continents){
+            delete vec;
+        }
+    }
 
     void WagnisGameboard::XMLPort(Element& xmlelement,XMLPort::Mode mode){
@@ -107 +111 @@
     }
 
+    void WagnisGameboard::initializeContinents(){
+        int maxconts=0;
+        for(WagnisProvince* p:this->provs){
+            if(p->getContinent() > maxconts){
+                maxconts = p->getContinent();
+            }
+        }
+        for(int i=0;i<=maxconts;i++){
+            this->continents.push_back(new std::vector<WagnisProvince*>());
+            for(WagnisProvince* p:this->provs){
+                if(p->getContinent() == i){
+                    this->continents[i]->push_back(p);
+                }
+            }
+            orxout()<<"There are "<<this->continents[i]->size()<<" Provinces in Continent "<< i << endl;
+        }
+    }
+
     //Returns the parsed int and the offset encoded in an int. the upper 16bit(incl MSB) is the number
     //and the lower 16 bits is the new n(after the last digit)

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

@@ -37 +37 @@
         
         void initializeNeighbors();
+        void initializeContinents();
 
 
@@ -42 +43 @@
         std::string connections_string;
         std::vector<WagnisProvince*> provs;
+        std::vector<std::vector<WagnisProvince*>*> continents;
         int parse_int(std::string,unsigned int);
     };

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

@@ -23 +23 @@
         this->setRadarObjectColour(colour({128,128,128}, 100.0f));
         this->ID = -1;
-        this->continent = -1;
+        this->continent = 0;
         this->neighbors = std::vector<WagnisProvince*>();