Changeset 11840 for code/branches/RacingBots_FS18
- Timestamp:
- Mar 29, 2018, 3:57:54 PM (7 years ago)
- Location:
- code/branches/RacingBots_FS18
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/RacingBots_FS18/data/levels/presentationHS12.oxw
r10624 r11840 61 61 62 62 <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 /> 64 64 <!--SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=bigship /--> 65 65 <!--SpawnPoint team=0 position="-900,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipcollateraldamage /--> … … 328 328 roll = "180" 329 329 name = "collateralDamage" 330 radarname = "Collateral Damage" > 331 <!-- 330 radarname = "Collateral Damage" 332 331 pitch = "90" 333 yaw = "0"--> 332 yaw = "100" 333 primaryThrust = "2000"> 334 334 <attached> 335 335 <DockingTarget name="spaceShip" /> -
code/branches/RacingBots_FS18/data/levels/templates/spaceshipCollateralDamage.oxt
r11052 r11840 19 19 shieldrechargewaittime = 1 20 20 21 primaryThrust = 100 21 primaryThrust = 1000 22 22 auxilaryThrust = 30 23 23 rotationThrust = 50 … … 29 29 boostPowerRate = 1 30 30 boostRate = 5 31 boostCooldownDuration = 1 031 boostCooldownDuration = 1 32 32 33 33 shakeFrequency = 15 … … 36 36 collisionType = "dynamic" 37 37 mass = 100 38 linearDamping = 0. 738 linearDamping = 0.5 39 39 angularDamping = 0.9999999 40 40 > -
code/branches/RacingBots_FS18/src/libraries/tools/Timer.cc
r11071 r11840 199 199 executor->getFunctor()->setSafeMode(true); 200 200 } 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 */ 201 210 202 211 /** -
code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc
r11721 r11840 71 71 #include <vector> 72 72 73 74 73 namespace orxonox 75 74 { … … 138 137 } 139 138 139 140 140 std::string message("Use headphones to hear the countdown!"); 141 141 this->getGametypeInfo()->sendAnnounceMessage(message); 142 142 ChatManager::message(message); 143 144 143 145 144 146 //after 11 seconds , countdownFinished function is called to activate bots` engines 145 147 Timer* countdownTimer = new Timer(); 146 148 countdownTimer->setTimer(11, false, createExecutor(createFunctor(&SpaceRace::countdownFinished, this))); 147 }148 149 150 } 149 151 150 152 -
code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.h
r11720 r11840 60 60 virtual void end() override; 61 61 virtual void countdownFinished(); 62 62 63 virtual void addBots(unsigned int amount) override; //<! overwrite function in order to bypass the addbots command. 63 64 -
code/branches/RacingBots_FS18/src/orxonox/items/Engine.cc
r11071 r11840 54 54 this->relativePosition_ = Vector3::ZERO; 55 55 56 this->boostFactor_ = 1. 5f;56 this->boostFactor_ = 1.2f; 57 57 58 58 this->maxSpeedFront_ = 0.0f; … … 61 61 this->maxSpeedUpDown_ = 0.0f; 62 62 63 this->accelerationFront_ = 0.0f;63 this->accelerationFront_ = 1.0f; 64 64 this->accelerationBrake_ = 0.0f; 65 65 this->accelerationBack_ = 0.0f; … … 68 68 69 69 this->speedAdd_ = 0.0f; 70 this->speedMultiply_ = 1. 0f;70 this->speedMultiply_ = 1.8f; ////////////////////////////////////////// 71 71 72 72 this->setConfigValues(); -
code/branches/RacingBots_FS18/src/orxonox/worldentities/pawns/SpaceShip.h
r11052 r11840 103 103 */ 104 104 virtual void moveFrontBack(const Vector2& value) 105 { this->steering_.z -= value.x; }105 { this->steering_.z -= (0.8)*value.x; } 106 106 /** 107 107 @brief Move right or left. … … 109 109 */ 110 110 virtual void moveRightLeft(const Vector2& value) 111 { this->steering_.x += value.x; }111 { this->steering_.x += (0.6)*value.x; } 112 112 /** 113 113 @brief Move up or down. … … 115 115 */ 116 116 virtual void moveUpDown(const Vector2& value) 117 { this->steering_.y += value.x; }117 { this->steering_.y += (0.6)*value.x; } 118 118 119 119 virtual void rotateYaw(const Vector2& value); // Rotate in yaw direction.
Note: See TracChangeset
for help on using the changeset viewer.