Changeset 10113 for code

Timestamp:

Nov 5, 2014, 4:13:41 PM (10 years ago)

Author:

flsueess

Message:

neues template mit allen bis jetzt vorhandenen Spacestation Elementen

Location:

code/branches/weaponupdateHS14/data/levels

Files:

• FPS_Level_HS14.oxw (modified) (8 diffs)
• templates/FPS_HS14.oxt (modified) (1 diff)
• templates/spacestation_elements.oxt (added)
• templates/ss_tube01.oxt (modified) (2 diffs)

code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw

@@ -21 +21 @@
   include("templates/spaceshipTurret.oxt")
   include("templates/spaceshipCollateralDamage.oxt")
-  include("templates/FPS.oxt")
+  include("templates/FPS_HS14.oxt")
   include("templates/HeavyCruiser.oxt")
+  include("templates/spacestation_elements.oxt")
 ?>
 
@@ -55 +56 @@
         template            = "spaceshipassff"
         team                = "1"
-        position            = "2830,20,50"
+        position            = "3200,0,-200"
         orientation         = "1,200,0,0"
         health              = "200"
@@ -100 +101 @@
     </StaticEntity>
 
-<!-- Docking  -->
+<!-- Docking  I -->
     <Dock position="2830,20,50" roll=0 yaw=0 >
         <animations>
@@ -113 +114 @@
             </execute>
 
-            <undocking>
+<!--    <undocking>
                 <EventListener event="undockMe" />
-            </undocking>
+            </undocking> -->
         
         </events>
         <attached>
+
         <!-- Trigger for docking with billboard -->
+        
             <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=1 />
             <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"
@@ -134 +139 @@
     
 <!-- FPS Player as destination of the dock -->
-    <FpsPlayer template = "fps" radarname = "First Person Player" position = "172,-20000,-676" >
+
+    <FpsPlayer template = "fps_HS14" radarname = "First Person Player" position = "172,-20000,-676" >
       <attached>
         <DistanceTriggerBeacon name="bcnDestroyer" />
@@ -252 +258 @@
 
 -->
-<StaticEntity position="2800,-500,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 pitch=-90>
+<StaticEntity position="2800,-500,0" direction="0,0,0" collisionType=static mass=100000 friction=0.01 pitch=-90>
 <attached>
 
@@ -260 +266 @@
 </StaticEntity>
 
-<Model position="0,0,0" mesh="cube.mesh" scale3D="10000,10,10" />
-<Model position="0,0,0" mesh="cube.mesh" scale3D="10,10000,10" />
+<Model position="0,0,0" mesh="cube_red.mesh" scale3D="10000,10,10" />
+<Model position="0,0,0" mesh="cube_green.mesh" scale3D="10,10000,10" />
 <Model position="0,0,0" mesh="cube.mesh" scale3D="10,10,10000" />
 
+<Model position="0,-20000,0" mesh="cube_red.mesh" scale3D="10000,10,10" />
+<Model position="0,-20000,0" mesh="cube_green.mesh" scale3D="10,10000,10" />
+<Model position="0,-20000,0" mesh="cube.mesh" scale3D="10,10,10000" />
+
+<Model position="0,-20010,0" mesh="cube_blue.mesh" scale3D="11,11,11" />
+<Model position="-10,-20000,0" mesh="cube_blue.mesh" scale3D="11,11,11" />
+<Model position="0,-20000,-10" mesh="cube_blue.mesh" scale3D="11,11,11" />
+
 
 <StaticEntity position="0,-20000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 pitch=-90> 
-      <attached>
-    <Model position="0,0,0" mesh="ss_tube.mesh" scale3D="100,100,100" />
+     
+ <attached>
+
+        <Model template = "ss_flag_room" position="750,-16,703.5" />
+        <Model template = "ss_tube" position="0,0,0" />
+        
+        
+ <!--   <Model position="0,0,0" mesh="ss_tube.mesh" scale3D="100,100,100" />
         <Model position="500,0,0" mesh="ss_tube.mesh" scale3D="100,100,100" />
         <Model position="1200,0,0" mesh="ss_tube_x.mesh" scale3D="100,100,100" />
@@ -285 +305 @@
         <Model position="1000,50,0" roll=180 mesh="ss_wall.mesh" scale3D="20,20,20" />
         <Model position="-830,20,0" roll=180 mesh="ss_flag_aean.mesh" scale3D="40,40,40" />
-        
+-->     
         <!--Model mesh="cube.mesh" mass=10 position="0,-100,0" scale3D="5000,0.5,1000" yaw=0 />
     <Model mesh="cube.mesh" mass=10 position="0,100,0" scale3D="2000,0.5,1000" yaw=0 />

code/branches/weaponupdateHS14/data/levels/templates/FPS_HS14.oxt

@@ -1 @@
-<Template name=fps>
+<Template name=fps_HS14>
   <FpsPlayer
    spawnparticlesource    = "Orxonox/fairytwirl"

code/branches/weaponupdateHS14/data/levels/templates/ss_tube01.oxt

@@ -4 +4 @@
 <attached>
 
-<Model position="0,0,0" yaw=0 pitch=180 roll=0 scale=4 mesh="bsBody.mesh" />
+<Model position="0,0,0" yaw=0 pitch=180 roll=0 scale=1 mesh="ss_tube.mesh" />
 
 </attached>
-    <collisionShapes>
+<!--    <collisionShapes>
         <BoxCollisionShape position="0,8,17"      halfExtents="8,10,10" />
         <BoxCollisionShape position="0,0,22"      halfExtents="18, 2, 10" />
@@ -14 +14 @@
       
     </collisionShapes>
-    
-    <Model position="0,0,0" mesh="cube.mesh" scale3D="1000,1000,1000" />
+ -->   
     
 </MovableEntity>