Changeset 12134

Timestamp:

Dec 2, 2018, 10:47:00 PM (6 years ago)

Author:

stadlero

Message:

Troop count is visible in the HUD

Location:

code/branches/wagnis_HS18

Files:

• data/overlays/WagnisHUD.oxo (modified) (1 diff)
• src/modules/wagnis/WagnisPlayer.cc (modified) (6 diffs)
• src/modules/wagnis/WagnisPlayer.h (modified) (1 diff)
• src/modules/wagnis/WagnisProvince.cc (modified) (5 diffs)
• src/modules/wagnis/WagnisProvince.h (modified) (3 diffs)

code/branches/wagnis_HS18/data/overlays/WagnisHUD.oxo

@@ -7 +7 @@
      font          = "Monofur"
      textsize      = 0.02
-     navMarkerSize = 0.03
+     navMarkerSize = 0.05
      aimMarkerSize = 0.02
+     healthMarkerSize = 0
+     healthLevelMarkerSize = 0
     />
 

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

@@ -1 @@
-
-
-
 
 
@@ -64 +61 @@
                         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;
+                            this->target_province->setTroops(this->target_province->getTroops()+1);
+                            orxout()<<"Province "<<this->target_province->ID<<" owned by Player "<<this->target_province->owner_ID<<" troops: "<<this->target_province->getTroops()<<endl;
                             master->playerFinishedStageCallback(this);
                         }else{
@@ -77 +74 @@
                     {
                         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;
+                            this->target_province->setTroops(this->target_province->getTroops()+1);
+                            orxout()<<"Province "<<this->target_province->ID<<" owned by Player "<<this->target_province->owner_ID<<" troops: "<<this->target_province->getTroops()<<endl;
                         }
                             
@@ -87 +84 @@
                         if (checkMove(ATTACK))
                         {
-                            while ((this->origin_province->troops > 1) && (this->target_province->troops > 0)) //still troops available
+                            while ((this->origin_province->getTroops() > 1) && (this->target_province->getTroops() > 0)) //still troops available
                             {
-                                while ((this->origin_province->troops >= 4) && (this->target_province->troops >= 2))
+                                while ((this->origin_province->getTroops() >= 4) && (this->target_province->getTroops() >= 2))
                                 {
                                     //normal fight, 3 attackers, 2 defenders
                                 }
 
-                                if ((this->origin_province->troops == 3) && (this->target_province->troops >= 2))
+                                if ((this->origin_province->getTroops() == 3) && (this->target_province->getTroops() >= 2))
                                 {
                                     //2 attackers, 2 defenders
                                 }
 
-                                if((this->origin_province->troops == 2) && (this->target_province->troops >= 2))
+                                if((this->origin_province->getTroops() == 2) && (this->target_province->getTroops() >= 2))
                                 {
                                     //1 attacker, 2 defenders
@@ -107 +104 @@
                             }
 
-                            if (this->target_province->troops == 0) //attacker won
+                            if (this->target_province->getTroops() == 0) //attacker won
                             {
                                 this->target_province->owner_ID = this->Player_ID;
-                                this->target_province->troops = (this->origin_province->troops - 1);
-                                this->origin_province->troops = 1;
+                                this->target_province->setTroops(this->origin_province->getTroops() - 1);
+                                this->origin_province->setTroops(1);
                             }
                         }
@@ -121 +118 @@
                         if (checkMove(MOVE))
                         {
-                            this->target_province->troops += ((this->origin_province->troops) - 1);
-                            this->origin_province->troops = 1;
+                            this->target_province->setTroops(this->origin_province->getTroops()-1);
+                            this->origin_province->setTroops(1);
                         }
                         break;

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

@@ -39 +39 @@
 
 
-        //void (Wagnis::*finishedStageCallback) (WagnisPlayer*);
         Wagnis* master;
         GameStage gameStage;

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

@@ -2 +2 @@
 
 #include "WagnisProvince.h"
-#include "core/CoreIncludes.h"
-#include "BulletDynamics/Dynamics/btRigidBody.h"
-#include "worldentities/StaticEntity.h"
-#include <vector>
 
 #define WAGNIS_PROVINCE_MAX_HEALTH 1000000.0f
@@ -24 +20 @@
         this->owner_ID = -1;
         this->troops = 0;
+        this->setRadarName(std::to_string(0));
         this->ID = -1;
         this->continent = -1;
         this->neighbors = std::vector<WagnisProvince*>();
-        this->markerBillboard = nullptr;
         
         this->initialHealth_ = WAGNIS_PROVINCE_MAX_HEALTH;
@@ -42 +38 @@
         SUPER(WagnisProvince, XMLPort, xmlelement, mode);
 
-        XMLPortObject(WagnisProvince, Billboard, "MarkerBillboard", addMarkerBillboard, getMarkerBillboard, xmlelement, mode);
         XMLPortParam(WagnisProvince, "ID", setID, getID, xmlelement, mode);
         XMLPortParam(WagnisProvince, "continent", setContinent, getContinent, xmlelement, mode);
-    }
-
-    void WagnisProvince::addMarkerBillboard(Billboard* billi){
-        this->markerBillboard = billi;
-        attach(billi);
-    }
-    Billboard* WagnisProvince::getMarkerBillboard(unsigned int i) const{
-        if(i != 0) return nullptr;
-        return this->markerBillboard;
     }
 
@@ -68 +54 @@
     void WagnisProvince::setTroops(int troops){
         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
@@ -102 +95 @@
         neighbors.push_back(prov);
     }
-
-    void WagnisProvince::setBillbardVisibility(bool b){
-        //TODO set visibility of billboard
-    }
 }

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

@@ -11 +11 @@
 #include "core/XMLPort.h"
 #include "worldentities/pawns/Pawn.h"
-#include "graphics/Billboard.h"
+#include "tools/OgreBulletUtils.h"
 #include <vector>
+#include <OgreColourValue.h>
+#include "tools/ToolsPrereqs.h"
 
 
@@ -25 +27 @@
 
         virtual void XMLPort(Element&,XMLPort::Mode);
-        void addMarkerBillboard(Billboard*);
-        Billboard* getMarkerBillboard(unsigned int) const;
 
         void setOwner_ID(int);
@@ -39 +39 @@
 
         void addNeighbor(WagnisProvince*);
-        void setBillbardVisibility(bool);
 
 
         std::vector<WagnisProvince*> neighbors;
         int owner_ID;
-        int troops;
         int ID;
         int continent;
-        
-        Billboard* markerBillboard;
+
+        private:
+        int troops;
+
     };
 }