[Orxonox-commit 7467] r12073 - in code/branches/OrxoKart_HS18: data/levels/templates src/modules/hover

[emustafa at orxonox.net]

Author: emustafa
Date: 2018-11-07 10:13:31 +0100 (Wed, 07 Nov 2018)
New Revision: 12073

Modified:
   code/branches/OrxoKart_HS18/data/levels/templates/spaceshipHover.oxt
   code/branches/OrxoKart_HS18/src/modules/hover/Hover.cc
   code/branches/OrxoKart_HS18/src/modules/hover/HoverShip.cc
Log:
reverted hover files


Modified: code/branches/OrxoKart_HS18/data/levels/templates/spaceshipHover.oxt
===================================================================
--- code/branches/OrxoKart_HS18/data/levels/templates/spaceshipHover.oxt	2018-11-03 22:49:55 UTC (rev 12072)
+++ code/branches/OrxoKart_HS18/data/levels/templates/spaceshipHover.oxt	2018-11-07 09:13:31 UTC (rev 12073)
@@ -1,4 +1,3 @@
-
 <Template name=spaceshiphover>
   <SpaceShip
    hudtemplate            = spaceshiphoverhud
@@ -18,16 +17,16 @@
    reloadrate          = 2
    reloadwaittime      = 0.5
 
-   primaryThrust     = 600
-   auxilaryThrust    = 300
-   rotationThrust    = 50
+   primaryThrust     = 200
+   auxilaryThrust    = 30
+   rotationThrust    = 25
 
-   jumpBoost = 30
+   jumpBoost = 90
 
    lift = 1;
-   stallSpeed = 500;
+   stallSpeed = 220;
 
-   boostPower            = 30
+   boostPower            = 10
    boostPowerRate        = 1
    boostRate             = 5
    boostCooldownDuration = 10
@@ -79,7 +78,7 @@
   <MultiStateEngine
    boostfactor    = 2
 
-   speedfront     = 200
+   speedfront     = 90
    speedback      =  40
    speedleftright =  40
    speedupdown    =  40

Modified: code/branches/OrxoKart_HS18/src/modules/hover/Hover.cc
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/hover/Hover.cc	2018-11-03 22:49:55 UTC (rev 12072)
+++ code/branches/OrxoKart_HS18/src/modules/hover/Hover.cc	2018-11-07 09:13:31 UTC (rev 12073)
@@ -69,20 +69,8 @@
             MazeGenerator generator(numCells);
             generator.generateMaze();
             generator.renderMaze();
-            int levelcodeArray[] = {1,1,1,1,1,1,1,1,0,0,0
-                                    ,1,0,0,0,0,0,0,1,1,1,0
-                                    ,1,0,1,1,1,1,0,0,0,1,1
-                                    ,1,1,1,0,0,1,1,0,0,0,1
-                                    ,0,0,0,0,0,0,1,0,1,1,1
-                                    ,1,1,1,1,1,1,1,0,1,0,0
-                                    ,1,0,0,0,0,0,0,0,1,0,0
-                                    ,1,0,0,0,0,0,0,0,1,0,0
-                                    ,1,1,1,1,1,0,0,0,1,1,1
-                                    ,0,0,0,0,1,0,0,0,0,0,1
-                                    ,0,0,0,0,1,1,1,1,1,1,1};
-            //int* levelcode = generator.getLevelcode();
-            int* levelcode = levelcodeArray;
 
+            int* levelcode = generator.getLevelcode();
 
             //Outer Walls
             for(int i = 0; i<numCells; i++){
@@ -98,8 +86,8 @@
                     switch(levelcode[ y * numCells + x ]){
                         case 1: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
                                 break;
-                        //case 3: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
-                        //case 2: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 0);
+                        case 3: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
+                        case 2: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 0);
                         default: break;
                     }
                 }   

Modified: code/branches/OrxoKart_HS18/src/modules/hover/HoverShip.cc
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/hover/HoverShip.cc	2018-11-03 22:49:55 UTC (rev 12072)
+++ code/branches/OrxoKart_HS18/src/modules/hover/HoverShip.cc	2018-11-07 09:13:31 UTC (rev 12073)
@@ -48,30 +48,21 @@
     }
 
     void HoverShip::moveFrontBack(const Vector2& value)
-        { 
-            this->steering_.z -= value.x; 
-            orxout() << "mFB" << endl;
-        }
+        { this->steering_.z -= value.x; }
 
     void HoverShip::moveRightLeft(const Vector2& value)
-        { 
-            this->rotateYaw(value);
-            orxout() << "mRL" << endl;
-        }
+        { this->steering_.x += value.x; }
 
     void HoverShip::moveUpDown(const Vector2& value)
-        { 
-            this->steering_.y += value.x; 
-            orxout() << "mUD" << endl;
-        }
+        { this->steering_.y += value.x; }
 
     void HoverShip::rotateYaw(const Vector2& value)
-        {
-            this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() - value.x);
-            //orxout() << value;
-            Pawn::rotateYaw(value);
-        }
+    {
+        this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() + value.x);
 
+        Pawn::rotateYaw(value);
+    }
+
     void HoverShip::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
         SUPER(HoverShip, XMLPort, xmlelement, mode);