Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11840


Ignore:
Timestamp:
Mar 29, 2018, 3:57:54 PM (6 years ago)
Author:
arismu
Message:

Changed velocity bots, steering stabilized

Location:
code/branches/RacingBots_FS18
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • code/branches/RacingBots_FS18/data/levels/presentationHS12.oxw

    r10624 r11840  
    6161
    6262    <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"/>
    63     <SpawnPoint team=0 position="-900,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
     63    <SpawnPoint team=0 position="-900,0,0" lookat="0,0,0" primaryThrust=1000 spawnclass=SpaceShip pawndesign=spaceshipescort />
    6464    <!--SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=bigship /-->
    6565    <!--SpawnPoint team=0 position="-900,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipcollateraldamage /-->
    … …  
    328328        roll                = "180"
    329329        name                = "collateralDamage"
    330         radarname           = "Collateral Damage" >
    331         <!--
     330        radarname           = "Collateral Damage"
    332331        pitch               = "90"
    333         yaw                 = "0"-->
     332        yaw                 = "100"
     333        primaryThrust       = "2000">
    334334      <attached>
    335335        <DockingTarget name="spaceShip" />

  • code/branches/RacingBots_FS18/data/levels/templates/spaceshipCollateralDamage.oxt

    r11052 r11840  
    1919   shieldrechargewaittime = 1
    2020
    21    primaryThrust     = 100
     21   primaryThrust     = 1000
    2222   auxilaryThrust    = 30
    2323   rotationThrust    = 50
    … …  
    2929   boostPowerRate        = 1
    3030   boostRate             = 5
    31    boostCooldownDuration = 10
     31   boostCooldownDuration = 1
    3232
    3333   shakeFrequency = 15
    … …  
    3636   collisionType     = "dynamic"
    3737   mass              = 100
    38    linearDamping     = 0.7
     38   linearDamping     = 0.5
    3939   angularDamping    = 0.9999999
    4040  >

  • code/branches/RacingBots_FS18/src/libraries/tools/Timer.cc

    r11071 r11840  
    199199        executor->getFunctor()->setSafeMode(true);
    200200    }
     201
     202    /*void Timer::setTimer(float interval, bool bKillAfterCall)
     203    {
     204         this->setInterval(interval);
     205         this->bActive_ = true;
     206         this->time_ = this->interval_;
     207        this->bKillAfterCall_ = bKillAfterCall;
     208    }
     209    */
    201210
    202211    /**

  • code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc

    r11721 r11840  
    7171#include <vector>
    7272
    73 
    7473namespace orxonox
    7574{
    … …  
    138137        }
    139138
     139
    140140        std::string message("Use headphones to hear the countdown!");
    141141        this->getGametypeInfo()->sendAnnounceMessage(message);
    142142        ChatManager::message(message);
     143
     144
    143145
    144146        //after 11 seconds , countdownFinished function is called to activate bots` engines
    145147        Timer* countdownTimer = new Timer();
    146148        countdownTimer->setTimer(11, false, createExecutor(createFunctor(&SpaceRace::countdownFinished, this)));
    147     }
    148 
     149       
     150    }
    149151
    150152

  • code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.h

    r11720 r11840  
    6060            virtual void end() override;
    6161            virtual void countdownFinished();
     62           
    6263            virtual void addBots(unsigned int amount) override; //<! overwrite function in order to bypass the addbots command.
    6364

  • code/branches/RacingBots_FS18/src/orxonox/items/Engine.cc

    r11071 r11840  
    5454        this->relativePosition_ = Vector3::ZERO;
    5555
    56         this->boostFactor_ = 1.5f;
     56        this->boostFactor_ = 1.2f;
    5757
    5858        this->maxSpeedFront_ = 0.0f;
    … …  
    6161        this->maxSpeedUpDown_ = 0.0f;
    6262
    63         this->accelerationFront_ = 0.0f;
     63        this->accelerationFront_ = 1.0f;
    6464        this->accelerationBrake_ = 0.0f;
    6565        this->accelerationBack_ = 0.0f;
    … …  
    6868
    6969        this->speedAdd_ = 0.0f;
    70         this->speedMultiply_ = 1.0f;
     70        this->speedMultiply_ = 1.8f;                       //////////////////////////////////////////
    7171
    7272        this->setConfigValues();

  • code/branches/RacingBots_FS18/src/orxonox/worldentities/pawns/SpaceShip.h

    r11052 r11840  
    103103            */
    104104            virtual void moveFrontBack(const Vector2& value)
    105                 { this->steering_.z -= value.x; }
     105                { this->steering_.z -= (0.8)*value.x; }
    106106            /**
    107107            @brief Move right or left.
    … …  
    109109            */
    110110            virtual void moveRightLeft(const Vector2& value)
    111                 { this->steering_.x += value.x; }
     111                { this->steering_.x += (0.6)*value.x; }
    112112            /**
    113113            @brief Move up or down.
    … …  
    115115            */
    116116            virtual void moveUpDown(const Vector2& value)
    117                 { this->steering_.y += value.x; }
     117                { this->steering_.y += (0.6)*value.x; }
    118118
    119119            virtual void rotateYaw(const Vector2& value); // Rotate in yaw direction.
Note: See TracChangeset for help on using the changeset viewer.