[Orxonox-commit 4251] r8922 - in code/branches/gamecontent/data/levels: . templates
jo at orxonox.net
jo at orxonox.net
Wed Nov 2 16:33:24 CET 2011
Author: jo
Date: 2011-11-02 16:33:24 +0100 (Wed, 02 Nov 2011)
New Revision: 8922
Modified:
code/branches/gamecontent/data/levels/dynamicMatch.oxw
code/branches/gamecontent/data/levels/lastManStanding.oxw
code/branches/gamecontent/data/levels/lastTeamStandingII.oxw
code/branches/gamecontent/data/levels/missionOne.oxw
code/branches/gamecontent/data/levels/templates/spaceshipSpacecruiser.oxt
Log:
fix quest structure (almost finished).
Modified: code/branches/gamecontent/data/levels/dynamicMatch.oxw
===================================================================
--- code/branches/gamecontent/data/levels/dynamicMatch.oxw 2011-11-02 15:14:02 UTC (rev 8921)
+++ code/branches/gamecontent/data/levels/dynamicMatch.oxw 2011-11-02 15:33:24 UTC (rev 8922)
@@ -32,6 +32,7 @@
</StaticEntity>
<!-- -----------12-Spawnpoints around the planet------------- -->
+<!-- inner Spawnpoints -->
<TeamSpawnPoint team=0 position="1000,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
<TeamSpawnPoint team=0 position="-1000,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
<TeamSpawnPoint team=0 position="0,1000,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
Modified: code/branches/gamecontent/data/levels/lastManStanding.oxw
===================================================================
--- code/branches/gamecontent/data/levels/lastManStanding.oxw 2011-11-02 15:14:02 UTC (rev 8921)
+++ code/branches/gamecontent/data/levels/lastManStanding.oxw 2011-11-02 15:33:24 UTC (rev 8922)
@@ -50,7 +50,7 @@
<attached>
<Model position="0,0,0" scale=140 mesh="asteroid_UV.mesh" shadow=true />
<Model position="-160,40,28.4" scale=1 mesh="sphere.mesh" /><!--EasterEgg indicator-->
- <PickupSpawner position="-160,40,17" triggerDistance="20" respawnTime="5" maxSpawnedItems="15"><!--EasterEgg-->
+ <PickupSpawner position="-160,40,17" triggerDistance="20" respawnTime="5" maxSpawnedItems="15"><!--EasterEgg : invisible pickup is hidden inside the asteroid -->
<pickup>
<InvisiblePickup template=hugeinvisiblepickup />
</pickup>
Modified: code/branches/gamecontent/data/levels/lastTeamStandingII.oxw
===================================================================
--- code/branches/gamecontent/data/levels/lastTeamStandingII.oxw 2011-11-02 15:14:02 UTC (rev 8921)
+++ code/branches/gamecontent/data/levels/lastTeamStandingII.oxw 2011-11-02 15:33:24 UTC (rev 8922)
@@ -94,6 +94,7 @@
</collisionShapes>
</StaticEntity>
<!-- END of CUBE-->
+
<!-------------- Centered Thin Gate -------------->
<StaticEntity position="0,0,0" direction="0,0,0" collisionType=static mass=100000 >
@@ -411,7 +412,7 @@
<TeamSpawnPoint team=3 position="835,-300,845" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
<TeamSpawnPoint team=3 position="845,350,835" direction="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipassff />
<TeamSpawnPoint team=3 position="845,-300,835" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-<Bot />
+<Bot /><!-- at least one bot is needed to stat the game properly. Else the game finishes. This could be avoided, if the menue allows a preselection of the number of players. -->
</Scene>
</Level>
Modified: code/branches/gamecontent/data/levels/missionOne.oxw
===================================================================
--- code/branches/gamecontent/data/levels/missionOne.oxw 2011-11-02 15:14:02 UTC (rev 8921)
+++ code/branches/gamecontent/data/levels/missionOne.oxw 2011-11-02 15:33:24 UTC (rev 8922)
@@ -95,7 +95,16 @@
</events>
</QuestEffectBeacon>
- <!-- //TODO: end weaponsystemI -->
+<!--helper trigger to end the weaponsystemI quest -->
+ <DistanceTrigger name="boxend" position="0,0,0" distance=950 target="SpaceShip" stayActive="false" delay=0.1>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event="boxtrigger4" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </DistanceTrigger>
<QuestEffectBeacon times=1>
<effects>
@@ -103,64 +112,118 @@
</effects>
<events>
<execute>
- <EventListener event="boxtrigger4" />
+ <EventListener event="boxend" />
</execute>
</events>
</QuestEffectBeacon>
+<!--helper trigger to end the weaponsystemII quest -->
+ <DistanceTrigger name="piratesend" position="0,0,0" distance=2000 target="SpaceShip" stayActive="false" delay=0.1>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event="movingpirates2" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </DistanceTrigger>
-
<QuestEffectBeacon times=1>
<effects>
<CompleteQuest questId="missionOne.weaponsystemII" />
</effects>
<events>
<execute>
- <EventListener event=movingpirates2 />
+ <EventListener event=piratesend />
</execute>
</events>
</QuestEffectBeacon>
+<!--helper trigger to end the DuBallStation quest -->
+ <DistanceTrigger name="duballend" position="-1000,-300,700" distance=2000 target="SpaceShip" stayActive="false" delay=0.1>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event="duball3" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </DistanceTrigger>
+
+
<QuestEffectBeacon times=1>
<effects>
<CompleteQuest questId="missionOne.DuballStation" />
</effects>
<events>
<execute>
- <EventListener event=duball3 />
+ <EventListener event=duballend />
</execute>
</events>
</QuestEffectBeacon>
+<!--helper trigger to end the getHelp quest -->
+ <DistanceTrigger name="getHelpEnd" position="-48900,0,0" distance=2000 target="SpaceShip" stayActive="false" delay=0.1>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event="ondock" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </DistanceTrigger>
+
<QuestEffectBeacon times=1>
<effects>
<CompleteQuest questId="missionOne.getHelp" />
</effects>
<events>
<execute>
- <EventListener event=ondock />
+ <EventListener event=getHelpEnd />
</execute>
</events>
</QuestEffectBeacon>
+<!--helper trigger to end the getHome quest -->
+ <DistanceTrigger name="getHomeEnd" position="0,0,0" distance=4000 target="SpaceShip" stayActive="false" delay=0.1>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event="attack" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </DistanceTrigger>
+
<QuestEffectBeacon times=1>
<effects>
<CompleteQuest questId="missionOne.getHome" />
</effects>
<events>
<execute>
- <EventListener event=attack />
+ <EventListener event=getHomeEnd />
</execute>
</events>
</QuestEffectBeacon>
+<!--helper trigger to end the defence quest -->
+ <DistanceTrigger name="defenceEnd" position="0,0,0" distance=4000 target="SpaceShip" stayActive="false" delay=0.1>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event="attacktrigger6" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </DistanceTrigger>
+
<QuestEffectBeacon times=1>
<effects>
<CompleteQuest questId="missionOne.defence" />
</effects>
<events>
<execute>
- <EventListener event=attacktrigger6 />
+ <EventListener event=defenceEnd />
</execute>
</events>
</QuestEffectBeacon>
Modified: code/branches/gamecontent/data/levels/templates/spaceshipSpacecruiser.oxt
===================================================================
--- code/branches/gamecontent/data/levels/templates/spaceshipSpacecruiser.oxt 2011-11-02 15:14:02 UTC (rev 8921)
+++ code/branches/gamecontent/data/levels/templates/spaceshipSpacecruiser.oxt 2011-11-02 15:33:24 UTC (rev 8922)
@@ -66,7 +66,7 @@
</collisionShapes>
<?lua
- include("includes/weaponSettingsSpacecruiser.oxi")
+ include("../includes/weaponSettingsSpacecruiser.oxi")
?>
</SpaceShip>
</Template>
More information about the Orxonox-commit
mailing list