Changeset 10804 for code/branches/campaignHS15/data

Timestamp:

Nov 15, 2015, 12:05:48 AM (9 years ago)

Author:

paulsc

Message:

Started work on spaceshipShuttle.oxt, furthered quests.

Location:

code/branches/campaignHS15/data/levels

Files:

• Campaign1.oxw (modified) (13 diffs)
• templates/spaceshipShuttle.oxt (added)

code/branches/campaignHS15/data/levels/Campaign1.oxw

@@ -14 +14 @@
     include("templates/spaceshipPirate.oxt")
     include("templates/spaceshipEscort.oxt")
-    include("templates/spaceshipTransporter.oxt")
+    include("templates/spaceshipShuttle.oxt")
     include("templates/FPS.oxt")
+    include("templates/pickupRepresentationTemplates.oxt")
 ?>
 
@@ -289 +290 @@
     </EventDispatcher>
 
-    <DistanceTrigger active=false name="reachedC" position="<?lua printC(cC) ?>" distance=1000 target="SpaceShip" beaconMode="exclude" targetname="NPC" stayactive=true>
+    <DistanceTrigger active=false name="reachedC" position="<?lua printC(cC) ?>" distance=400 target="SpaceShip" beaconMode="exclude" targetname="NPC" stayactive=true>
         <events>
             <activity>
@@ -679 +680 @@
     <!-- (Temporary) Template for stations. Used to define common features of all Stations. -->
     <Template name="station">
-        <Pawn mass=10000 collisionType=dynamic friction=0.01>
+        <Pawn mass=10000000 collisionType=dynamic friction=0.01>
             <attached>
                 <Model mesh="HydroHarvester.mesh" position="0,0,0" scale=50 />
@@ -706 +707 @@
 
     <!-- A, Coordinates are approx. (cos(29pi/16), sin(29pi/16), 0)*3000 -->
-    <Pawn name="statA" team=0 radarname="Station A" position="<?lua printC(cA) ?>" direction="<?lua printC(dStation) ?>" initialhealth=10000 maxhealth=10000>
+    <Pawn name="statA" team=0 radarname="Station A" position="<?lua printC(cA) ?>" direction="<?lua printC(dStation) ?>" yaw=-50 initialhealth=10000 maxhealth=10000>
         <templates>
             <Template link="station" />
@@ -733 +734 @@
 
     <!-- B, Coordinates are approx. (-cos(29pi/16), sin(29pi/16), 0)*3000 -->
-    <Pawn name="statB" team=0 radarname="Station B" position="<?lua printC(cB) ?>" direction="<?lua printC(dStation) ?>" initialhealth=10000 maxhealth=10000>
+    <Pawn name="statB" team=0 radarname="Station B" position="<?lua printC(cB) ?>" direction="<?lua printC(dStation) ?>" yaw=210 initialhealth=10000 maxhealth=10000>
         <templates>
             <Template link="station" />
@@ -739 +740 @@
         <attached>
             <DockingTarget name="dockTargetB" />
-            <Dock position="0,0,0" active=true>
+            <Dock position="0,0,0" active=false>
                 <animations>
                     <MoveToDockingTarget target="dockTargetB" />
@@ -766 +767 @@
         <attached>
             <DockingTarget name="dockTargetC" />
-            <Dock position="0,0,0" active=true>
+            <Dock position="0,0,0">
                 <animations>
                     <MoveToDockingTarget target="dockTargetC" />
@@ -777 +778 @@
                         <EventListener event="dockC" />
                     </execute>
-                    <active>
-                        <EventListener event="reachedC" />
-                    </active>
                 </events>
                 <attached>
@@ -791 +789 @@
                                 <EventListener event="undockC" />
                             </execute>
-                            <active>
-                                <EventListener event="reachedC" />
-                            </active>
                         </events>
                     </Dock>
-                    <DistanceTrigger position="0,0,0" distance="200" target="SpaceShip" beaconMode="exclude" targetname="NPC" name="dockC" />
+                    <DistanceTrigger active=false position="0,0,0" distance="200" target="SpaceShip" beaconMode="exclude" targetname="NPC" name="dockC">
+                        <events>
+                            <activity>
+                                <EventListener event="reachedC" />
+                            </activity>
+                        </events>
+                    </DistanceTrigger>
                     <Billboard position="0,0,0" amplitude=1 material="Flares/lensflare" colour="1,0,0.05" />
                 </attached>
@@ -811 +812 @@
             health              = "400"
             initialhealth       = "400"
-            maxhealth           = "500"
+            maxhealth           = "1500"
             shieldhealth        = "80"
             initialshieldhealth = "80"
@@ -924 +925 @@
 
     <!-- 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" >
+    <SpaceShip 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>
@@ -934 +935 @@
         </events>
         <attached>
-            <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
+            <Model position="0,0,0" mesh="crate.mesh" scale3D="10,10,10" />
         </attached>
         <collisionShapes>
-            <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
+            <BoxCollisionShape position="0,0,0" halfExtents="30,30,30" />
         </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">
+    </SpaceShip>
+
+    <?lua
+        include("includes/pickups.oxi")
+    ?>
+
+    <PickupSpawner pickup=hugeshieldpickup position="<?lua print((cC[1]+585) .. ',' .. cC[2] .. ',' .. (cC[3]-585)) ?>" triggerDistance="15" maxSpawnedItems="1">
         <events>
             <visibility>
-                <EventListener event="gotPickups" />
+                <EventListener event="readyAfterWave2" />
             </visibility>
+            <activity>
+                <EventListener event="readyAfterWave2" />
+            </activity>
         </events>
     </PickupSpawner>
 
-    <PickupSpawner pickup=mediumspeedpickup position="<?lua print((cC[1]+600) .. ',' .. cC[2] .. ',' .. (cC[3]-600)) ?>" triggerDistance="10" maxSpawnedItems="1"  visible="true">
+    <PickupSpawner pickup=crazyhealthpickup position="<?lua print((cC[1]+615) .. ',' .. cC[2] .. ',' .. (cC[3]-615)) ?>" triggerDistance="15" maxSpawnedItems="1">
         <events>
             <visibility>
-                <EventListener event="gotPickups" />
+                <EventListener event="readyAfterWave2" />
             </visibility>
+            <activity>
+                <EventListener event="readyAfterWave2" />
+            </activity>
         </events>
     </PickupSpawner>
 
-    -->
+    <PickupSpawner pickup=hugespeedpickup position="<?lua print((cC[1]+585) .. ',' .. cC[2] .. ',' .. (cC[3]-615)) ?>" triggerDistance="15" maxSpawnedItems="1" >
+        <events>
+            <visibility>
+                <EventListener event="readyAfterWave2" />
+            </visibility>
+            <activity>
+                <EventListener event="readyAfterWave2" />
+            </activity>
+        </events>
+    </PickupSpawner>
 
     <!-- Allies -->
@@ -1038 +1056 @@
     <SpaceShip position="<?lua printC(cA) ?>" lookat="<?lua printC(cB) ?>" team=0 name="transporter" radarname="Shuttle">
         <templates>
-            <Template link="spaceshipTransporter" />
+            <Template link="spaceshipShuttle" />
         </templates>
         <attached>