[Orxonox-commit 6247] r10904 - code/branches/campaignHS15/data/levels
paulsc at orxonox.net
paulsc at orxonox.net
Mon Nov 30 17:41:43 CET 2015
Author: paulsc
Date: 2015-11-30 17:41:43 +0100 (Mon, 30 Nov 2015)
New Revision: 10904
Modified:
code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw
Log:
Did nothing today.
Modified: code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw 2015-11-30 16:39:43 UTC (rev 10903)
+++ code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw 2015-11-30 16:41:43 UTC (rev 10904)
@@ -236,6 +236,14 @@
</events>
</EventMultiTrigger>
+ <EventMultiTrigger name="spawned" stayactive=true activations=1>
+ <events>
+ <trigger>
+ <EventListener event="spawntrigger" />
+ </trigger>
+ </events>
+ </EventMultiTrigger>
+
<DistanceTrigger name="reachedSector" position="<?lua printC(cSector) ?>" distance="<?lua print(radSector) ?>" target="SpaceShip" beaconMode="identify" targetname="Commander" stayactive=true />
<EventMultiTrigger name="addQuest2">
@@ -262,38 +270,38 @@
</targets>
<events>
<activity>
- <Trigger mode=or>
- <EventTrigger invert=true>
- <events>
- <trigger>
- <EventListener event="alliesReachedWait" />
- </trigger>
- </events>
- </EventTrigger>
- <EventTrigger>
- <events>
- <trigger>
- <EventListener event="noMercy" />
- </trigger>
- </events>
- </EventTrigger>
- <Trigger mode=and>
- <EventTrigger>
- <events>
- <trigger>
- <EventListener event="fightBegun" />
- </trigger>
- </events>
- </EventTrigger>
- <EventTrigger invert=true>
- <events>
- <trigger>
- <EventListener event="oneUnitLeft" />
- </trigger>
- </events>
- </EventTrigger>
- </Trigger>
- </Trigger>
+ <Trigger mode=or>
+ <EventTrigger invert=true>
+ <events>
+ <trigger>
+ <EventListener event="alliesReachedWait" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event="noMercy" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ <Trigger mode=and>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event="fightBegun" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ <EventTrigger invert=true>
+ <events>
+ <trigger>
+ <EventListener event="oneUnitLeft" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </Trigger>
+ </Trigger>
</activity>
</events>
</EventDispatcher>
@@ -453,7 +461,7 @@
</events>
</EventMultiTrigger>
- <EventMultiTrigger name="AllUnitsDown" stayactive=true>
+ <EventMultiTrigger name="allUnitsDown" stayactive=true>
<events>
<trigger>
<Trigger mode=and>
@@ -798,7 +806,7 @@
<SimpleNotification broadcast="true" message="Well done, Commander. You got rid of the alien scum.">
<events>
<trigger>
- <EventListener event="AllUnitsDown" />
+ <EventListener event="allUnitsDown" />
</trigger>
</events>
</SimpleNotification>
@@ -960,30 +968,52 @@
</attached>
<events>
<activity>
- <EventListener event="cloakBeacon" />
+ <EventListener event="enemyPlanetVisible" />
</activity>
<visibility>
- <EventListener event="cloakBeacon" />
+ <EventListener event="enemyPlanetVisible" />
</visibility>
</events>
- <collisionShapes>
- <SphereCollisionShape radius="5000" position="0,0,0" />
- </collisionShapes>
</Planet>
+ <EventMultiTrigger name="enemyPlanetMulti">
+ <events>
+ <trigger>
+ <EventListener event="enemyPlanet" />
+ </trigger>
+ </events>
+ </EventMultiTrigger>
+
+ <EventMultiTrigger name="enemyPlanetVisible">
+ <events>
+ <trigger>
+ <Trigger mode=and>
+ <EventTrigger>
+ <events>
+ <trigger>
+ <EventListener event="cloakBeacon" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ <EventTrigger invert=true>
+ <events>
+ <trigger>
+ <EventListener event="enemyPlanetMulti" />
+ </trigger>
+ </events>
+ </EventTrigger>
+ </Trigger>
+ </trigger>
+ </events>
+ </EventMultiTrigger>
+
<!-- Pawn that represents the planet during destruction -->
- <Pawn active=false team=1 initialhealth=500 health=500 maxhealth=500 position="<?lua printC(cEnemyBasePlanet) ?>" radarname="Enemy Home Planet" name="enemyPlanet">
- <events>
- <activity>
- <EventListener event="oneUnitLeft" />
- </activity>
- </events>
+ <Pawn team=1 health=300 name="enemyPlanet" position="<?lua printC(cEnemyBasePlanet) ?>" collisionType=dynamic mass=5000000 radarname="Enemy home planet">
<collisionShapes>
- <SphereCollisionShape radius="6000" position="0,0,0" />
+ <SphereCollisionShape position="0,0,0" radius=5500/>
</collisionShapes>
</Pawn>
-
<!--SHIPS -->
<!--Allied units-->
@@ -1006,7 +1036,7 @@
for i = 1, 13, 1
do
?>
- <Actionpoint position="<?lua printC(addC(cPathToEntry[i], rUnit)) ?>" action="fly" />
+ <Actionpoint position="<?lua printC(addC(cPathToEntry[i], rUnit)) ?>" action="fly"/>
<?lua end ?>
</actionpoints>
</DivisionController>
@@ -1067,7 +1097,7 @@
</visibility>
</events>
<controller>
- <DivisionController name="enemyControll" active=false team=1 formationMode="diamond" spread=100>
+ <DivisionController name="enemyController" active=false team=1 formationMode="diamond" spread=100>
<actionpoints>
<Actionpoint position="<?lua printC(cEnemyNow) ?>" action="fightall" />
</actionpoints>
@@ -1088,7 +1118,7 @@
</visibility>
</events>
<controller>
- <SectionController name="enemyControll" active=false team=1>
+ <SectionController name="enemyController" active=false team=1>
</SectionController>
</controller>
</SpaceShip>
@@ -1106,7 +1136,7 @@
</visibility>
</events>
<controller>
- <WingmanController name="enemyControll" active=false team=1>
+ <WingmanController name="enemyController" active=false team=1>
</WingmanController>
</controller>
</SpaceShip>
@@ -1124,7 +1154,7 @@
</visibility>
</events>
<controller>
- <WingmanController name="enemyControll" active=false team=1>
+ <WingmanController name="enemyController" active=false team=1>
</WingmanController>
</controller>
</SpaceShip>
More information about the Orxonox-commit
mailing list