[Orxonox-commit 6100] r10758 - code/branches/campaignHS15/data/levels

[paulsc at orxonox.net]

Author: paulsc
Date: 2015-11-02 16:33:32 +0100 (Mon, 02 Nov 2015)
New Revision: 10758

Modified:
   code/branches/campaignHS15/data/levels/Campaign1.oxw
Log:
Corrected ally behavoiur. Friendly fire needs fixing though

Modified: code/branches/campaignHS15/data/levels/Campaign1.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/Campaign1.oxw	2015-11-02 15:05:04 UTC (rev 10757)
+++ code/branches/campaignHS15/data/levels/Campaign1.oxw	2015-11-02 15:33:32 UTC (rev 10758)
@@ -5,8 +5,6 @@
     screenshot = "missionOne.png"
 />
 
-<!-- Coordinatesystem as following: (y, z, x) -->
-
 <?lua
     include("stats.oxo")
     include("HUDTemplates3.oxo")
@@ -60,7 +58,7 @@
     <!--QUEST DEFINITIONS-->
 
     <GlobalQuest id="quest1">
-        <QuestDescription title="Reach the Station A!" description="Commander we observed some alien activity on our radars. We suppose they want to attack our shuttle! You need to upgrade your spaceship. So hurry up and move your ass to this dock on your [direction] side!" failMessage="" completeMessage="Good job, we still have some time to prepare for their attack." />
+        <QuestDescription title="Reach the Station A!" description="" failMessage="" completeMessage="" />
         <hints>
             <QuestHint id="quest1hint1" />
         </hints>
@@ -185,9 +183,13 @@
         </events>
     </EventMultiTrigger>
 
-    <!-- TODO: fictive unit; to be added later -->
-    <DistanceTrigger name="joinedUnit" position="3000,-2000,0" distance=100 target="SpaceShip" beaconMode="exclude" targetname="NPC" stayactive=true />
-    <Billboard position="3000,-1000,0" amplitude=1 material="Flares/lensflare" colour="1,0,0.05" />     <!-- For debugging puropses -->
+    <DistanceTrigger name="joinedUnit" active=false position="3000,-2000,0" distance=100 target="SpaceShip" beaconMode="exclude" targetname="NPC" stayactive=true>
+        <events>
+            <activity>
+                    <EventListener event="dockedA" />
+            </activity>
+        </events>
+    </DistanceTrigger>
 
     <EventMultiTrigger name="wave1" activations="1" stayactive="true" delay=4>
         <events>
@@ -422,7 +424,7 @@
 
     <!-- (Temporary) Template for stations. Used to define common features of all Stations. -->
     <Template name="station">
-        <Pawn mass=10000000 collisionType=dynamic friction=0.01>
+        <Pawn mass=10000 collisionType=dynamic friction=0.01>
           <attached>
             <Model mesh="HydroHarvester.mesh" position="0,0,0" scale=50 />
             <DistanceTriggerBeacon name="NPC" />
@@ -553,7 +555,7 @@
     </SpaceShip>
 
     <!-- FPS Player as destination of dock C-->
-    <FpsPlayer team=0 template = "fps" rotationaxis="0,0,1" radarname="First Person Player" position="0,-2300,1201">
+    <FpsPlayer team=0 template = "fps" rotationaxis="0,0,1" radarname = "First Person Player" position = "0,-2300,1201">
         <attached>
             <DockingTarget name="fpsMode" />
             <DistanceTriggerBeacon name="fpsPlayer" />
@@ -641,7 +643,7 @@
         asteroidBelt(-1000, -20000, 4000, 30, 20, 100, 20, 40, 3400, 3700, 400, 1)
     ?>
 
-    <!-- ws, 3000,-2000 -->
+    <!-- Allies, 3000,-2000 -->
     <?lua
     for i = 1, allies, 1
     do
@@ -664,10 +666,7 @@
             <DistanceTriggerBeacon name="NPC" />
         </attached>
         <controller>
-            <WaypointPatrolController accuracy=1000 name="allyController" alertnessradius=500 team=0 active=false>
-                <waypoints>
-                    <StaticEntity position="0,0,0" />
-                </waypoints>
+            <WaypointPatrolController accuracy=100 name="allyController" alertnessradius=5000 team=0 active=false>
                 <events>
                     <activity>
                         <EventListener event="joinedUnit" />
@@ -684,15 +683,11 @@
     do
     ?>
     <?lua
-    for j = enemies, enemies+(3*waves), 3
+    for i = 1, enemies, 1
     do
+    x = math.cos(math.pi/(8)*(i+1))*1500
+    y = math.sin(math.pi/(8)*(i+1))*1500
     ?>
-    <?lua
-    for i = 1, j, 1
-    do
-    x = math.cos(math.pi/(8+4*(k-1))*(i+1))*1500
-    y = math.sin(math.pi/(8+4*(k-1))*(i+1))*1500
-    ?>
     <SpaceShip visible=false active=false name="attackers<?lua print(k)?>" radarname="Attacker" position="<?lua print(x)?>,<?lua print(y)?>,<?lua print(math.pow(-1,i)*250) ?>" lookat="0,0,0" team=1>
         <templates>
             <Template link="spaceshippirate" />
@@ -709,7 +704,7 @@
             <DistanceTriggerBeacon name="NPC" />
         </attached>
         <controller>
-            <WaypointPatrolController name="attackController" accuracy=100 alertnessradius=200 team=1 active=false>
+            <WaypointPatrolController name="attackController" accuracy=100 alertnessradius=100 team=1 active=false>
                 <waypoints>
                     <Attacher target="transporter" deletewithparent=false />
                 </waypoints>
@@ -723,7 +718,6 @@
     </SpaceShip>
     <?lua end ?>
     <?lua end ?>
-    <?lua end ?>
 
 
     <!-- Transporter, starting Point is near A, end Point near B, the circle parameters for the waypoints are: Center = (0, -887, 0), r = 2613 -->