Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8838 for code/branches


Ignore:
Timestamp:
Aug 13, 2011, 11:21:03 PM (13 years ago)
Author:
jo
Message:

Minor level changes. Questmenu pauses game now.

Location:
code/branches/ai2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ai2/data/gui/scripts/QuestGUI.lua

    r8706 r8838  
    3030    -- Load the list of quests to be displayed.
    3131    P.loadQuestsList(P.currentQuest)
     32    -- Pause the game - possible conflict for multiplayer quests
     33    orxonox.execute("setPause 1")
     34end
     35
     36function P.onQuit()
     37    orxonox.execute("setPause 0")
    3238end
    3339
  • code/branches/ai2/data/levels/missionOne.oxw

    r8824 r8838  
    4545    ?>
    4646
     47    <WorldAmbientSound
     48      ambientSource="AlphaCentauri.ogg"
     49      looping="true"
     50      playOnLoad="true"
     51    />
     52
    4753    <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"/>
    4854    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
     
    7884-->
    7985<!-------------------------------------- PART ONE: Destroy boxes --------------------------------------->
    80     <DistanceTrigger name="spawndelaytrigger1" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=1 />
     86    <DistanceTrigger name="spawndelaytrigger1" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=2 />
    8187    <SimpleNotification message="Destroy those four boxes.">
    8288        <events>
     
    8793    </SimpleNotification>
    8894
    89     <DistanceTrigger name="spawndelaytrigger2" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=2 />
     95    <DistanceTrigger name="spawndelaytrigger2" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=5 />
    9096    <SimpleNotification message=" 1. Aim the a the red cycle.">
    9197        <events>
     
    96102    </SimpleNotification>
    97103
    98     <DistanceTrigger name="spawndelaytrigger3" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=4 />
     104    <DistanceTrigger name="spawndelaytrigger3" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=8 />
    99105    <SimpleNotification message="2. Click! (hold the left mouse button)">
    100106        <events>
     
    105111    </SimpleNotification>
    106112
    107 <!-- BRIEFING END // Interactive briefing start -->
     113<!-- static briefing END // Interactive briefing start -->
    108114
    109115  <SimpleNotification message="Right click on the next target." broadcast="true">
     
    152158    </SimpleNotification>
    153159
    154   <SimpleNotification message="Well done. Now press 'W'." broadcast="true">
     160  <SimpleNotification message="Fly towards the pirates. Press 'W'." broadcast="true">
    155161        <events>
    156162            <trigger>
     
    169175
    170176<!--------------------------------------PART TWO: Moving targets --------------------------------------->
    171 
    172     <SpaceShip position="0,1500,200" lookat="0,0,0">
    173       <templates>
    174         <Template link=spaceshippirate />
    175       </templates>
    176       <controller>
    177         <WaypointController>
    178           <waypoints>
    179             <Model mesh="cube.mesh" scale=8 position="  0,1300,-200" />
    180             <Model mesh="cube.mesh" scale=8 position="  0,1300,-700" />
    181             <Model mesh="cube.mesh" scale=8 position="500,1300,-700" />
    182             <Model mesh="cube.mesh" scale=8 position="500,1300,-200" />
    183           </waypoints>
    184         </WaypointController>
    185       </controller>
    186     </SpaceShip>
    187     <PickupSpawner position="250,1300,-450" triggerDistance="10" respawnTime="30" maxSpawnedItems="1">
    188       <pickup>
    189         <DronePickup template=dronepickup />
    190       </pickup>
    191     </PickupSpawner>
    192 
    193     <SpaceShip position="0,1500,400" lookat="0,0,0">
    194       <templates>
    195         <Template link=spaceshippirate />
    196       </templates>
    197       <controller>
    198         <WaypointController>
    199           <waypoints>
    200             <Model mesh="cube.mesh" scale=8 position="  0,1300,1000" />
    201             <Model mesh="cube.mesh" scale=8 position="  0,1300,500" />
    202             <Model mesh="cube.mesh" scale=8 position="500,1300,500" />
    203             <Model mesh="cube.mesh" scale=8 position="500,1300, 1000" />
    204           </waypoints>
    205         </WaypointController>
    206       </controller>
    207     </SpaceShip>
    208 
     177    <DistanceTrigger name="movingtargets" position="0,500,0" target="Pawn" distance=180 stayActive="true" delay=2 />
     178    <Billboard position="0,500,0" material="Examples/Flare" colour="0.5,0,0" scale=3/>
     179    <SimpleNotification message="Try to hit the pirates while you are flying.">
     180        <events>
     181            <trigger>
     182                <EventListener event=movingtargets />
     183            </trigger>
     184        </events>
     185    </SimpleNotification>
     186
     187
     188
     189  <SimpleNotification message="Now get the other one." broadcast="true">
     190        <events>
     191            <trigger>
     192                <SpaceShip position="0,2000,200" lookat="0,0,0">
     193                    <templates>
     194                      <Template link=spaceshippirate />
     195                    </templates>
     196                    <controller>
     197                      <WaypointController>
     198                         <waypoints>
     199                          <Model mesh="cube.mesh" scale=8 position="  0,1700,-200" />
     200                          <Model mesh="cube.mesh" scale=8 position="  0,1700,-700" />
     201                          <Model mesh="cube.mesh" scale=8 position="500,1700,-700" />
     202                          <Model mesh="cube.mesh" scale=8 position="500,1700,-200" />
     203                       </waypoints>
     204                    </WaypointController>
     205                  </controller>
     206                </SpaceShip>
     207            </trigger>
     208        </events>
     209    </SimpleNotification>
     210
     211  <SimpleNotification message="Fly towards the space station (grey dot)." broadcast="true">
     212        <events>
     213            <trigger>
     214                <SpaceShip position="0,2000,400" lookat="0,0,0">
     215                  <templates>
     216                    <Template link=spaceshippirate />
     217                  </templates>
     218                  <controller>
     219                    <WaypointController>
     220                      <waypoints>
     221                        <Model mesh="cube.mesh" scale=8 position="  0,2400,1000" />
     222                        <Model mesh="cube.mesh" scale=8 position="  0,2400,500" />
     223                        <Model mesh="cube.mesh" scale=8 position="500,2400,500" />
     224                        <Model mesh="cube.mesh" scale=8 position="500,2400, 1000" />
     225                      </waypoints>
     226                    </WaypointController>
     227                  </controller>
     228                </SpaceShip>
     229            </trigger>
     230        </events>
     231    </SimpleNotification>
    209232
    210233<!--------------------------------------PART THREE: to the space station --------------------------------------->
     
    218241    </SimpleNotification>
    219242
    220     <DistanceTrigger name="duball2" position="-1000,-300,700" target="Pawn" distance=700 stayActive="true" delay=4 />
     243    <DistanceTrigger name="duball2" position="-1000,-300,700" target="Pawn" distance=700 stayActive="true" delay=5 />
    221244    <SimpleNotification message="Warning: Something big is coming.">
    222245        <events>
     
    227250    </SimpleNotification>
    228251
    229     <DistanceTrigger name="duball2" position="-1000,-300,700" target="Pawn" distance=700 stayActive="true" delay=6 />
    230     <SimpleNotification message="Be on your guard!">
     252    <!--DistanceTrigger name="duball3" position="-1000,-300,700" target="Pawn" distance=700 stayActive="true" delay=9 />
     253    <SimpleNotification message="Get some help,  before it is too late.">
    231254        <events>
    232255            <trigger>
     
    234257            </trigger>
    235258        </events>
    236     </SimpleNotification>
     259    </SimpleNotification-->
     260
     261    <DistanceTrigger name="duball4" position="-1000,-300,700" target="Pawn" distance=700 stayActive="true" delay=10 />
     262    <SimpleNotification message="Use the portals to get help. (grey dot)">
     263        <events>
     264            <trigger>
     265                <EventListener event=duball4 />
     266            </trigger>
     267        </events>
     268    </SimpleNotification>
     269
     270
     271
     272<!-- PORTALS -->
     273    <Template name=PortalDefault>
     274        <PortalEndPoint>
     275            <attached>
     276                <Billboard material="Portals/Default" />
     277            </attached>
     278        </PortalEndPoint>
     279    </Template>
     280
     281    <PortalEndPoint position="-1400,-500,800" id="1" distance="40" target="MobileEntity" design="PortalDefault">
     282        <!--events>
     283            <visibility>
     284                <EventListener event=portal />
     285            </visibility>
     286        </events-->
     287    </PortalEndPoint>
     288
     289    <PortalEndPoint position="-40000,0,0" id="2" distance="40" target="MobileEntity" design="PortalDefault" />
     290    <PortalLink fromID="1" toID="2" />
     291    <PortalLink fromID="2" toID="1" />
     292<!-- PORTALS END-->
     293
     294
    237295
    238296<StaticEntity position="-1000,-300,700" collisionType=static>
     
    269327    </SpaceShip -->
    270328
    271 <!--------------------------------------PART FOUR --------------------------------------->
     329<!-------------------------------------- PART FOUR : Get Help --------------------------------------->
     330    <PickupSpawner position="-40400,100,0" triggerDistance="10" respawnTime="30" maxSpawnedItems="1">
     331      <pickup>
     332        <DronePickup template=dronepickup />
     333      </pickup>
     334    </PickupSpawner>   
     335
     336
     337
     338
     339
     340    <Planet
     341      position="-50000,0,0"
     342      scale="1000"
     343      collisionType="dynamic"
     344      linearDamping="0.8"
     345      angularDamping="0"
     346      mass="10000000"
     347      pitch="0"
     348      mesh="planets/muunilinst.mesh"
     349      atmosphere="atmosphere1"
     350      rotationaxis="1,0,0"
     351      rotationrate="1.0"
     352      atmospheresize="80.0f"
     353      imagesize="1024.0f"
     354      collisiondamage = 2
     355      enablecollisiondamage = true
     356    >
     357      <attached>
     358        <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-50" />
     359      </attached>
     360      <collisionShapes>
     361        <SphereCollisionShape radius="1000" position="0,0,0" />
     362      </collisionShapes>
     363    </Planet>
     364
    272365
    273366<!--------------------------------------DUMP YARD --------------------------------------->
  • code/branches/ai2/data/levels/planets.oxw

    r8706 r8838  
    8080      mass="5000000"
    8181      pitch="0"
    82       mesh="planets/ganymede.mesh"
     82      mesh="planets/muunilinst.mesh"
    8383      atmosphere="atmosphere1"
    8484      rotationaxis="1,0,0"
  • code/branches/ai2/src/modules/questsystem/QuestManager.cc

    r8706 r8838  
    6565    {
    6666        RegisterRootObject(QuestManager);
    67 
     67        this->nullstring_ = "";
    6868        COUT(3) << "QuestManager created." << std::endl;
    6969    }
Note: See TracChangeset for help on using the changeset viewer.