Changeset 12136 for code/branches/wagnis_HS18/src/modules

Timestamp:

Dec 5, 2018, 9:26:18 AM (6 years ago)

Author:

kunzro

Message:

HUD fixed

Location:

code/branches/wagnis_HS18/src/modules

Files:

• wagnis/CMakeLists.txt (modified) (1 diff)
• wagnis/Wagnis.cc (modified) (1 diff)
• wagnis/WagnisHUD.cc (added)
• wagnis/WagnisHUD.h (added)
• wagnis/WagnisPlayer.cc (modified) (4 diffs)
• wagnis/WagnisPlayer.h (modified) (1 diff)
• wagnis/WagnisProvince.cc (modified) (2 diffs)
• wagnis/WagnisProvince.h (modified) (2 diffs)
• weapons/projectiles/WagnisProjectile.cc (modified) (1 diff)
• weapons/weaponmodes/WagnisGun.cc (modified) (1 diff)

code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt

@@ -4 +4 @@
   WagnisPlayer.cc
   Wagnis.cc
+  WagnisHUD.cc
 )
 

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

@@ -17 +17 @@
     this->active_player = 1;
 
-    int n = 3;
+    int n = 8;
     for(int i = 0;i < n;i++){
         WagnisPlayer* p = new WagnisPlayer(context);

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

@@ -31 +31 @@
 
         if(this->is_active)
-        {
-            
+        {            
             for(WagnisProvince* prov:this->gameBoard->provs){
                 //orxout()<<"province health: "<<prov->getHealth()<<endl;
@@ -76 +75 @@
                     case REINFORCEMENT_STAGE:
                     {
-                        int i = reinforcementCounter(); //i tells how many troops player gets
-                        while (i > 0) 
+                        if ( reinforcements > 0) 
                         {
                             if (checkMove(SET_TROOPS))
@@ -83 +81 @@
                                 this->target_province->setTroops(this->target_province->getTroops()+1);
                                 orxout()<<"Province "<<this->target_province->getID()<<" owned by Player "<<this->target_province->getOwner_ID()<<" troops: "<<this->target_province->getTroops()<<endl;
-                                --i;
                             }
-                        }
-
-                        master->playerFinishedStageCallback(this);    
+                        }   
                         
                         break;
@@ -359 +354 @@
     }
 
-    int WagnisPlayer::reinforcementCounter() //calculates how many troops a player gets at beginning of his turn
+    int WagnisPlayer::reinforcementCounter() //calculates and sets reeinforcements how many troops a player gets at beginning of his turn
     {
         
-        return 10;
+        reinforcements = 10;
+        orxout()<<"derp"<<endl;
         /*
         int counter = 0;

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

@@ -47 +47 @@
         WagnisProvince* origin_province;
         WagnisProvince* target_province;
+        int reinforcements;
         bool isNeighbour(WagnisProvince*, WagnisProvince*);
         bool existPath(WagnisProvince*, WagnisProvince*);

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

@@ -21 +21 @@
         this->troops = 0;
         this->setRadarName(std::to_string(0));
+        this->setRadarObjectColour(colour({128,128,128}, 100.0f));
         this->ID = -1;
         this->continent = -1;
@@ -50 +51 @@
     void WagnisProvince::setOwner_ID(int owner){
         this->owner_ID = owner;
+        switch(owner){
+            case 1: this->setRadarObjectColour( colour({255,0,0}, 100.0f) );
+                    break;
+            case 2: this->setRadarObjectColour( colour({0,255,0}, 100.0f) );
+                    break;
+            case 3: this->setRadarObjectColour( colour({0,0,255}, 100.0f) );
+                    break;
+            case 4: this->setRadarObjectColour( colour({255,255,0}, 100.0f) );
+                    break;
+            case 5: this->setRadarObjectColour( colour({255,0,255}, 100.0f) );
+                    break;
+            case 6: this->setRadarObjectColour( colour({128,128,0}, 40.0f) );
+                    break;
+            case 7: this->setRadarObjectColour( colour({0,255,255}, 100.0f) );
+                    break;
+            case 8: this->setRadarObjectColour( colour({153,255,204}, 100.0f) );
+                    break;
+            case 9: this->setRadarObjectColour( colour({102,51,0}, 100.0f) );
+                    break;
+        }
+
     }
     //set troops

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

@@ -42 +42 @@
 
         std::vector<WagnisProvince*> neighbors;
-        int owner_ID;
         int ID;
         int continent;
@@ -48 +47 @@
         private:
         int troops;
+        int owner_ID;
 
     };

code/branches/wagnis_HS18/src/modules/weapons/projectiles/WagnisProjectile.cc

@@ -50 +50 @@
             // Create a sphere collision shape and attach it to the projectile.
             collisionShape_ = new SphereCollisionShape(this->getContext());
-            setCollisionShapeRadius(2.0f);
+            setCollisionShapeRadius(3.0f);
             this->attachCollisionShape(collisionShape_);
 

code/branches/wagnis_HS18/src/modules/weapons/weaponmodes/WagnisGun.cc

@@ -51 +51 @@
         this->reloadTime_ = 0.1f;
         this->damage_ = 0.0f; //default 15
-        this->speed_ = 1000.0f;
+        this->speed_ = 800.0f;
         this->delay_ = 0.0f;
         this->setMunitionName("LaserMunition");