[Orxonox-commit 4005] r8679 - in code/branches/presentation/data/levels: . templates
dafrick at orxonox.net
dafrick at orxonox.net
Mon May 30 09:07:32 CEST 2011
Author: dafrick
Date: 2011-05-30 09:07:31 +0200 (Mon, 30 May 2011)
New Revision: 8679
Modified:
code/branches/presentation/data/levels/presentationFS11.oxw
code/branches/presentation/data/levels/spaceRace.oxw
code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt
Log:
Finalizing presentation level.
Modified: code/branches/presentation/data/levels/presentationFS11.oxw
===================================================================
--- code/branches/presentation/data/levels/presentationFS11.oxw 2011-05-30 00:38:34 UTC (rev 8678)
+++ code/branches/presentation/data/levels/presentationFS11.oxw 2011-05-30 07:07:31 UTC (rev 8679)
@@ -92,7 +92,7 @@
</events>
</SimpleNotification>
- <!-- This is a model of Earth: mass=EarthMass/1000 and radius=EarthRadius[km]*10 -->
+ <!-- EARTH -->
<Planet
position="80500,0,0"
scale="63000"
@@ -142,6 +142,14 @@
</spawn>
</events>
</ParticleSpawner>
+ <StaticEntity collisionType = "static" position = "-50,50,-125" scale=1 >
+ <attached>
+ <Model position="0,0,0" scale="2" mesh="ast1.mesh" />
+ </attached>
+ <collisionShapes>
+ <SphereCollisionShape radius="8" />
+ </collisionShapes>
+ </StaticEntity>
<SimpleNotification message="A particle effect by Tibor" >
<events>
@@ -169,30 +177,47 @@
</events>
</Script>
- <SpawnPoint position="50,0,0" lookat="-2,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
+ <SpawnPoint position="100,0,0" lookat="-2,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
<events>
<activity>
- <EventListener event=spawndelaytrigger1 />
+ <EventListener event=spawnpointtrigger />
</activity>
</events>
</SpawnPoint>
- <SpawnPoint position="0,-50,0" lookat="-2,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
+ <SpawnPoint position="0,-100,0" lookat="-2,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
<events>
<activity>
- <EventListener event=spawndelaytrigger1 />
+ <EventListener event=spawnpointtrigger />
</activity>
</events>
</SpawnPoint>
- <SpawnPoint position="0,0,50" lookat="-2,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
+ <SpawnPoint position="0,0,100" lookat="-2,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
<events>
<activity>
- <EventListener event=spawndelaytrigger1 />
+ <EventListener event=spawnpointtrigger />
</activity>
</events>
</SpawnPoint>
+ <Trigger name="spawnpointtrigger" mode="xor" invert="true" >
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event=spawndelaytrigger1 />
+ </trigger>
+ </events>
+ </EventTrigger>
+ <EventTrigger invert="true">
+ <events>
+ <trigger>
+ <EventListener event=portaltrigger />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </Trigger>
+
<!-- SPACE BOUNDARY -->
<SpaceBoundaries warnDistance="1" maxDistance="400" showDistance="300" healthDecrease="0.1" position="-90000,0,0"/>
@@ -257,19 +282,17 @@
</activity>
</events>
</PortalEndPoint>
- <PortalEndPoint position="-72000,0,0" id="4" distance="40" target="MobileEntity" design="PortalDefault">
- <attached>
- <DistanceTrigger name="portaltrigger" position="0,0,0" target="Pawn" distance=10 stayActive="true" />
- <DistanceTrigger name="portaldelaytrigger1" position="0,0,0" target="Pawn" distance=10 stayActive="true" delay=5 />
- <DistanceTrigger name="portaldelaytrigger2" position="0,0,0" target="Pawn" distance=10 stayActive="true" delay=10 />
- <DistanceTrigger name="portaldelaytrigger3" position="0,0,0" target="Pawn" distance=10 stayActive="true" delay=15 />
- <DistanceTrigger name="portaldelaytrigger4" position="0,0,0" target="Pawn" distance=10 stayActive="true" delay=17 />
- </attached>
- </PortalEndPoint>
+ <PortalEndPoint position="-72000,0,0" id="4" distance="40" target="MobileEntity" design="PortalDefault" />
<PortalLink fromID="3" toID="4" />
<PortalLink fromID="4" toID="3" />
- <SimpleNotification message="Moon orbit" >
+ <DistanceTrigger name="portaltrigger" position="-72000,0,0" target="Pawn" distance=10 stayActive="true" />
+ <DistanceTrigger name="portaldelaytrigger1" position="-72000,0,0" target="Pawn" distance=10 stayActive="true" delay=5 />
+ <DistanceTrigger name="portaldelaytrigger2" position="-72000,0,0" target="Pawn" distance=10 stayActive="true" delay=10 />
+ <DistanceTrigger name="portaldelaytrigger3" position="-72000,0,0" target="Pawn" distance=10 stayActive="true" delay=15 />
+ <DistanceTrigger name="portaldelaytrigger4" position="-72000,0,0" target="Pawn" distance=10 stayActive="true" delay=17 />
+
+ <SimpleNotification message="Welcome to Moon Orbit" >
<events>
<trigger>
<EventListener event=portaltrigger />
@@ -280,13 +303,14 @@
<SimpleNotification message="Portals by Andreas" >
<events>
<trigger>
- <EventListener event=portaltrigger1 />
+ <EventListener event=portaldelaytrigger1 />
</trigger>
</events>
</SimpleNotification>
<!-- MOON AREA -->
- <!-- This is a model of our Moon: mass=MoonMass/1000 and radius=MoonRadius[km]*10 and position=DistanceFromEarth[km]*10 -->
+
+ <!-- MOON -->
<Planet
position="-80000,0,0"
scale="4000"
@@ -315,13 +339,13 @@
<SimpleNotification message="Hydrogen farmer/space station by Hans" >
<events>
<trigger>
- <EventListener event=portaltrigger2 />
+ <EventListener event=portaldelaytrigger2 />
</trigger>
</events>
</SimpleNotification>
<!-- HYDROGEN FARMER & DOCKING -->
- <SpaceShip position="-74000,2500,0" roll=90 yaw=180 pitch=20 mass=10000 >
+ <SpaceShip position="-74000,2500,0" roll=90 yaw=180 pitch=20 mass=10000 health=100000 >
<attached>
<!-- Docking -->
<DistanceTriggerBeacon name="bcnDestroyer" />
@@ -353,7 +377,7 @@
</execute>
</events>
<attached>
- <DistanceTrigger position="10,-202, -42" distance="400" target="Pawn"
+ <DistanceTrigger position="10,-202, -42" distance="800" target="Pawn"
beaconMode="exclude" targetname="bcnDestroyer" name="dockMe"
/>
<Billboard position="10,-202,-42" material="Examples/Flare" colour="1.0, 0, 0" />
@@ -370,7 +394,7 @@
<SimpleNotification message="Oh, what have we here?" >
<events>
<trigger>
- <EventListener event=portaltrigger3 />
+ <EventListener event=portaldelaytrigger3 />
</trigger>
</events>
</SimpleNotification>
@@ -378,21 +402,64 @@
<SimpleNotification message="Shrink pickup by Sandro" >
<events>
<trigger>
- <EventListener event=portaltrigger4 />
+ <EventListener event=portaldelaytrigger4 />
</trigger>
</events>
</SimpleNotification>
- <PickupSpawner position="25,50,-125" respawnTime="10" triggerDistance="20" maxSpawnedItems="5" visible="false">
+ <PickupSpawner position="-72487,420,-63" respawnTime="10" triggerDistance="20" maxSpawnedItems="5" active="false">
<pickup>
- <ShrinkPickup template ="mediumshrinkpickup"/>
+ <ShrinkPickup template ="smallshrinkpickup"/>
</pickup>
<events>
- <visibility>
- <EventListener event=portaltrigger3 />
- </visibility>
+ <activity>
+ <EventListener event=portaldelaytrigger3 />
+ </activity>
</events>
+ <attached>
+ <ParticleSpawner position="0,0,0" source="Orxonox/Shield" autostart="false" lifetime=500 loop=0 >
+ <events>
+ <spawn>
+ <EventListener event=portaldelaytrigger3 />
+ </spawn>
+ </events>
+ </ParticleSpawner>
+ </attached>
</PickupSpawner>
+
+ <SpaceBoundaries warnDistance="1" maxDistance="1700" showDistance="500" healthDecrease="0.1" position="-72369,803,2"/>
+ <SpaceBoundaries warnDistance="1" maxDistance="800" showDistance="300" healthDecrease="0.1" position="-73450,5067,-351"/>
+
+ <!-- FINISH -->
+
+ <DistanceTrigger name="dockingtrigger" position="-73942, 1288, -255" target="Pawn" distance=20 stayActive="true" />
+ <DistanceTrigger name="dockingdelaytrigger1" position="-73942, 1288, -255" target="Pawn" distance=20 stayActive="true" delay=3 />
+ <DistanceTrigger name="dockingdelaytrigger2" position="-73942, 1288, -255" target="Pawn" distance=20 stayActive="true" delay=10 />
+
+ <SimpleNotification message="Docking by Sven" >
+ <events>
+ <trigger>
+ <EventListener event=dockingtrigger />
+ </trigger>
+ </events>
+ </SimpleNotification>
+
+ <SimpleNotification message="Weapons by Jonas" >
+ <events>
+ <trigger>
+ <EventListener event=dockingdelaytrigger1 />
+ </trigger>
+ </events>
+ </SimpleNotification>
+
+ <SimpleNotification message="Steering enhancement by Manuel" >
+ <events>
+ <trigger>
+ <EventListener event=dockingdelaytrigger2 />
+ </trigger>
+ </events>
+ </SimpleNotification>
+
</Scene>
</Level>
Modified: code/branches/presentation/data/levels/spaceRace.oxw
===================================================================
--- code/branches/presentation/data/levels/spaceRace.oxw 2011-05-30 00:38:34 UTC (rev 8678)
+++ code/branches/presentation/data/levels/spaceRace.oxw 2011-05-30 07:07:31 UTC (rev 8679)
@@ -353,7 +353,7 @@
</collisionShapes>
</StaticEntity>
- <!-- ---------------asteroid ellypse----------------- -->
+ <!-- ---------------asteroid ellipse----------------- -->
<?lua
max = 20
for i = 0, max, 1
Modified: code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt
===================================================================
--- code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt 2011-05-30 00:38:34 UTC (rev 8678)
+++ code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt 2011-05-30 07:07:31 UTC (rev 8679)
@@ -30,7 +30,7 @@
boostCooldownDuration = 10
shakeFrequency = 15
- shakeAmplitude = 7
+ shakeAmplitude = 9
collisionType = "dynamic"
mass = 100
More information about the Orxonox-commit
mailing list