[Orxonox-commit 6077] r10735 - code/branches/campaignHS15/data/levels

[paulsc at orxonox.net]

Author: paulsc
Date: 2015-10-31 19:15:11 +0100 (Sat, 31 Oct 2015)
New Revision: 10735

Modified:
   code/branches/campaignHS15/data/levels/Campaign1.oxw
Log:
Implemented EffectBeacon for quest 2.1 and added platform for FpsPlayer. Unfortunately, the latter cannot be rotated by rotationaxis: the coordinates are hardcoded! So either we fix this ourselves or we have to go back to the x,z,y scheme :(

Modified: code/branches/campaignHS15/data/levels/Campaign1.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/Campaign1.oxw	2015-10-31 17:40:29 UTC (rev 10734)
+++ code/branches/campaignHS15/data/levels/Campaign1.oxw	2015-10-31 18:15:11 UTC (rev 10735)
@@ -66,13 +66,10 @@
             <QuestHint id="quest1hint1" />
         </hints>
         <complete-effects>
-            <!-- Quest 2 not made as of yet
             <AddQuest questId="quest2" />
             <AddQuest questId="quest2.1" />
             <AddQuest questId="quest2.2" />
             <AddQuest questId="quest2.3" />
-            -->
-            <AddQuest questId="quest3" />
         </complete-effects>
     </GlobalQuest>
 
@@ -177,12 +174,12 @@
         </events>
     </EventMultiTrigger>
 
-    <DistanceTrigger name="reachedA" position="5000,-3000,0" distance=200 target="SpaceShip" beaconMode="exclude" targetname="NPC" stayactive=true />
+    <DistanceTrigger name="reachedA" position="5000,-3000,0" distance=1500 target="SpaceShip" beaconMode="exclude" targetname="NPC" stayactive=true />
 
     <EventMultiTrigger name="wave1" activations="1" stayactive="true" >
         <events>
             <trigger>
-                <EventListener event="reachedA" />
+                <EventListener event="dockA" />
             </trigger>
         </events>
     </EventMultiTrigger>
@@ -263,6 +260,17 @@
 
     <QuestEffectBeacon times=1>
         <effects>
+            <CompleteQuest questId="quest2.1" />
+        </effects>
+        <events>
+            <execute>
+                <EventListener event="dockA" />
+            </execute>
+        </events>
+    </QuestEffectBeacon>
+
+    <QuestEffectBeacon times=1>
+        <effects>
             <CompleteQuest questId="quest3" />
         </effects>
         <events>
@@ -431,7 +439,7 @@
         </attached>
     </Pawn>
 
-    <!-- New SpaceShip as destination of dock C-->
+    <!-- New SpaceShip as destination of dock A-->
     <SpaceShip
         template            = "spaceshipassff2"
         team                = "0"
@@ -454,13 +462,24 @@
     </SpaceShip>
 
     <!-- FPS Player as destination of dock C-->
-    <FpsPlayer template = "fps" radarname = "First Person Player" position = "0,-2300,640" lookat="0,0,0" >
+    <FpsPlayer template = "fps" radarname = "First Person Player" position = "0,-2300,1201">
         <attached>
             <DockingTarget name="fpsMode" />
             <DistanceTriggerBeacon name="fpsPlayer" />
         </attached>
     </FpsPlayer>
 
+    <StaticEntity position="0,-2300,1001" direction="0,0,-1" collisionType=static mass=100000 friction=0.01 >
+        <attached>
+          <Model position="0,0,0" mesh="crate.mesh" scale3D="80,80,5" />
+        </attached>
+        <collisionShapes>
+          <BoxCollisionShape position="0,0,0" halfExtents="400,400,25" />
+        </collisionShapes>
+    </StaticEntity>
+
+    <ForceField position="0,-2300,1001" direction="0,0,1" mode="homogen" diameter="400" forcedirection = "0,0,-500" />
+
     <!--ELEMENTS -->
 
     <?lua
@@ -469,8 +488,10 @@
     ?>
 
     <?lua
+    --[[
         dofile("includes/fog.lua")
        fogField(0,0,500,150,20)
+       ]]--
     ?>
 
     <!-- Enemies. Outer loop defines waves, inner loop defines enemies in every wave. -->
@@ -558,7 +579,5 @@
         </controller>
     </SpaceShip>
 
-
-
     </Scene>
 </Level>