[Orxonox-commit 4167] r8838 - in code/branches/ai2: data/gui/scripts data/levels src/modules/questsystem
jo at orxonox.net
jo at orxonox.net
Sat Aug 13 23:21:03 CEST 2011
Author: jo
Date: 2011-08-13 23:21:03 +0200 (Sat, 13 Aug 2011)
New Revision: 8838
Modified:
code/branches/ai2/data/gui/scripts/QuestGUI.lua
code/branches/ai2/data/levels/missionOne.oxw
code/branches/ai2/data/levels/planets.oxw
code/branches/ai2/src/modules/questsystem/QuestManager.cc
Log:
Minor level changes. Questmenu pauses game now.
Modified: code/branches/ai2/data/gui/scripts/QuestGUI.lua
===================================================================
--- code/branches/ai2/data/gui/scripts/QuestGUI.lua 2011-08-13 19:41:38 UTC (rev 8837)
+++ code/branches/ai2/data/gui/scripts/QuestGUI.lua 2011-08-13 21:21:03 UTC (rev 8838)
@@ -29,8 +29,14 @@
-- Load the list of quests to be displayed.
P.loadQuestsList(P.currentQuest)
+ -- Pause the game - possible conflict for multiplayer quests
+ orxonox.execute("setPause 1")
end
+function P.onQuit()
+ orxonox.execute("setPause 0")
+end
+
-- Loads the list of quests, depending on P.showActive, either the active (P.showActive == true) or the finished, i.e. inactive quests are loaded.
-- selectQuest is a pointer to a quest that should be selected, if it is nil the first quest is selected.
function P.loadQuestsList(selectQuest)
Modified: code/branches/ai2/data/levels/missionOne.oxw
===================================================================
--- code/branches/ai2/data/levels/missionOne.oxw 2011-08-13 19:41:38 UTC (rev 8837)
+++ code/branches/ai2/data/levels/missionOne.oxw 2011-08-13 21:21:03 UTC (rev 8838)
@@ -44,6 +44,12 @@
include("includes/pickups.oxi")
?>
+ <WorldAmbientSound
+ ambientSource="AlphaCentauri.ogg"
+ looping="true"
+ playOnLoad="true"
+ />
+
<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"/>
<SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
<!-- Script code="artificialcontroller setbotlevel 0.1" /--> <!-- Does not influence waypointPatrolController-->
@@ -77,7 +83,7 @@
-->
<!-------------------------------------- PART ONE: Destroy boxes --------------------------------------->
- <DistanceTrigger name="spawndelaytrigger1" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=1 />
+ <DistanceTrigger name="spawndelaytrigger1" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=2 />
<SimpleNotification message="Destroy those four boxes.">
<events>
<trigger>
@@ -86,7 +92,7 @@
</events>
</SimpleNotification>
- <DistanceTrigger name="spawndelaytrigger2" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=2 />
+ <DistanceTrigger name="spawndelaytrigger2" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=5 />
<SimpleNotification message=" 1. Aim the a the red cycle.">
<events>
<trigger>
@@ -95,7 +101,7 @@
</events>
</SimpleNotification>
- <DistanceTrigger name="spawndelaytrigger3" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=4 />
+ <DistanceTrigger name="spawndelaytrigger3" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=8 />
<SimpleNotification message="2. Click! (hold the left mouse button)">
<events>
<trigger>
@@ -104,7 +110,7 @@
</events>
</SimpleNotification>
-<!-- BRIEFING END // Interactive briefing start -->
+<!-- static briefing END // Interactive briefing start -->
<SimpleNotification message="Right click on the next target." broadcast="true">
<events>
@@ -151,7 +157,7 @@
</events>
</SimpleNotification>
- <SimpleNotification message="Well done. Now press 'W'." broadcast="true">
+ <SimpleNotification message="Fly towards the pirates. Press 'W'." broadcast="true">
<events>
<trigger>
<Pawn health=30 position="0,300,0" direction="0,-1,0" collisionType=dynamic mass=100000>
@@ -168,45 +174,62 @@
<!--------------------------------------PART TWO: Moving targets --------------------------------------->
+ <DistanceTrigger name="movingtargets" position="0,500,0" target="Pawn" distance=180 stayActive="true" delay=2 />
+ <Billboard position="0,500,0" material="Examples/Flare" colour="0.5,0,0" scale=3/>
+ <SimpleNotification message="Try to hit the pirates while you are flying.">
+ <events>
+ <trigger>
+ <EventListener event=movingtargets />
+ </trigger>
+ </events>
+ </SimpleNotification>
- <SpaceShip position="0,1500,200" lookat="0,0,0">
- <templates>
- <Template link=spaceshippirate />
- </templates>
- <controller>
- <WaypointController>
- <waypoints>
- <Model mesh="cube.mesh" scale=8 position=" 0,1300,-200" />
- <Model mesh="cube.mesh" scale=8 position=" 0,1300,-700" />
- <Model mesh="cube.mesh" scale=8 position="500,1300,-700" />
- <Model mesh="cube.mesh" scale=8 position="500,1300,-200" />
- </waypoints>
- </WaypointController>
- </controller>
- </SpaceShip>
- <PickupSpawner position="250,1300,-450" triggerDistance="10" respawnTime="30" maxSpawnedItems="1">
- <pickup>
- <DronePickup template=dronepickup />
- </pickup>
- </PickupSpawner>
- <SpaceShip position="0,1500,400" lookat="0,0,0">
- <templates>
- <Template link=spaceshippirate />
- </templates>
- <controller>
- <WaypointController>
- <waypoints>
- <Model mesh="cube.mesh" scale=8 position=" 0,1300,1000" />
- <Model mesh="cube.mesh" scale=8 position=" 0,1300,500" />
- <Model mesh="cube.mesh" scale=8 position="500,1300,500" />
- <Model mesh="cube.mesh" scale=8 position="500,1300, 1000" />
- </waypoints>
- </WaypointController>
- </controller>
- </SpaceShip>
+ <SimpleNotification message="Now get the other one." broadcast="true">
+ <events>
+ <trigger>
+ <SpaceShip position="0,2000,200" lookat="0,0,0">
+ <templates>
+ <Template link=spaceshippirate />
+ </templates>
+ <controller>
+ <WaypointController>
+ <waypoints>
+ <Model mesh="cube.mesh" scale=8 position=" 0,1700,-200" />
+ <Model mesh="cube.mesh" scale=8 position=" 0,1700,-700" />
+ <Model mesh="cube.mesh" scale=8 position="500,1700,-700" />
+ <Model mesh="cube.mesh" scale=8 position="500,1700,-200" />
+ </waypoints>
+ </WaypointController>
+ </controller>
+ </SpaceShip>
+ </trigger>
+ </events>
+ </SimpleNotification>
+ <SimpleNotification message="Fly towards the space station (grey dot)." broadcast="true">
+ <events>
+ <trigger>
+ <SpaceShip position="0,2000,400" lookat="0,0,0">
+ <templates>
+ <Template link=spaceshippirate />
+ </templates>
+ <controller>
+ <WaypointController>
+ <waypoints>
+ <Model mesh="cube.mesh" scale=8 position=" 0,2400,1000" />
+ <Model mesh="cube.mesh" scale=8 position=" 0,2400,500" />
+ <Model mesh="cube.mesh" scale=8 position="500,2400,500" />
+ <Model mesh="cube.mesh" scale=8 position="500,2400, 1000" />
+ </waypoints>
+ </WaypointController>
+ </controller>
+ </SpaceShip>
+ </trigger>
+ </events>
+ </SimpleNotification>
+
<!--------------------------------------PART THREE: to the space station --------------------------------------->
<DistanceTrigger name="duball1" position="-1000,-300,700" target="Pawn" distance=700 stayActive="true" delay=2 />
<SimpleNotification message="Welcome to the Duball Space Station!">
@@ -217,7 +240,7 @@
</events>
</SimpleNotification>
- <DistanceTrigger name="duball2" position="-1000,-300,700" target="Pawn" distance=700 stayActive="true" delay=4 />
+ <DistanceTrigger name="duball2" position="-1000,-300,700" target="Pawn" distance=700 stayActive="true" delay=5 />
<SimpleNotification message="Warning: Something big is coming.">
<events>
<trigger>
@@ -226,15 +249,50 @@
</events>
</SimpleNotification>
- <DistanceTrigger name="duball2" position="-1000,-300,700" target="Pawn" distance=700 stayActive="true" delay=6 />
- <SimpleNotification message="Be on your guard!">
+ <!--DistanceTrigger name="duball3" position="-1000,-300,700" target="Pawn" distance=700 stayActive="true" delay=9 />
+ <SimpleNotification message="Get some help, before it is too late.">
<events>
<trigger>
<EventListener event=duball3 />
</trigger>
</events>
+ </SimpleNotification-->
+
+ <DistanceTrigger name="duball4" position="-1000,-300,700" target="Pawn" distance=700 stayActive="true" delay=10 />
+ <SimpleNotification message="Use the portals to get help. (grey dot)">
+ <events>
+ <trigger>
+ <EventListener event=duball4 />
+ </trigger>
+ </events>
</SimpleNotification>
+
+
+<!-- PORTALS -->
+ <Template name=PortalDefault>
+ <PortalEndPoint>
+ <attached>
+ <Billboard material="Portals/Default" />
+ </attached>
+ </PortalEndPoint>
+ </Template>
+
+ <PortalEndPoint position="-1400,-500,800" id="1" distance="40" target="MobileEntity" design="PortalDefault">
+ <!--events>
+ <visibility>
+ <EventListener event=portal />
+ </visibility>
+ </events-->
+ </PortalEndPoint>
+
+ <PortalEndPoint position="-40000,0,0" id="2" distance="40" target="MobileEntity" design="PortalDefault" />
+ <PortalLink fromID="1" toID="2" />
+ <PortalLink fromID="2" toID="1" />
+<!-- PORTALS END-->
+
+
+
<StaticEntity position="-1000,-300,700" collisionType=static>
<attached>
<Model scale=11 mesh="DuBall1.mesh" position = "-100,0,0"/>
@@ -268,8 +326,43 @@
</events>
</SpaceShip -->
-<!--------------------------------------PART FOUR --------------------------------------->
+<!-------------------------------------- PART FOUR : Get Help --------------------------------------->
+ <PickupSpawner position="-40400,100,0" triggerDistance="10" respawnTime="30" maxSpawnedItems="1">
+ <pickup>
+ <DronePickup template=dronepickup />
+ </pickup>
+ </PickupSpawner>
+
+
+
+
+ <Planet
+ position="-50000,0,0"
+ scale="1000"
+ collisionType="dynamic"
+ linearDamping="0.8"
+ angularDamping="0"
+ mass="10000000"
+ pitch="0"
+ mesh="planets/muunilinst.mesh"
+ atmosphere="atmosphere1"
+ rotationaxis="1,0,0"
+ rotationrate="1.0"
+ atmospheresize="80.0f"
+ imagesize="1024.0f"
+ collisiondamage = 2
+ enablecollisiondamage = true
+ >
+ <attached>
+ <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-50" />
+ </attached>
+ <collisionShapes>
+ <SphereCollisionShape radius="1000" position="0,0,0" />
+ </collisionShapes>
+ </Planet>
+
+
<!--------------------------------------DUMP YARD --------------------------------------->
<!-- Idea: Pawndeath should trigger several , delayed events. -->
<!--EventTrigger name="PawnDied4" >
Modified: code/branches/ai2/data/levels/planets.oxw
===================================================================
--- code/branches/ai2/data/levels/planets.oxw 2011-08-13 19:41:38 UTC (rev 8837)
+++ code/branches/ai2/data/levels/planets.oxw 2011-08-13 21:21:03 UTC (rev 8838)
@@ -79,7 +79,7 @@
angularDamping="0"
mass="5000000"
pitch="0"
- mesh="planets/ganymede.mesh"
+ mesh="planets/muunilinst.mesh"
atmosphere="atmosphere1"
rotationaxis="1,0,0"
rotationrate="1.0"
Modified: code/branches/ai2/src/modules/questsystem/QuestManager.cc
===================================================================
--- code/branches/ai2/src/modules/questsystem/QuestManager.cc 2011-08-13 19:41:38 UTC (rev 8837)
+++ code/branches/ai2/src/modules/questsystem/QuestManager.cc 2011-08-13 21:21:03 UTC (rev 8838)
@@ -64,7 +64,7 @@
QuestManager::QuestManager()
{
RegisterRootObject(QuestManager);
-
+ this->nullstring_ = "";
COUT(3) << "QuestManager created." << std::endl;
}
More information about the Orxonox-commit
mailing list