Changeset 12155 for code/branches

Timestamp:

Dec 5, 2018, 12:23:30 PM (6 years ago)

Author:

emustafa

Message:

fixed speed

Location:

code/branches/OrxoKart_HS18

Files:

• data/levels/templates/OrxoKartKart.oxt (modified) (2 diffs)
• data/tcl/orxokart_highscores.txt (modified) (1 diff)
• src/modules/orxokart/OrxoKart.cc (modified) (1 diff)
• src/modules/orxokart/OrxoKart.h (modified) (2 diffs)

code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt

@@ -25 +25 @@
    stallSpeed = 500;
 
-   boostPower            = 30
-   boostPowerRate        = 100
+   boostPower            = 10
+   boostPowerRate        = 1
    boostRate             = 5
    boostCooldownDuration = 10
@@ -77 +77 @@
    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
   >

code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt

@@ -13 +13 @@
 Name: 0:22:15s
 Name: 0:21:87s
+Name: 0:50:45s

code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc

@@ -180 +180 @@
         // 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));

code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h

@@ -42 +42 @@
 #include "gametypes/Gametype.h"
 #include "OrxoKartOrigin.h"
-
+#include "OrxoKartKart.h"
 namespace orxonox
 {
@@ -61 +61 @@
 
         private:
+            OrxoKartKart* player;
             WeakPtr<OrxoKartOrigin> origin_;
             OrxoKartFlag* flag_;