[Orxonox-commit 7552] r12155 - in code/branches/OrxoKart_HS18: data/levels/templates data/tcl src/modules/orxokart

[emustafa at orxonox.net]

Author: emustafa
Date: 2018-12-05 12:23:30 +0100 (Wed, 05 Dec 2018)
New Revision: 12155

Modified:
   code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt
   code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt
   code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc
   code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h
Log:
fixed speed

Modified: code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt
===================================================================
--- code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt	2018-12-05 11:08:14 UTC (rev 12154)
+++ code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt	2018-12-05 11:23:30 UTC (rev 12155)
@@ -24,8 +24,8 @@
    lift = 1;
    stallSpeed = 500;
 
-   boostPower            = 30
-   boostPowerRate        = 100
+   boostPower            = 10
+   boostPowerRate        = 1
    boostRate             = 5
    boostCooldownDuration = 10
 
@@ -76,15 +76,15 @@
   <MultiStateEngine
    boostfactor    = 2
 
-   speedfront     = 300
+   speedfront     =  300
    speedback      =  40
-   speedleftright =  40
+   speedleftright =  300
    speedupdown    =  40
 
    accelerationfront     = 300
-   accelerationbrake     = 50
+   accelerationbrake     = 300
    accelerationback      =  125
-   accelerationleftright =  0
+   accelerationleftright =  125
    accelerationupdown    =  125
   >
     <EffectContainer condition="not idle">

Modified: code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt
===================================================================
--- code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt	2018-12-05 11:08:14 UTC (rev 12154)
+++ code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt	2018-12-05 11:23:30 UTC (rev 12155)
@@ -12,3 +12,4 @@
 Name: 0:21:15s
 Name: 0:22:15s
 Name: 0:21:87s
+Name: 0:50:45s

Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc	2018-12-05 11:08:14 UTC (rev 12154)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc	2018-12-05 11:23:30 UTC (rev 12155)
@@ -179,7 +179,7 @@
 
         // Check if ship collided with the flag
         if(flag_->getCollided()){
-            OrxoKartKart* player = flag_->getObjectofCollision();
+            player = flag_->getObjectofCollision();
             if (level == 1)
                 player->setPosition(Vector3(s*0, 20, s*8.5));
             if (level == 2)

Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h	2018-12-05 11:08:14 UTC (rev 12154)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h	2018-12-05 11:23:30 UTC (rev 12155)
@@ -41,7 +41,7 @@
 
 #include "gametypes/Gametype.h"
 #include "OrxoKartOrigin.h"
-
+#include "OrxoKartKart.h"
 namespace orxonox
 {
     class _OrxoKartExport OrxoKart : public Gametype
@@ -60,6 +60,7 @@
                 { return this->numberOfShrooms; }   
 
         private:
+            OrxoKartKart* player;
             WeakPtr<OrxoKartOrigin> origin_;
             OrxoKartFlag* flag_;
             std::vector<OrxoKartTile*> tiles;