Changeset 7063 for code/branches/presentation3
- Timestamp:
- May 31, 2010, 5:21:40 PM (14 years ago)
- Location:
- code/branches/presentation3
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3/data/levels/gametype_dynamicmatch.oxw
r7062 r7063 57 57 createSpaceStationPar(0,2,1,2,1,4,1,50) 58 58 ?> 59 <TeamSpawnPoint team=2 position="20,20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceship ghost/>60 <TeamSpawnPoint team=2 position="-20,-20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceship ghost/>61 <TeamSpawnPoint team=2 position="-10,10,20" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceship ghost/>59 <TeamSpawnPoint team=2 position="20,20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/> 60 <TeamSpawnPoint team=2 position="-20,-20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/> 61 <TeamSpawnPoint team=2 position="-10,10,20" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/> 62 62 </attached> 63 63 </StaticEntity> -
code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc
r7062 r7063 82 82 this->pointsPerTime=0.0f; 83 83 this->setHUDTemplate("DynamicmatchHUD"); 84 this->allowDeath=false;85 this->notYet=true;86 84 } 87 85 … … 121 119 setPlayerColour(victim->getPlayer()); //victim's new colour 122 120 numberOf[piggy]++; //party switch: number of players is not affected (decrease and increase) 123 124 if (target == killer)125 {126 allowDeath=true;127 victim->kill(); //new ship128 }129 121 130 122 if(tutorial) //announce party switch … … 143 135 setPlayerColour(originator->getPlayer()); //originator's new colour 144 136 numberOf[killer]++; 145 allowDeath=true; 146 originator->kill(); //new ship for killer 137 147 138 if(tutorial) //announce party switch 148 139 { … … 175 166 numberOf[killer]++; //party switch: number of players is not affected (decrease and increase) 176 167 177 allowDeath=true; 178 originator->kill(); //new ship 168 179 169 if(tutorial) //announce party switch 180 170 { … … 195 185 setPlayerColour(victim->getPlayer()); //victim colour 196 186 numberOf[chaser]++; //party switch: number of players is not affected (decrease and increase) 197 198 allowDeath=true;199 victim->kill(); //new ship200 187 201 188 if(tutorial) //announce party switch … … 279 266 setPlayerColour(originator->getPlayer()); //originator colour 280 267 281 notYet=false;282 allowDeath=true;283 victim->kill(); //new ship284 originator->kill(); //new ship285 286 287 268 if(tutorial) //Announce pary switch 288 269 { … … 318 299 bool Dynamicmatch::allowPawnDeath(Pawn* victim, Pawn* originator) 319 300 { 320 if (allowDeath)//Hack for Ghost-Spaceship321 {322 if (notYet)323 {allowDeath=false;}324 else325 {notYet=true;}326 return true;327 }328 301 //killers can kill chasers and killers can be killed by chasers 329 302 if ((playerParty_[originator->getPlayer()] == killer && playerParty_[victim->getPlayer()] == chaser)||(playerParty_[victim->getPlayer()] == killer && … … 395 368 { pointsPerTime =pointsPerTime + dt; 396 369 gameTime_ = gameTime_ - dt; 397 if (pointsPerTime > 3.0f)//hard coded!! should be changed370 if (pointsPerTime > 2.0f)//hard coded!! should be changed 398 371 { 399 372 pointsPerTime=0.0f; -
code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.h
r7062 r7063 79 79 protected: 80 80 81 bool allowDeath;82 bool notYet;83 81 std::map< PlayerInfo*, int > playerParty_; //player's parties are recorded here 84 82 std::vector<ColourValue> partyColours_; //aus TeamDeathmatch
Note: See TracChangeset
for help on using the changeset viewer.