[Orxonox-commit 6154] r10812 - code/branches/campaignHS15/data/levels

[paulsc at orxonox.net]

Author: paulsc
Date: 2015-11-16 16:30:49 +0100 (Mon, 16 Nov 2015)
New Revision: 10812

Modified:
   code/branches/campaignHS15/data/levels/Campaign1.oxw
Log:
Tried new tactic with mission failing, but still does not work...

Modified: code/branches/campaignHS15/data/levels/Campaign1.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/Campaign1.oxw	2015-11-16 15:23:12 UTC (rev 10811)
+++ code/branches/campaignHS15/data/levels/Campaign1.oxw	2015-11-16 15:30:49 UTC (rev 10812)
@@ -363,20 +363,40 @@
         </events>
     </Script>
 
-    <!-- FIXME: This trigger needs fixing, as endMission can only be called by a Pawn Distance Trigger. Herpaderp.
-    Also, the fix proposed in MissionOne does not work anymore... -->
-   <EventMultiTrigger name="missionFailed" target="Pawn" stayActive="true" delay=1.5>
-       <events>
-           <trigger>
-               <EventListener event="transporter" />
-           </trigger>
-       </events>
-   </EventMultiTrigger>
+    <!-- See the MissionFailed DistanceTrigger attached to the shuttle here! !-->
 
+    <DistanceTrigger name="missionNotFailed" position="0,0,0" distance=100000 target="SpaceShip" beaconMode="identify" targetname="transporter" />
+
+    <!--FIXME: How does this work but the below does not?? -->
+
+    <SimpleNotification broadcast="true" message="TEST">
+        <events>
+            <trigger>
+                <Trigger invert=true>
+                    <EventTrigger>
+                        <events>
+                            <trigger>
+                                <EventListener event="missionNotFailed" />
+                            </trigger>
+                        </events>
+                    </EventTrigger>
+                </Trigger>
+            </trigger>
+        </events>
+    </SimpleNotification>
+
     <Script code="Mission endMission fail" onLoad="false">
         <events>
             <trigger>
-                <EventListener event="missionFailed" />
+                <Trigger invert=true>
+                    <EventTrigger>
+                        <events>
+                            <trigger>
+                                <EventListener event="missionNotFailed" />
+                            </trigger>
+                        </events>
+                    </EventTrigger>
+                </Trigger>
             </trigger>
         </events>
     </Script>
@@ -1108,6 +1128,7 @@
         </templates>
         <attached>
             <DistanceTriggerBeacon name="NPC" />
+            <DistanceTriggerBeacon name="transporter" />
             <DistanceTrigger active=false name="reachedShuttle" position="0,0,0" distance=400 target="SpaceShip" beaconMode="exclude" targetname="NPC" stayactive=true>
                 <events>
                     <activity>