[Orxonox-commit 6085] r10743 - code/branches/campaignHS15/data/levels

[paulsc at orxonox.net]

Author: paulsc
Date: 2015-11-01 15:52:16 +0100 (Sun, 01 Nov 2015)
New Revision: 10743

Modified:
   code/branches/campaignHS15/data/levels/Campaign1.oxw
Log:
Did some more work in quests.

Modified: code/branches/campaignHS15/data/levels/Campaign1.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/Campaign1.oxw	2015-11-01 13:52:04 UTC (rev 10742)
+++ code/branches/campaignHS15/data/levels/Campaign1.oxw	2015-11-01 14:52:16 UTC (rev 10743)
@@ -68,20 +68,22 @@
         <complete-effects>
             <AddQuest questId="quest2" />
             <AddQuest questId="quest2.1" />
-            <AddQuest questId="quest2.2" />
         </complete-effects>
     </GlobalQuest>
 
     <GlobalQuest id="quest2">
-        <QuestDescription title="Prepare to fight the Wave" description="" failMessage="" completeMessage="" />
+        <QuestDescription title="Prepare to fight the Enemy" description="" failMessage="" completeMessage="" />
         <hints>
         </hints>
         <subquests>
             <GlobalQuest id="quest2.1">
-                <QuestDescription title="Get a better Spaceship" description="" failMessage="" completeMessage="" />
+                <QuestDescription title="> Get a better Spaceship" description="" failMessage="" completeMessage="" />
+                <complete-effects>
+                    <AddQuest questId="quest2.2" />
+                </complete-effects>
             </GlobalQuest>
             <GlobalQuest id="quest2.2">
-                <QuestDescription title="Meet your Unit" description="" failMessage="" completeMessage="" />
+                <QuestDescription title="> Meet your Unit" description="" failMessage="" completeMessage="" />
             </GlobalQuest>
         </subquests>
         <complete-effects>
@@ -106,10 +108,10 @@
         </hints>
         <subquests>
             <GlobalQuest id="quest4.1">
-                <QuestDescription title="Get to the Defense Station" description="" failMessage="" completeMessage="" />
+                <QuestDescription title="> Get to the Defense Station" description="" failMessage="" completeMessage="" />
             </GlobalQuest>
             <GlobalQuest id="quest4.2">
-                <QuestDescription title="Find the turret" description="" failMessage="" completeMessage="" />
+                <QuestDescription title="> Find the turret" description="" failMessage="" completeMessage="" />
             </GlobalQuest>
         </subquests>
         <complete-effects>
@@ -134,10 +136,10 @@
         </hints>
         <subquests>
             <GlobalQuest id="quest6.1">
-                <QuestDescription title="Collect the local Pickups" description="" failMessage="" completeMessage="" />
+                <QuestDescription title="> Collect the local Pickups" description="" failMessage="" completeMessage="" />
             </GlobalQuest>
             <GlobalQuest id="quest6.2">
-                <QuestDescription title="Use Portal to the Transporter" description="" failMessage="" completeMessage="" />
+                <QuestDescription title="> Use Portal to the Transporter" description="" failMessage="" completeMessage="" />
             </GlobalQuest>
         </subquests>
         <complete-effects>
@@ -176,7 +178,7 @@
     <DistanceTrigger name="reachedA" position="5000,-3000,0" distance=1000 target="SpaceShip" beaconMode="exclude" targetname="NPC" stayactive=true />
 
     <!-- TODO: find out how to link an event to the COMPLETION of a dock. How is this not possible?? -->
-    <EventMultiTrigger name="dockedA" activations="1" stayactive="true" delay=2>
+    <EventMultiTrigger name="dockedA" activations="1" stayactive="true" delay=3>
         <events>
             <trigger>
                 <EventListener event="dockA" />
@@ -185,7 +187,7 @@
     </EventMultiTrigger>
 
     <!-- TODO: fictive unit; to be added later -->
-    <DistanceTrigger name="joinedUnit" position="3500,-1500,0" distance=10 target="SpaceShip" beaconMode="exclude" targetname="NPC" stayactive=true />
+    <DistanceTrigger name="joinedUnit" position="3500,-1500,0" distance=100 target="SpaceShip" beaconMode="exclude" targetname="NPC" stayactive=true />
     <Billboard position="3500,-1500,0" amplitude=1 material="Flares/lensflare" colour="1,0,0.05" />     <!-- For debugging puropses -->
 
     <EventMultiTrigger name="wave1" activations="1" stayactive="true" delay=4>
@@ -284,6 +286,18 @@
 
     <QuestEffectBeacon times=1>
         <effects>
+            <CompleteQuest questId="quest2.2" />
+            <CompleteQuest questId="quest2" />
+        </effects>
+        <events>
+            <execute>
+                <EventListener event="joinedUnit" />
+            </execute>
+        </events>
+    </QuestEffectBeacon>
+
+    <QuestEffectBeacon times=1>
+        <effects>
             <CompleteQuest questId="quest3" />
         </effects>
         <events>
@@ -565,7 +579,6 @@
         asteroidBelt(0,-2000, 0, 30, 0, 5, 20, 40, 500, 3300, 75, 0)
     ?>
 
-
     <Planet
         position="5000,0,0"
         scale="1000"