[Orxonox-commit 5514] r10177 - code/branches/weaponupdateHS14/data/levels

[flsueess at orxonox.net]

Author: flsueess
Date: 2014-12-11 17:06:41 +0100 (Thu, 11 Dec 2014)
New Revision: 10177

Modified:
   code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw
   code/branches/weaponupdateHS14/data/levels/presentationHS13.oxw
Log:
holos gesetzt

Modified: code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw
===================================================================
--- code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw	2014-12-11 15:09:29 UTC (rev 10176)
+++ code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw	2014-12-11 16:06:41 UTC (rev 10177)
@@ -53,27 +53,7 @@
     <SpawnPoint team=1 position="3000,0,0" lookat="4000,-1000,-1000" spawnclass=SpaceShip pawndesign=spaceshipescort />
 	<!--6000,2000,500-->
 	
-	<SpaceShip			
-        template            = "spaceshipassff"
-        team                = "1"
-        position            = "3200,0,-200"
-        orientation         = "1,200,0,0"
-        health              = "200"
-        initialhealth       = "200"
-        maxhealth           = "200"
-        shieldhealth        = "50"
-        initialshieldhealth = "50"
-        maxshieldhealth     = "50"
-        shieldabsorption    = "0.8"
-        reloadrate          = "1"
-        reloadwaittime      = "1"
-        name                = "Tanis1"
-        radarname           = "Light-Destroyer" >
-       <attached>
-        <DockingTarget name="spaceShip" />
-        <DistanceTriggerBeacon name="bcnSpaceShip" />
-      </attached>
-    </SpaceShip>
+
 	
 	
         
@@ -102,7 +82,7 @@
     </StaticEntity>
 
 
-	<!-- Docking I -->
+	<!-- Docking  -->
 	    <Dock position="2830,20,50" roll=0 yaw=0 >
 	        <animations>
 	            <MoveToDockingTarget target="fistperson" />
@@ -126,9 +106,9 @@
 	            <DistanceTrigger position="0,0,0" distance="200" target="Pawn"
 	                beaconMode="exclude" targetname="bcnDestroyer" name="dockMe"
 	            />
-		<!-- Trigger for undocking with billboard -->
-		    <Billboard position="-2800,-20055,-700" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=1 />
-		    <DistanceTrigger position="-2800,-20055,-700" distance="150" target="Pawn"
+		<!-- Trigger for undocking with billboard -2800,-20055,-700-->
+		    <Billboard position="-1500,-20100,-50" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=1 />
+		    <DistanceTrigger position="-1500,-20100,-50" distance="150" target="Pawn"
 	                beaconMode="identify" targetname="bcnDestroyer" name="undockMe"
 	            />
 	        </attached>
@@ -148,7 +128,7 @@
 
 
 	<!-- Docking  II -->
-	    <Dock position="160,-20055,-700" roll=0 yaw=0 >
+	    <Dock position="86,-20055,-700" roll=0 yaw=0 >
 	        <animations>
 	            <MoveToDockingTarget target="spaceShip" />
 	        </animations>
@@ -161,27 +141,50 @@
 	            </execute>
 
 		    <undocking>
-			<EventListener event="undockMe" />
+				<EventListener event="undockMe" />
 		    </undocking>
 		
 	        </events>
 	        <attached>
 		<!-- Trigger for docking with billboard -->
-	            <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.3,0.4,0.5" scale=1 />
-	            <DistanceTrigger position="0,0,0" distance="200" target="Pawn"
+	            <Billboard position="0,50,0" material="Flares/ringflare2" colour="0.3,0.4,0.5" scale=1 />
+	            <DistanceTrigger position="0,0,0" distance="100" target="Pawn"
 	                beaconMode="exclude" targetname="bcnSpaceShip" name="dockMe"
 	            />
 		<!-- Trigger for undocking with billboard -->
-		    <Billboard position="4140,20055,-295" material="Flares/ringflare2" colour="0.3,0.4,0.5" scale=1 />
-		    <DistanceTrigger position="4140,20055,-295" distance="300" target="Pawn"
+		    <Billboard position="3251,20036,380" material="Flares/ringflare2" colour="0.3,0.4,0.5" scale=1 />
+		    <DistanceTrigger position="3251,20036,380" distance="100" target="Pawn"
 	                beaconMode="identify" targetname="bcnSpaceShip" name="undockMe"
 	            />
 	        </attached>	
 	 </Dock>
+	
 
+	<SpaceShip			
+        template            = "spaceshipAssff"
+        team                = "0"
+        position            = "3337,-19,-320"
+        orientation         = "1,200,0,0"
+        health              = "200"
+        initialhealth       = "200"
+        maxhealth           = "200"
+        shieldhealth        = "50"
+        initialshieldhealth = "50"
+        maxshieldhealth     = "50"
+        shieldabsorption    = "0.8"
+        reloadrate          = "1"
+        reloadwaittime      = "1"
+        name                = "Tanis1"
+        radarname           = "Light Destroyer" >
+       <attached>
+        <DockingTarget name="spaceShip" />
+        <DistanceTriggerBeacon name="bcnSpaceShip" />
+      </attached>
+    </SpaceShip>
+
  <!-- Enemy ships -->
  
-	<SpaceShip			
+<!--	<SpaceShip			
         template            = "HeavyCruiser"
         team                = "0"
         position            = "5800,-200,-1200"
@@ -195,11 +198,11 @@
         shieldabsorption    = "0.8"
         reloadrate          = "1"
         reloadwaittime      = "1"
-        name                = "Tanis1"
-        radarname           = "Tanis Cruiser" >
+        name                = "Tanis0"
+        radarname           = "Tanis big ship" >
    </SpaceShip>
+    -->
     
-    
  <!--   <SpaceShip			
         template            = "spaceshippirate"
         team                = "0"
@@ -214,7 +217,7 @@
         shieldabsorption    = "0.8"
         reloadrate          = "1"
         reloadwaittime      = "1"
-        name                = "Tanis1"
+        name                = "Tanis0"
         radarname           = "Pirate1" >
         
         <controller>
@@ -237,7 +240,7 @@
         shieldabsorption    = "0.8"
         reloadrate          = "1"
         reloadwaittime      = "1"
-        name                = "Tanis1"
+        name                = "Tanis0"
         radarname           = "Pirate2" >
         
         <controller>

Modified: code/branches/weaponupdateHS14/data/levels/presentationHS13.oxw
===================================================================
--- code/branches/weaponupdateHS14/data/levels/presentationHS13.oxw	2014-12-11 15:09:29 UTC (rev 10176)
+++ code/branches/weaponupdateHS14/data/levels/presentationHS13.oxw	2014-12-11 16:06:41 UTC (rev 10177)
@@ -130,7 +130,7 @@
             </execute>
 
 	    <undocking>
-		<EventListener event="undockMe" />
+			<EventListener event="undockMe" />
 	    </undocking>
 	
         </events>