[Orxonox-commit 6082] r10740 - code/branches/campaignHS15/data/levels
paulsc at orxonox.net
paulsc at orxonox.net
Sun Nov 1 14:04:56 CET 2015
Author: paulsc
Date: 2015-11-01 14:04:55 +0100 (Sun, 01 Nov 2015)
New Revision: 10740
Modified:
code/branches/campaignHS15/data/levels/Campaign1.oxw
Log:
Did some work on narrative and events, labelled TODO and FIXME, removed fog lua tag
Modified: code/branches/campaignHS15/data/levels/Campaign1.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/Campaign1.oxw 2015-11-01 12:05:54 UTC (rev 10739)
+++ code/branches/campaignHS15/data/levels/Campaign1.oxw 2015-11-01 13:04:55 UTC (rev 10740)
@@ -69,7 +69,6 @@
<AddQuest questId="quest2" />
<AddQuest questId="quest2.1" />
<AddQuest questId="quest2.2" />
- <AddQuest questId="quest2.3" />
</complete-effects>
</GlobalQuest>
@@ -82,9 +81,6 @@
<QuestDescription title="Get a better Spaceship" description="" failMessage="" completeMessage="" />
</GlobalQuest>
<GlobalQuest id="quest2.2">
- <QuestDescription title="Get some Pickups" description="" failMessage="" completeMessage="" />
- </GlobalQuest>
- <GlobalQuest id="quest2.3">
<QuestDescription title="Meet your Unit" description="" failMessage="" completeMessage="" />
</GlobalQuest>
</subquests>
@@ -161,6 +157,9 @@
Usable events and triggers:
_spawntrigger
_reachedA
+ _dock<A|B|C>
+ _docked<A> WIP; see below
+ -joinedUnit
_wave<k>
_killedEnemy<k>.<i>
_waveClear<k>
@@ -174,9 +173,10 @@
</events>
</EventMultiTrigger>
- <DistanceTrigger name="reachedA" position="5000,-3000,0" distance=1500 target="SpaceShip" beaconMode="exclude" targetname="NPC" stayactive=true />
+ <DistanceTrigger name="reachedA" position="5000,-3000,0" distance=1000 target="SpaceShip" beaconMode="exclude" targetname="NPC" stayactive=true />
- <EventMultiTrigger name="wave1" activations="1" 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>
<events>
<trigger>
<EventListener event="dockA" />
@@ -184,6 +184,18 @@
</events>
</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 />
+ <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>
+ <events>
+ <trigger>
+ <EventListener event="joinedUnit" />
+ </trigger>
+ </events>
+ </EventMultiTrigger>
+
<!-- Recursive helper function for the end-of-wave events. F*ck the event system, seriously. -->
<?lua
function enemyTriggerRecursor(i, k)
@@ -217,16 +229,17 @@
</EventMultiTrigger>
<?lua end ?>
- <!-- This trigger needs fixing, as endMission can only be called by a Pawn Distance Trigger. Herpaderp -->
- <EventMultiTrigger name="missionFailed" target="Pawn" stayActive="true" delay=1.5>
- <events>
- <trigger>
- <EventListener event="transporter" />
- </trigger>
- </events>
- </EventMultiTrigger>
+ <!-- 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>
- <Script code="Mission endMission fail" onLoad="false" times="1">
+ <Script code="Mission endMission fail" onLoad="false">
<events>
<trigger>
<EventListener event="missionFailed" />
@@ -264,7 +277,7 @@
</effects>
<events>
<execute>
- <EventListener event="dockA" />
+ <EventListener event="dockedA" />
</execute>
</events>
</QuestEffectBeacon>
@@ -282,14 +295,78 @@
<!--NOTIFICATIONS -->
- <SimpleNotification broadcast="true" message="Welcome, Commander. Please report at Station A">
+ <SimpleNotification broadcast="true" message="Welcome, Commander. Please report at Station A.">
<events>
<trigger>
- <EventListener event="spawntrigger" />
+ <EventTrigger stayactive="true" delay=4 >
+ <events>
+ <trigger>
+ <EventListener event="spawntrigger" />
+ </trigger>
+ </events>
+ </EventTrigger>
</trigger>
</events>
</SimpleNotification>
+ <SimpleNotification broadcast="true" message="Our enemy is set to attack us very soon.">
+ <events>
+ <trigger>
+ <EventTrigger stayactive="true" delay=8 >
+ <events>
+ <trigger>
+ <EventListener event="spawntrigger" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </trigger>
+ </events>
+ </SimpleNotification>
+
+ <SimpleNotification broadcast="true" message="Please study your mission briefing!">
+ <events>
+ <trigger>
+ <EventTrigger stayactive="true" delay=12 >
+ <events>
+ <trigger>
+ <EventListener event="spawntrigger" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </trigger>
+ </events>
+ </SimpleNotification>
+
+ <SimpleNotification broadcast="true" message="Welcome to Station A, Commander.">
+ <events>
+ <trigger>
+ <EventListener event="reachedA" />
+ </trigger>
+ </events>
+ </SimpleNotification>
+
+ <SimpleNotification broadcast="true" message="We've prepared a reinforced Ship for you.">
+ <events>
+ <trigger>
+ <EventTrigger stayactive="true" delay=4 >
+ <events>
+ <trigger>
+ <EventListener event="reachedA" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </trigger>
+ </events>
+ </SimpleNotification>
+
+ <SimpleNotification broadcast="true" message="Now join our defense Team.">
+ <events>
+ <trigger>
+ <EventListener event="dockedA" />
+ </trigger>
+ </events>
+ </SimpleNotification>
+
<SimpleNotification broadcast="true" message="An enemy wave is approaching the shuttle!">
<events>
<trigger>
@@ -443,7 +520,7 @@
<SpaceShip
template = "spaceshipassff2"
team = "0"
- position = "7500,-5500,0"
+ position = "4100,-2100,0"
orientation = "-0.14, 0.68, 0.68, 0.223"
health = "400"
initialhealth = "400"
@@ -454,15 +531,16 @@
shieldabsorption = "0.8"
reloadrate = "1"
reloadwaittime = "1"
- name = "cruiser"
- radarname = "Spacecruiser" >
+ name = "newSpaceShip"
+ radarname = "Defender" >
<attached>
<DockingTarget name="newSpaceShip" />
+ <DistanceTriggerBeacon name="newSpaceShip" />
</attached>
</SpaceShip>
<!-- FPS Player as destination of dock C-->
- <FpsPlayer template = "fps" radarname = "First Person Player" position = "0,-2300,1201">
+ <FpsPlayer team=0 template = "fps" radarname = "First Person Player" position = "0,-2300,1201">
<attached>
<DockingTarget name="fpsMode" />
<DistanceTriggerBeacon name="fpsPlayer" />
@@ -487,13 +565,6 @@
asteroidBelt(0,-2000, 0, 30, 0, 5, 20, 40, 500, 3300, 75, 0)
?>
- <?lua
- --[[
- dofile("includes/fog.lua")
- fogField(0,0,500,150,20)
- ]]--
- ?>
-
<!-- Enemies. Outer loop defines waves, inner loop defines enemies in every wave. -->
<?lua
for k = 1, waves, 1
@@ -536,6 +607,10 @@
<?lua end ?>
<?lua end ?>
+ <Formation>
+
+ </Formation>
+
<!-- Transporter, starting Point is near A, end Point near B, the circle parameters for the waypoints are: Center = (0, -887, 0), r = 2613 -->
<SpaceShip position="5000,-3000,0" lookat="-2494, -1667, 0" team=0 name="transporter" radarname="Shuttle">
<templates>
More information about the Orxonox-commit
mailing list