[Orxonox-commit 7513] r12119 - code/branches/wagnis_HS18/src/modules/wagnis

[stadlero at orxonox.net]

Author: stadlero
Date: 2018-11-28 10:02:11 +0100 (Wed, 28 Nov 2018)
New Revision: 12119

Modified:
   code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt
   code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc
   code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h
   code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc
Log:
Wagnis class does now compile

Modified: code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt	2018-11-28 08:33:18 UTC (rev 12118)
+++ code/branches/wagnis_HS18/src/modules/wagnis/CMakeLists.txt	2018-11-28 09:02:11 UTC (rev 12119)
@@ -2,6 +2,7 @@
   WagnisProvince.cc
   WagnisGameboard.cc
   WagnisPlayer.cc
+  Wagnis.cc
 )
 
 ORXONOX_ADD_LIBRARY(wagnis

Modified: code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc	2018-11-28 08:33:18 UTC (rev 12118)
+++ code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc	2018-11-28 09:02:11 UTC (rev 12119)
@@ -9,15 +9,40 @@
 
 RegisterClass(Wagnis);
 
+//Constructor
 Wagnis::Wagnis(Context* context) : Deathmatch(context){
     RegisterObject(Wagnis);
+    this->gameBoard = nullptr;
 }
 //Destructor
 Wagnis::~Wagnis(){}
 
 
+//Runs the game
+void Wagnis::start(){
+    
 }
 
+//Creates and links all needed classes
+void createGame(){
 
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+
+
         
     
\ No newline at end of file

Modified: code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h	2018-11-28 08:33:18 UTC (rev 12118)
+++ code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h	2018-11-28 09:02:11 UTC (rev 12119)
@@ -27,12 +27,23 @@
  **/
 
 
+enum GameStage { CHOOSE_PROVINCE_STAGE, REINFORCEMENT_STAGE, ATTACK_STAGE, MOVE_STAGE };
 
 namespace orxonox
 {
     class /**_WagnisExport**/ Wagnis : public Deathmatch
     {
+        public:
+        Wagnis(Context* context);
+        virtual ~Wagnis();
+        void start();
 
+
+
+        WagnisGameboard* gameBoard;
+
+        private:
+        void createGame();
     };
 }
 #endif

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h	2018-11-28 08:33:18 UTC (rev 12118)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisGameboard.h	2018-11-28 09:02:11 UTC (rev 12119)
@@ -32,11 +32,13 @@
         WagnisProvince* getProvince(unsigned int) const;
         void setConnections_string(const std::string&);
         std::string getConnections_string() const;
-        //
-        std::string connections_string;
+        //XML end
+        
         void initializeNeighbors(std::string);
 
 
+        
+        std::string connections_string;
         std::vector<WagnisProvince*> provs;
         int parse_int(std::string,unsigned int);
     };

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc	2018-11-28 08:33:18 UTC (rev 12118)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.cc	2018-11-28 09:02:11 UTC (rev 12119)
@@ -43,6 +43,7 @@
             }
 
             if(this->province_selection_changed && this->origin_province != nullptr && this->target_province != nullptr){
+                
                 this->province_selection_changed = false;
                 switch(gamestage){
                     case CHOOSE_PROVINCE_STAGE: 

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h	2018-11-28 08:33:18 UTC (rev 12118)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisPlayer.h	2018-11-28 09:02:11 UTC (rev 12119)
@@ -17,10 +17,10 @@
 #include "infos/HumanPlayer.h"
 
 enum MoveType { ATTACK, MOVE, SET_TROOPS, SET_TROOPS_INITIAL };
-enum GameStagexyz { CHOOSE_PROVINCE_STAGE, REINFORCEMENT_STAGE, ATTACK_STAGE, MOVE_STAGE };
 
 
 
+
 namespace orxonox
 {
     class WagnisPlayer : public HumanPlayer, public Tickable
@@ -39,7 +39,7 @@
 
 
 
-        GameStagexyz gamestage;
+        GameStage gamestage;
         bool province_selection_changed;
         bool is_active;
         int Player_ID;

Modified: code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc	2018-11-28 08:33:18 UTC (rev 12118)
+++ code/branches/wagnis_HS18/src/modules/wagnis/WagnisProvince.cc	2018-11-28 09:02:11 UTC (rev 12119)
@@ -6,7 +6,7 @@
 #include "worldentities/StaticEntity.h"
 #include <vector>
 
-#define WAGNIS_PROVINCE_MAX_HEALTH 1000.0f
+#define WAGNIS_PROVINCE_MAX_HEALTH 1000000.0f
 
 /**TODO
  * 
@@ -28,7 +28,8 @@
         this->neighbors = std::vector<WagnisProvince*>();
         this->markerBillboard = nullptr;
         this->maxHealth_ = WAGNIS_PROVINCE_MAX_HEALTH;
-        this->health_ = WAGNIS_PROVINCE_MAX_HEALTH-10.0f; // <-- DEBUG
+        this->health_ = WAGNIS_PROVINCE_MAX_HEALTH;
+        
     }
     //Destructor
     WagnisProvince::~WagnisProvince(){