[Orxonox-commit 6144] r10802 - code/branches/campaignHS15/data/levels
paulsc at orxonox.net
paulsc at orxonox.net
Sat Nov 14 16:31:10 CET 2015
Author: paulsc
Date: 2015-11-14 16:31:10 +0100 (Sat, 14 Nov 2015)
New Revision: 10802
Modified:
code/branches/campaignHS15/data/levels/Campaign1.oxw
Log:
Furthered quests, started work on pickups for quest 6.
Modified: code/branches/campaignHS15/data/levels/Campaign1.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/Campaign1.oxw 2015-11-14 12:32:57 UTC (rev 10801)
+++ code/branches/campaignHS15/data/levels/Campaign1.oxw 2015-11-14 15:31:10 UTC (rev 10802)
@@ -72,7 +72,7 @@
hasPhysics = true
>
- <SpawnPoint name="playerSpawn" team=0 position="<?lua printC(cSpawn) ?>" lookat="<?lua printC(cCenter) ?>" spawnclass=SpaceShip pawndesign=spaceshipescort />
+ <SpawnPoint name="playerSpawn" team=0 position="<?lua printC(cSpawn) ?>" lookat="<?lua printC(cA) ?>" spawnclass=SpaceShip pawndesign=spaceshipescort />
<WorldAmbientSound source="Earth.ogg" looping="true" playOnLoad="true" />
@@ -150,7 +150,7 @@
</GlobalQuest>
<GlobalQuest id="quest6">
- <QuestDescription title="Get back to the Transporter" description="Undock from Station C and get into your Spaceship!" failMessage="" completeMessage="" />
+ <QuestDescription title="Get back for the Showdown" description="Undock from Station C and get into your Spaceship!" failMessage="" completeMessage="" />
<hints>
</hints>
<subquests>
@@ -313,6 +313,39 @@
</events>
</EventMultiTrigger>
+ <EventMultiTrigger name="readyAfterWave2" activations="1" delay=2 stayactive=true>
+ <events>
+ <trigger>
+ <Trigger mode=and>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event="undockC" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event="waveClear2" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </Trigger>
+ </trigger>
+ </events>
+ </EventMultiTrigger>
+
+ <!-- See the DistanceTrigger attached to the shuttle here! !-->
+
+ <EventMultiTrigger name="wave3" activations="1" delay=12>
+ <events>
+ <trigger>
+ <EventListener event="reachedShuttle" />
+ </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>
@@ -423,6 +456,29 @@
</events>
</QuestEffectBeacon>
+ <QuestEffectBeacon times=1>
+ <effects>
+ <CompleteQuest questId="quest6.1" />
+ </effects>
+ <events>
+ <execute>
+ <EventListener event="gotPickups" />
+ </execute>
+ </events>
+ </QuestEffectBeacon>
+
+ <QuestEffectBeacon times=1>
+ <effects>
+ <CompleteQuest questId="quest6.2" />
+ <CompleteQuest questId="quest6" />
+ </effects>
+ <events>
+ <execute>
+ <EventListener event="reachedShuttle" />
+ </execute>
+ </events>
+ </QuestEffectBeacon>
+
<!--NOTIFICATIONS -->
<SimpleNotification broadcast="true" message="Welcome, Commander. Please report at Station A.">
@@ -497,7 +553,7 @@
</events>
</SimpleNotification>
- <SimpleNotification broadcast="true" message="Howdy Commander! Ready to kick alien ass?">
+ <SimpleNotification broadcast="true" message="Howdy Commander! Ready to kick some alien ass?">
<events>
<trigger>
<EventListener event="joinedUnit" />
@@ -556,7 +612,7 @@
<EventListener event="dockedC" />
</trigger>
</events>
- </SimpleNotification>
+ </SimpleNotification>
<SimpleNotification broadcast="true" message="It should deal with those pesky invaders!">
<events>
@@ -580,6 +636,36 @@
</events>
</SimpleNotification>
+ <SimpleNotification broadcast="true" message="Here's some supplies for you. Shoot that crate!">
+ <events>
+ <trigger>
+ <EventListener event="readyAfterWave2" />
+ </trigger>
+ </events>
+ </SimpleNotification>
+
+ <SimpleNotification broadcast="true" message="Our Intelligence reports one more wave...">
+ <events>
+ <trigger>
+ <EventListener event="reachedShuttle" />
+ </trigger>
+ </events>
+ </SimpleNotification>
+
+ <SimpleNotification broadcast="true" message="Ready to be a hero, Commander?">
+ <events>
+ <trigger>
+ <EventTrigger stayactive="true" delay=4 >
+ <events>
+ <trigger>
+ <EventListener event="reachedShuttle" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </trigger>
+ </events>
+ </SimpleNotification>
+
<SimpleNotification broadcast="true" message="It's over... we failed. Retreat!">
<events>
<trigger>
@@ -755,7 +841,7 @@
<attached>
<Model position="0,0,0" mesh="crate.mesh" scale3D="80,5,80" />
<Billboard position="320,50,320" material="Flares/ringflare2" colour="0.2,0.4,0.8" />
- <DistanceTrigger position="320,50,320" distance="50" target="Pawn" beaconMode="identify" targetname="fpsPlayer" name="undockC"/>
+ <DistanceTrigger position="320,50,320" distance="50" target="Pawn" beaconMode="identify" targetname="fpsPlayer" name="undockC" stayactive=true />
<ForceField active=false position="0,0,0" mode="homogen" diameter="600" forcedirection = "0,-500,0" />
<!-- TODO: Invisible boundaries to prevent falling off platform -->
</attached>
@@ -836,6 +922,44 @@
asteroidBelt(cPlanet2[1], cPlanet2[2], cPlanet2[3], 30, 20, 100, 20, 40, 3400, 3700, 400, 1)
?>
+ <!-- Box with Pickups. TODO: Pickups! -->
+ <Pawn team=0 name="gotPickups" health=30 position="<?lua print((cC[1]+600) .. ',' .. cC[2] .. ',' .. (cC[3]-600)) ?>" direction="0,-1,0" collisionType=dynamic mass=1000 radarname="Supplies" >
+ <events>
+ <visibility>
+ <EventListener event="readyAfterWave2" />
+ </visibility>
+ <activity>
+ <EventListener event="readyAfterWave2" />
+ </activity>
+ </events>
+ <attached>
+ <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
+ </collisionShapes>
+ </Pawn>
+
+ <!-- TODO: these pickups do not work somehow?? their templates are not recognized...
+
+ <PickupSpawner pickup=hugehealthpickup position="<?lua print((cC[1]+600) .. ',' .. cC[2] .. ',' .. (cC[3]-600)) ?>" triggerDistance="10" maxSpawnedItems="1" visible="true">
+ <events>
+ <visibility>
+ <EventListener event="gotPickups" />
+ </visibility>
+ </events>
+ </PickupSpawner>
+
+ <PickupSpawner pickup=mediumspeedpickup position="<?lua print((cC[1]+600) .. ',' .. cC[2] .. ',' .. (cC[3]-600)) ?>" triggerDistance="10" maxSpawnedItems="1" visible="true">
+ <events>
+ <visibility>
+ <EventListener event="gotPickups" />
+ </visibility>
+ </events>
+ </PickupSpawner>
+
+ -->
+
<!-- Allies -->
<?lua
for i = 1, allies, 1
@@ -906,7 +1030,7 @@
</controller>
</SpaceShip>
<?lua end ?>
- <?lua
+ <?lua
enemies = enemies + enemiesIncrease
end ?>
@@ -917,6 +1041,13 @@
</templates>
<attached>
<DistanceTriggerBeacon name="NPC" />
+ <DistanceTrigger active=false name="reachedShuttle" position="0,0,0" distance=400 target="SpaceShip" beaconMode="exclude" targetname="NPC" stayactive=true>
+ <events>
+ <activity>
+ <EventListener event="readyAfterWave2" />
+ </activity>
+ </events>
+ </DistanceTrigger>
</attached>
<controller>
<WaypointController accuracy=10 team=0>
More information about the Orxonox-commit
mailing list