Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11303


Ignore:
Timestamp:
Nov 21, 2016, 4:06:13 PM (8 years ago)
Author:
bberabi
Message:

blabla

Location:
code/branches/SpaceRace_HS16
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw

    r11289 r11303  
    1818  include("templates/lodInformation.oxt")
    1919  include("templates/fastship.oxt")
     20  include("templates/spaceshipPirate.oxt")
     21
     22  include("templates/spaceshipAssff.oxt")
    2023  include("templates/pickupRepresentationTemplates.oxt")
    2124
    … …  
    8184    <SpawnPoint position="0,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
    8285    </SpawnPoint>
    83 <SpawnPoint position="-50,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
     86<SpawnPoint position="-75,0,-50" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
    8487    </SpawnPoint>
    85 <SpawnPoint position="-100,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
     88<SpawnPoint position="-75,0,50" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
    8689    </SpawnPoint>
    87 <SpawnPoint position="-150,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
     90<SpawnPoint position="-150,0,-100" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
    8891    </SpawnPoint>
    89 <SpawnPoint position="-200,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
     92<SpawnPoint position="-15,0,100" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
    9093    </SpawnPoint>
    9194
    … …  
    229232
    230233
    231 <RaceCheckPoint name="checkpoint3" yaw=90 pitch=90 position="5000,100,300" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="2" islast="false" nextcheckpoints="3,-1,-1">
     234<RaceCheckPoint name="checkpoint3" yaw=90 pitch=90 position="5000,100,500" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="2" islast="false" nextcheckpoints="3,-1,-1">
    232235        <attached>
    233236      <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
    … …  
    269272
    270273
    271 <RaceCheckPoint name="checkpoint6" yaw=90 pitch=90 position="13000,100,100" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="5" islast="false" nextcheckpoints="6,-1,-1">
     274<RaceCheckPoint name="checkpoint6" yaw=90 pitch=90 position="13000,200,400" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="5" islast="false" nextcheckpoints="6,-1,-1">
    272275        <attached>
    273276      <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
    … …  
    309312
    310313
    311 <RaceCheckPoint name="checkpoint9" yaw=90 pitch=90 position="21000,120,-120" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="8" islast="false" nextcheckpoints="9,-1,-1">
     314<RaceCheckPoint name="checkpoint9" yaw=90 pitch=90 position="21000,200,-120" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="8" islast="false" nextcheckpoints="9,-1,-1">
    312315        <attached>
    313316      <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
    … …  
    347350
    348351
    349 <RaceCheckPoint name="checkpoint12" yaw=90 pitch=90 position="30000,-50,50" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="11" islast="false" nextcheckpoints="12,-1,-1">
    350         <attached>
    351       <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
    352     </attached>
    353     <collisionShapes>
    354         <BoxCollisionShape position="0,0,70"      halfExtents="70, 10, 10" />
    355         <BoxCollisionShape position="0,0,-70"     halfExtents="70, 10, 10" />
    356         <BoxCollisionShape position="70,0,0"      halfExtents="10, 10, 70" />
    357         <BoxCollisionShape position="-70,0,0"     halfExtents="10, 10, 70" />
    358     </collisionShapes>
    359     </RaceCheckPoint>
    360 
    361 
    362 <RaceCheckPoint name="checkpoint13" yaw=90 pitch=90 position="33000,80,60" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="12" islast="false" nextcheckpoints="13,-1,-1">
     352<RaceCheckPoint name="checkpoint12" yaw=90 pitch=90 position="30000,-300,900" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="11" islast="false" nextcheckpoints="12,-1,-1">
     353        <attached>
     354      <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
     355    </attached>
     356    <collisionShapes>
     357        <BoxCollisionShape position="0,0,70"      halfExtents="70, 10, 10" />
     358        <BoxCollisionShape position="0,0,-70"     halfExtents="70, 10, 10" />
     359        <BoxCollisionShape position="70,0,0"      halfExtents="10, 10, 70" />
     360        <BoxCollisionShape position="-70,0,0"     halfExtents="10, 10, 70" />
     361    </collisionShapes>
     362    </RaceCheckPoint>
     363
     364
     365<RaceCheckPoint name="checkpoint13" yaw=90 pitch=90 position="33000,600,60" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="12" islast="false" nextcheckpoints="13,-1,-1">
    363366        <attached>
    364367      <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
    … …  
    386389    </RaceCheckPoint>
    387390
    388 <RaceCheckPoint name="checkpoint15" yaw=90 pitch=90 position="38000,80,0" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="14" islast="false" nextcheckpoints="15,-1,-1">
    389         <attached>
    390       <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
    391     </attached>
    392     <collisionShapes>
    393         <BoxCollisionShape position="0,0,70"      halfExtents="70, 10, 10" />
    394         <BoxCollisionShape position="0,0,-70"     halfExtents="70, 10, 10" />
    395         <BoxCollisionShape position="70,0,0"      halfExtents="10, 10, 70" />
    396         <BoxCollisionShape position="-70,0,0"     halfExtents="10, 10, 70" />
    397     </collisionShapes>
    398     </RaceCheckPoint>
    399 
    400 <RaceCheckPoint name="checkpoint15" yaw=90 pitch=90 position="41000,30,-50" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="40" checkpointindex="14" islast="true">
     391<RaceCheckPoint name="checkpoint15" yaw=90 pitch=90 position="38000,-200,0" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="14" islast="false" nextcheckpoints="15,-1,-1">
     392        <attached>
     393      <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
     394    </attached>
     395    <collisionShapes>
     396        <BoxCollisionShape position="0,0,70"      halfExtents="70, 10, 10" />
     397        <BoxCollisionShape position="0,0,-70"     halfExtents="70, 10, 10" />
     398        <BoxCollisionShape position="70,0,0"      halfExtents="10, 10, 70" />
     399        <BoxCollisionShape position="-70,0,0"     halfExtents="10, 10, 70" />
     400    </collisionShapes>
     401    </RaceCheckPoint>
     402
     403<RaceCheckPoint name="checkpoint16" yaw=90 pitch=90 position="41000,30,-50" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="15" islast="true">
    401404        <attached>
    402405      <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
    … …  
    419422
    420423    <!--at checkpoint3-->
    421     <PickupSpawner pickup=mediumpeedpickup position="4800,100,300" triggerDistance="60" respawnTime="10" maxSpawnedItems="99" scale="8" />
    422424    <!--at checkpoint#6-->
     425    <!--at checkpoint#6--
     426
    423427    <PickupSpawner pickup=mediumshrinkpickup position="14800,0,0" triggerDistance="60" respawnTime="20" maxSpawnedItems="5" scale="8"/>
    424     <!--at checkpoint9-->
     428    <!--at checkpoint9
     429
     430
     431    <PickupSpawner pickup=smallspeedpickup position="3000,200,100" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" scale = "12" />
     432    <PickupSpawner pickup=mediumspeedpickup position="1000,30,0" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" scale = "12"/>
     433    <PickupSpawner pickup=hugespeedpickup position="5000,100,300" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" scale = "12" />
     434   
     435
     436
     437    <PickupSpawner pickup=smalljumppickup position="50,25,-125" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" />
     438
     439
     440
    425441    <PickupSpawner pickup=smallshrinkpickup position="20800,120,-120" triggerDistance="60" respawnTime="10" maxSpawnedItems="10" scale="8"/>
    426     <!--at checkpoint12-->
    427     <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="29800,-50,50" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
    428     <!--stray pickups-->
     442    <!--at checkpoint12
     443    <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="8000,-150,150" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
     444    <!--stray pickups-
    429445    <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="6000,-300,100" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
    430446    <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="9000,300,200" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
    431     <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="20000,-400,0" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
     447    <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="20000,-400,0" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/> -->
    432448
    433449  </Scene>

  • code/branches/SpaceRace_HS16/data/levels/templates/fastship.oxt

    r11276 r11303  
    2525
    2626
    27    boostPower            = 10
    28    boostPowerRate        = 10
    29    boostRate             = 10
    30    boostCooldownDuration = 10
     27   boostPower            = 8
     28   boostPowerRate        = 3
     29   boostRate             = 8
     30   boostCooldownDuration = 6
    3131
    3232   shakeFrequency = 50
    … …  
    8585<Template name=spaceshipassffengine baseclass=MultiStateEngine>
    8686  <MultiStateEngine
    87   boostfactor    = 10
     87  boostfactor    = 4
    8888
    89    speedfront     =  1000
    90    speedback      =  1000
     89   speedfront     =  3000
     90   speedback      =  1500
    9191   speedleftright =  50
    9292   speedupdown    =  50
    … …  
    9595   defEngineSndBoost = "sounds/Engine_high.ogg"
    9696   
    97    accelerationfront     = 300
     97   accelerationfront     = 400
    9898   accelerationbrake     = 300
    9999   accelerationback      = 125

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

    r11284 r11303  
    220220        for (unsigned int i = 0; i < amount; ++i)
    221221            this->botclass_.fabricate(this->getContext());
    222     }
    223 
     222   
     223
     224
     225
     226    }
    224227
    225228

  • code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc

    r11246 r11303  
    380380        //orxout(user_status) << "dt= " << dt << ";  distance= " << (lastPositionSpaceship-this->getControllableEntity()->getPosition()).length() <<std::endl;
    381381        lastPositionSpaceship = this->getControllableEntity()->getPosition();
     382       
     383this->boostControl();
    382384        this->moveToPosition(nextRaceCheckpoint_->getPosition());
    383385    }
Note: See TracChangeset for help on using the changeset viewer.