Changeset 12162

Timestamp:

Dec 5, 2018, 9:08:38 PM (6 years ago)

Author:

samuelbl

Message:

Attack move fixed

Location:

code/branches/wagnis_HS18/src/modules/wagnis

Files:

• Wagnis.cc (modified) (1 diff)
• WagnisPlayer.cc (modified) (9 diffs)

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

@@ -16 +16 @@
     this->gameStage = NOT_READY;
     this->active_player = 1;
-    this->initial_reinforcements_left = 5;
+    this->initial_reinforcements_left = 2; //changed here
     this->empty_provinces_left = 0;
 

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

@@ -95 +95 @@
                         
                         {
-                            orxout()<<"Attack move check returned valid"<<endl;
                             while ((this->origin_province->getTroops() > 1) && (this->target_province->getTroops() > 0)) //still troops available
                             {
@@ -106 +105 @@
                                     int def1 = dice();
                                     int def2 = dice();
+                                    
                                     int attBest = best3(att1, att2, att3);
                                     int attSecond = second3(att1, att2, att3);
@@ -128 +128 @@
                                     int def1 = dice();
                                     int def2 = dice();
+                                    
                                     int attBest = best2(att1, att2);
                                     int attSecond = second2(att1, att2);
@@ -149 +150 @@
                                     int def1 = dice();
                                     int def2 = dice();
+                                    
                                     int defBest = best2(def1, def2);
 
@@ -164 +166 @@
                                     int att3 = dice();
                                     int defBest = dice();
+                                    
                                     int attBest = best3(att1, att2, att3);
 
@@ -178 +181 @@
                                     int att2 = dice();
                                     int defBest = dice();
+                                    
                                     int attBest = best2(att1, att2);
 
@@ -205 +209 @@
                                 this->origin_province->setTroops(1);
                             }
-                        }else{
-                            orxout()<<"Attack move check returned false"<<endl;
                         }
                         
@@ -215 +217 @@
                         if (checkMove(MOVE))
                         {
-                            this->target_province->setTroops(this->origin_province->getTroops()-1);
+                            this->target_province->setTroops(this->target_province->getTroops() + this->origin_province->getTroops()-1);
                             this->origin_province->setTroops(1);
                             master->playerFinishedStageCallback(this);
@@ -306 +308 @@
     int WagnisPlayer::dice() //returns random integer in range [1, 2, 3, 4, 5, 6] 
     {
-        srand(time(NULL));
-            return (rand()%6+1);
+        return (rand()%6+1);
     }