[Orxonox-commit 7782] r12374 - in code/branches/Boxhead_FS19: data/levels data/levels/templates src/modules/hover

[cwaupoti at orxonox.net]

Author: cwaupoti
Date: 2019-05-16 13:36:04 +0200 (Thu, 16 May 2019)
New Revision: 12374

Modified:
   code/branches/Boxhead_FS19/data/levels/Hover.oxw
   code/branches/Boxhead_FS19/data/levels/templates/spaceshipzombie.oxt
   code/branches/Boxhead_FS19/src/modules/hover/Hover.cc
Log:
changes enemy's spawn point

Modified: code/branches/Boxhead_FS19/data/levels/Hover.oxw
===================================================================
--- code/branches/Boxhead_FS19/data/levels/Hover.oxw	2019-05-16 11:23:16 UTC (rev 12373)
+++ code/branches/Boxhead_FS19/data/levels/Hover.oxw	2019-05-16 11:36:04 UTC (rev 12374)
@@ -82,7 +82,7 @@
       pawndesign=spaceshiphover
     />
 
-    <SpaceShip position="100,20,100" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="200" >
+    <SpaceShip position="500,20,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="200" >
                                     <templates>
                                             <Template link=spaceshipzombie />
                                       </templates>
@@ -98,6 +98,7 @@
                                        </controller>
     </SpaceShip>
 
+
     
   </Scene>
 </Level>

Modified: code/branches/Boxhead_FS19/data/levels/templates/spaceshipzombie.oxt
===================================================================
--- code/branches/Boxhead_FS19/data/levels/templates/spaceshipzombie.oxt	2019-05-16 11:23:16 UTC (rev 12373)
+++ code/branches/Boxhead_FS19/data/levels/templates/spaceshipzombie.oxt	2019-05-16 11:36:04 UTC (rev 12374)
@@ -35,8 +35,6 @@
    mass              = 100
    linearDamping     = 0.2
    angularDamping    = 0.9999999
-   collisiondamage = 100
-    enablecollisiondamage = true
 
 
   >

Modified: code/branches/Boxhead_FS19/src/modules/hover/Hover.cc
===================================================================
--- code/branches/Boxhead_FS19/src/modules/hover/Hover.cc	2019-05-16 11:23:16 UTC (rev 12373)
+++ code/branches/Boxhead_FS19/src/modules/hover/Hover.cc	2019-05-16 11:36:04 UTC (rev 12374)
@@ -35,30 +35,18 @@
 
 #include "HoverOrigin.h"
 #include "HoverWall.h"
-// #include "HoverFlag.h"
- #include "MazeGenerator.h"
+
+#include "MazeGenerator.h"
 #include "core/CoreIncludes.h"
-#include "core/input/KeyBinderManager.h"    
 
 
+
 namespace orxonox
 {
     RegisterUnloadableClass(Hover);
 
-
-
-
-
     Hover::Hover(Context* context) : Gametype(context)
     {
-        
-
-        // HoverKeyBinderManager::getInstance().setConfigValues();
-
-
-        // KeyBinderManager::getInstance().unbind("YNeg");
-        // KeyBinderManager::getInstance().unbind("YPos");
-
         RegisterObject(Hover);
 
         this->origin_ = nullptr;
@@ -106,10 +94,12 @@
             //     }   
             // }
 
+
+
             //Generate 5 flags randomly
             // for ( int i = 0; i < 5; i++ )
             // {
-            //     HoverFlag* flag = new HoverFlag(origin_->getContext());
+            //     HoverFlag* zombieship = new SpaceShip(origin_->getContext());
             //     flag->init(rand()%numCells, rand()%numCells, cellSize);
             //     flags_.push_back(flag);
             // }