Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8851 for code/branches


Ignore:
Timestamp:
Aug 21, 2011, 6:52:33 PM (13 years ago)
Author:
jo
Message:

Added docking part & powerful spaceship to the level. Some DockingController bugs have to be erased though.

Location:
code/branches/ai2
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/ai2/data/levels/missionOne.oxw

    r8847 r8851  
    1111  include("templates/spaceshipAssff.oxt")
    1212  include("templates/spaceshipPirate.oxt")
     13  include("templates/spaceshipSpacecruiser.oxt")
    1314?>
    1415
    … …  
    4647
    4748    <WorldAmbientSound
    48       ambientSource="AlphaCentauri.ogg"
     49      ambientSource="Jupiter.ogg"
    4950      looping="true"
    5051      playOnLoad="true"
    5152    />
    52 
     53<!-- AlphaCentauri.ogg-->
    5354    <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"/>
    5455    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    … …  
    360361      <attached>
    361362        <!-- Docking -->
    362         <!--DistanceTriggerBeacon name="bcnDestroyer" />
    363         <DockingTarget name="destroyer" /-->
     363        <DistanceTriggerBeacon name="bcnDestroyer" />
     364        <DockingTarget name="destroyer" />
    364365
    365366        <Model mesh="HydroHarvester.mesh" mass=10 position="0,0,0" scale=50 />
    … …  
    401402    </SpaceShip>
    402403
     404    <Billboard position="-48600,0,0" material="Examples/Flare" colour="0.6,0,0" scale=3/>
     405    <Dock position="-48600,0,0" roll=90 yaw=180 >
     406        <animations>
     407            <MoveToDockingTarget target="destroyer" />
     408        </animations>
     409        <effects>
     410            <DockToShip target="spaceShip" />
     411        </effects>
     412        <events>
     413            <execute>
     414                <EventListener event="dockMe" />
     415            </execute>
     416        </events>
     417        <attached>
     418            <DistanceTrigger position="10,-202, -42" distance="800" target="Pawn"
     419                beaconMode="exclude" targetname="bcnDestroyer" name="dockMe"
     420            />
     421        </attached>
     422    </Dock>
     423
     424    <SpaceShip template="spaceshipspacecruiser" position="-48600,800,0" orientation="-0.14, 0.68, 0.68, 0.223" health="300" maxhealth="400" initialhealth="300">
     425      <attached>
     426        <DockingTarget name="spaceShip" />
     427      </attached>
     428    </SpaceShip>
     429
     430
     431
     432
    403433
    404434
    405435<!-- Pickup - find better place !! -->
    406     <DistanceTrigger name="pickupShield" position="-49300,100,0" target="Pawn" distance=20 stayActive="true" delay=0 />
    407     <SimpleNotification message="This pickup enhances your shield.">
    408         <events>
    409             <trigger>
    410                 <EventListener event=pickupShield />
    411             </trigger>
    412         </events>
    413     </SimpleNotification>
    414 
    415     <PickupSpawner position="-49300,100,0" triggerDistance="20" respawnTime="30" maxSpawnedItems="1">
     436    <DistanceTrigger name="pickup" position="-49300,-100,-50" target="Pawn" distance=20 stayActive="true" delay=0 />
     437    <SimpleNotification message="This pickup makes you temporarly small.">
     438        <events>
     439            <trigger>
     440                <EventListener event=pickup />
     441            </trigger>
     442        </events>
     443    </SimpleNotification>
     444
     445    <PickupSpawner position="-49300,-100,-50" triggerDistance="20" respawnTime="30" maxSpawnedItems="1">
    416446      <pickup>
    417         <ShieldPickup template=hugeshieldpickup />
     447        <ShieldPickup template=hugeshrinkpickup />
    418448      </pickup>
    419449    </PickupSpawner>
    … …  
    442472      </attached-->  <!-- Forcefield kills HYDROGEN FARMER-->
    443473      <collisionShapes>
    444         <SphereCollisionShape radius="2350" position="0,0,0" /> <!-- Nasty: Collisionradius =! planet scale -->
     474        <SphereCollisionShape radius="2400" position="0,0,0" /> <!-- Nasty: Collisionradius =! planet scale -->
    445475      </collisionShapes>
    446476    </Planet>
    … …  
    448478
    449479<!--------------------------------------DUMP YARD --------------------------------------->
    450 <!-- TODO: Docking causes game to crash !! what went wrong ?? -->
    451     <!-- Dock position="-48600,1288,-255" roll=90 yaw=180 >
    452         <animations>
    453             <MoveToDockingTarget target="destroyer" />
    454         </animations>
    455         <effects>
    456             <DockToShip target="spaceShip" />
    457         </effects>
    458         <events>
    459             <execute>
    460                 <EventListener event="dockMe" />
    461             </execute>
    462         </events>
    463         <attached>
    464             <DistanceTrigger position="10,-202, -42" distance="800" target="Pawn"
    465                 beaconMode="exclude" targetname="bcnDestroyer" name="dockMe"
    466             />
    467             <Billboard position="0,0,0" material="Examples/Flare" colour="0.5,0,0" scale=3/>
    468         </attached>
    469     </Dock>
    470 
    471     <SpaceShip template="spaceshipassff" position="-48600,5000,67" orientation="-0.14045, 0.68254, 0.68144, 0.223774" >
    472       <attached>
    473         <DockingTarget name="spaceShip" />
    474       </attached>
    475     </SpaceShip-->
    476480
    477481
    … …  
    519523
    520524
    521 
    522525<!-- Idea: Pawndeath should trigger several , delayed events. -->
    523526    <!--EventTrigger name="PawnDied4" >

  • code/branches/ai2/data/levels/presentationFS11.oxw

    r8847 r8851  
    5454
    5555    <!-- SOUND -->
    56     <WorldAmbientSound source="Jupiter.ogg" looping="true" playOnLoad="true"/>
     56    <WorldAmbientSound source="Earth.ogg" looping="true" playOnLoad="true" />
     57    <WorldAmbientSound source="Mars.ogg" looping="true">
     58        <events>
     59            <activity>
     60                <DistanceTrigger position="-72369,803,2" distance=1700 target="Camera" />
     61            </activity>
     62        </events>
     63    </WorldAmbientSound>
     64    <WorldAmbientSound source="Jupiter.ogg" looping="true">
     65        <events>
     66            <activity>
     67                <DistanceTrigger position="-73450,5067,-351" distance=800 target="Camera" />
     68            </activity>
     69        </events>
     70    </WorldAmbientSound>
    5771
    5872    <!-- EARTH ORBIT -->

  • code/branches/ai2/src/orxonox/controllers/ArtificialController.cc

    r8845 r8851  
    957957    bool ArtificialController::sameTeam(ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gametype)
    958958    {
     959        if(!entity1 || !entity2)
     960            return true;
    959961        if (entity1 == entity2)
    960962            return true;
Note: See TracChangeset for help on using the changeset viewer.