Changeset 12133

Timestamp:

Dec 2, 2018, 4:08:26 PM (5 years ago)

Author:

stadlero

Message:

Wagnis now progresses through stages

Location:

code/branches/wagnis_HS18

Files:

• data/levels/Wagnis_testlevel.oxw (added)
• data/levels/templates/wagnisCursor.oxt (modified) (2 diffs)
• data/overlays/WagnisHUD.oxo (added)
• src/modules/wagnis/Wagnis.cc (modified) (2 diffs)
• src/modules/wagnis/WagnisPlayer.cc (modified) (3 diffs)
• src/modules/wagnis/WagnisProvince.cc (modified) (1 diff)

code/branches/wagnis_HS18/data/levels/templates/wagnisCursor.oxt

@@ -1 +1 @@
 <Template name=wagnisCursor>
   <SpaceShip
-   hudtemplate            = spaceshiphud
+   hudtemplate            = WagnisHUD
    camerapositiontemplate = spaceshipassffcameras
    spawnparticlesource    = "Orxonox/fairytwirl"
@@ -13 +13 @@
    initialshieldhealth = 30
    maxshieldhealth     = 50
-   shieldabsorption    = 0.8
+   shieldabsorption    = 0.8f
    shieldrechargerate  = 1
    shieldrechargewaittime = 1

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

@@ -43 +43 @@
     this->players.at(0)->gameStage = this->gameStage;
     this->players.at(0)->is_active = true;
+    orxout()<<"Player "<<1<<"\'s turn. Please choose province."<<endl;
 }
 
@@ -68 +69 @@
             if(this->active_player < this->players.size()){
                 this->active_player++;
-                WagnisPlayer* next = this->players[this->active_player-1];
+                WagnisPlayer* next = this->players[this->active_player - 1];
                 next->gameStage = CHOOSE_PROVINCE_STAGE;
                 next->is_active = true;
-                orxout()<<"Player "<<next->Player_ID<<"\'s turn. Please choose province"<<endl;
+                orxout()<<"Player "<<next->Player_ID<<"\'s turn. Please choose province."<<endl;
             }else{
                 this->active_player = 1;
-                WagnisPlayer* next = this->players[this->active_player-1];
+                WagnisPlayer* next = this->players[this->active_player - 1];
                 next->gameStage = REINFORCEMENT_STAGE;
                 this->gameStage = REINFORCEMENT_STAGE;
                 next->is_active = true;
-                orxout()<<"Player "<<next->Player_ID<<"\'s turn. Reinforcement"<<endl;
+                orxout()<<"Player "<<next->Player_ID<<"\'s turn. Reinforcement."<<endl;
             }
             break;
         }
         case REINFORCEMENT_STAGE:{
+            player->gameStage = ATTACK_STAGE;
+            this->gameStage = ATTACK_STAGE;
+            orxout()<<"Player "<<player->Player_ID<<"\'s turn. Attack."<<endl;
             break;
         }
         case ATTACK_STAGE:{
+            player->gameStage = MOVE_STAGE;
+            this->gameStage = MOVE_STAGE;
+            orxout()<<"Player "<<player->Player_ID<<"\'s turn. Move."<<endl;
             break;
         }
         case MOVE_STAGE:{
+            player->is_active = false;
+            if(this->active_player < this->players.size()){
+                this->active_player++;
+            }else{
+                this->active_player = 1;
+            }
+            WagnisPlayer* next = this->players[this->active_player - 1];
+            orxout()<<"Player "<<next->Player_ID<<"\'s turn. Reinforcement."<<endl;
+            next->gameStage = REINFORCEMENT_STAGE;
+            this->gameStage = REINFORCEMENT_STAGE;
+            next->is_active = true;
             break;
         }

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

@@ -40 +40 @@
                     if(prov->getID() == 1000){
                         master->playerFinishedStageCallback(this);
+                        prov->setHealth(prov->getMaxHealth());
                         break;
                     }
@@ -61 +62 @@
                     case CHOOSE_PROVINCE_STAGE: 
                     {   
-                        if (checkMove(SET_TROOPS_INITIAL))
+                        if (checkMove(SET_TROOPS_INITIAL)){
                             this->target_province->owner_ID = this->Player_ID;
-                        
+                            this->target_province->troops += 1;
+                            orxout()<<"Province "<<this->target_province->ID<<" owned by Player "<<this->target_province->owner_ID<<" troops: "<<this->target_province->troops<<endl;
+                            master->playerFinishedStageCallback(this);
+                        }else{
+                            orxout()<<"Sorry, someone already owns this provice"<<endl;
+                        }
+
                         break;
                     }
@@ -69 +76 @@
                     case REINFORCEMENT_STAGE:
                     {
-                        if (checkMove(SET_TROOPS))
+                        if (checkMove(SET_TROOPS)){
                             this->target_province->troops += 1;
-                        
+                            orxout()<<"Province "<<this->target_province->ID<<" owned by Player "<<this->target_province->owner_ID<<" troops: "<<this->target_province->troops<<endl;
+                        }
+                            
                         break;
                     }

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

@@ -22 +22 @@
     WagnisProvince::WagnisProvince(Context* context) : Pawn(context){
         RegisterObject(WagnisProvince);
-        this->owner_ID = 0;
+        this->owner_ID = -1;
         this->troops = 0;
         this->ID = -1;