Changeset 12107

Timestamp:

Nov 15, 2018, 10:23:48 PM (6 years ago)

Author:

stadlero

Message:

Province is now a pawn

Location:

code/branches/wagnis_HS18

Files:

• data/levels/Wagnis.oxw (modified) (2 diffs)
• src/modules/wagnis/WagnisProvince.cc (modified) (3 diffs)
• src/modules/wagnis/WagnisProvince.h (modified) (3 diffs)

code/branches/wagnis_HS18/data/levels/Wagnis.oxw

@@ -10 +10 @@
   include("HUDTemplates3.oxo")
   include("templates/lodInformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipGhost.oxt")
+  include("templates/spaceshipSpacecruiser.oxt")
 ?>
 
@@ -46 +49 @@
 
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-    <SpawnPoint position="100, 45, 75" lookat="0, 45, 75" />
+
+    <SpawnPoint 
+    position="100, 45, 75" 
+    lookat="0, 45, 75"
+    spawnclass=SpaceShip
+    pawndesign=spaceshipAssff
+    />
 
 <WagnisGameboard position="0,0,0" connections_string="1=2+1000, 2=1, 1000=1">

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

@@ -5 +5 @@
 #include <vector>
 
+#define WAGNIS_PROVINCE_MAX_HEALTH 1000.0f
+
+/**TODO
+ * 
+ * 
+ * 
+ **/
+
 namespace orxonox
 {
@@ -10 +18 @@
 
     //Constructor
-    WagnisProvince::WagnisProvince(Context* context) : MovableEntity(context){
+    WagnisProvince::WagnisProvince(Context* context) : Pawn(context){
         RegisterObject(WagnisProvince);
         this->owner_ID = 0;
@@ -18 +26 @@
         this->neighbors = std::vector<WagnisProvince*>();
         this->markerBillboard = nullptr;
+        this->maxHealth_ = WAGNIS_PROVINCE_MAX_HEALTH;
+        this->health_ = WAGNIS_PROVINCE_MAX_HEALTH-10.0f; // <-- DEBUG
     }
     //Destructor
     WagnisProvince::~WagnisProvince(){
 
+    }
+
+    //Tick
+    void WagnisProvince::tick(float dt){
+        SUPER(WagnisProvince, tick, dt);
+
+        if(this->health_ < this->maxHealth_){
+            this->health_ = this->maxHealth_;
+            orxout() << "Health test ok" << endl;        }
     }
 

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

@@ -10 +10 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "worldentities/MovableEntity.h"
+#include "worldentities/pawns/Pawn.h"
 #include "graphics/Billboard.h"
 #include <vector>
@@ -17 +17 @@
 namespace orxonox
 {
-    class _WagnisExport WagnisProvince : public MovableEntity
+    class _WagnisExport WagnisProvince : public Pawn
     {
     public:
         WagnisProvince(Context*);
         virtual ~WagnisProvince();
+        void tick(float);
+
+
         virtual void XMLPort(Element&,XMLPort::Mode);
         void addMarkerBillboard(Billboard*);
@@ -38 +41 @@
         void addNeighbor(WagnisProvince*);
         std::vector<WagnisProvince*> neighbors;
+
  
         int owner_ID;