[Orxonox-commit 6308] r10965 - code/branches/planetLevelHS15/data/levels

[luhug at orxonox.net]

Author: luhug
Date: 2015-12-10 20:59:23 +0100 (Thu, 10 Dec 2015)
New Revision: 10965

Modified:
   code/branches/planetLevelHS15/data/levels/planetLevelHS15.oxw
Log:
Finished!

Modified: code/branches/planetLevelHS15/data/levels/planetLevelHS15.oxw
===================================================================
--- code/branches/planetLevelHS15/data/levels/planetLevelHS15.oxw	2015-12-09 16:50:50 UTC (rev 10964)
+++ code/branches/planetLevelHS15/data/levels/planetLevelHS15.oxw	2015-12-10 19:59:23 UTC (rev 10965)
@@ -25,8 +25,8 @@
 PLANET_DISTANCE = 1000000
 PLANET_SCALE = 20000
 SKYBOX_SCALE = 100000
-X = 100
-Y = 100
+X = 20
+Y = 20
 CELL_SIZE = 600
 ?>
 
@@ -44,7 +44,7 @@
         if (currentX > 0 and currentX < x and currentY > 1 --[[and currentY ~= y]]) then
         returnString = returnString .. "<StaticEntity collisionType=\"static\" position=\"" .. (currentX*cellSize) .. "," .. (currentY*cellSize - (cellSize/2)) .. ",0\" direction=\"0,1,0\" pitch=\"0\" roll=\"0\" yaw=\"" .. orientation .. "\">  <attached> <Model position=\"0,0,0\" mesh=\"" .. houses[houseNr] .. ".mesh\" scale=\"" .. scales[houseNr] .. "\"/></attached><collisionShapes>" .. collisionShapes[houseNr] .. "</collisionShapes></StaticEntity>\n\n"
         end
-        returnString = returnString .. "<StaticEntity collisionType=\"static\" position=\"" .. (currentX*cellSize - cellSize/2) .. "," .. (currentY*cellSize) .. ",0\" direction=\"0,1,0\" pitch=\"0\" roll=\"0\" yaw=\"0\">  <attached> <Model position=\"0,0,0\" mesh=\"CityGround.mesh\" scale=\"" .. cellSize .. "\"/></attached><collisionShapes><BoxCollisionShape position=\"0,0,0\" halfExtents=\"500,0,500\"/></collisionShapes></StaticEntity>\n\n"
+        returnString = returnString .. "<StaticEntity collisionType=\"static\" position=\"" .. (currentX*cellSize - cellSize/2) .. "," .. (currentY*cellSize) .. ",0\" direction=\"0,1,0\" pitch=\"0\" roll=\"0\" yaw=\"0\">  <attached> <Model position=\"0,0,0\" mesh=\"CityGroundLamps.mesh\" scale=\"" .. cellSize .. "\"/><Model position=\"0,0,0\" mesh=\"CityGround.mesh\" scale=\"" .. cellSize .. "\"/></attached><collisionShapes><BoxCollisionShape position=\"0,0,0\" halfExtents=\"500,0,500\"/><BoxCollisionShape position=\"48.5,50.88,192\" halfExtents=\"5,50.88,5\"/><BoxCollisionShape position=\"48.5,50.88,-192\" halfExtents=\"5,50.88,5\"/><BoxCollisionShape position=\"48.5,50.88,-54\" halfExtents=\"5,50.88,5\"/><BoxCollisionShape position=\"48.5,50.88,54\" halfExtents=\"5,50.88,5\"/><BoxCollisionShape position=\"-48.5,50.88,192\" halfExtents=\"5,50.88,5\"/><BoxCollisionShape position=\"-48.5,50.88,-192\" halfExtents=\"5,50.88,5\"/><BoxCollisionShape position=\"-48.5,50.88,-54\" halfExtents=\"5,50.88,5\"/><BoxCollisionShape position=\"-48.5,50.88,54\" halfExtents=\"5,50.88,5\"/></collisionShapes></StaticEntity>\n\n"
       end
     end
     return returnString
@@ -56,28 +56,15 @@
   <templates>
     <Template link=lodtemplate_default />
   </templates>
+
   <?lua include("includes/notifications.oxi") ?>
-<Template name=PortalDefault>
-    <PortalEndPoint>
-        <attached>
-            <Model mesh="Spacegate.mesh" yaw="90"/>
-        </attached>
-    </PortalEndPoint>
-</Template>
 
-<Template name=PortalBig>
-    <PortalEndPoint>
-        <attached>
-            <Billboard material="Portals/Big" />
-        </attached>
-    </PortalEndPoint>
-</Template>
+
   <Scene
     ambientlight = "10, 10, 10"
     skybox       = "Orxonox/Starbox"
   >
 
-<!--    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/> -->
     
     <Planet
       position="<?lua print(PLANET_DISTANCE)?>,0,0"
@@ -86,7 +73,6 @@
       linearDamping="0.8"
       angularDamping="0"
       mass="5.9e21"
-      pitch="0"
       mesh="planets/earth.mesh"
       atmosphere="atmosphere1"
       rotationaxis="0,1,0"
@@ -119,16 +105,16 @@
             </visibility>
           </events>
         </Model>
-        <PortalEndPoint position="<?lua print(X*CELL_SIZE/2) ?>,<?lua print(Y*CELL_SIZE/2) ?>,1000" id="1" distance="40" target="Pawn" design="PortalDefault"/>
+        <PortalEndPoint position="<?lua print(X*CELL_SIZE/2) ?>,500,<?lua print(Y*CELL_SIZE/2) ?>" id="3" distance="40" target="Pawn"/>
         <Light type="point" position="0,0,0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     </attached>
 
 </StaticEntity>
 
-<SpawnPoint team=0 position="<!--<?lua print(PLANET_DISTANCE - PLANET_SCALE - 5000)?> -->0,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort direction="0,1,0" />
+<SpawnPoint team=0 position="<?lua print(PLANET_DISTANCE - PLANET_SCALE - 5000)?>,0,0" lookat="<?lua print(PLANET_DISTANCE) ?>,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort orientation="-0.4,-0.6,0.6,0.4" />
 
-<PortalEndPoint position = "<?lua print(PLANET_DISTANCE) ?>,0,0" id="2" distance=<?lua print(PLANET_SCALE)?> target="Pawn" design="PortalEndPoint"/>
-<PortalEndPoint position="<?lua print(PLANET_DISTANCE + PLANET_SCALE + 6000) ?>,0,0" id="1" distance="40" target="Pawn" design="PortalEndPoint"/>
+<PortalEndPoint position = "<?lua print(PLANET_DISTANCE) ?>,0,0" id="2" distance=<?lua print(PLANET_SCALE)?> target="Pawn"/>
+<PortalEndPoint position="<?lua print(PLANET_DISTANCE + PLANET_SCALE + 6000) ?>,0,0" id="1" distance="40" target="Pawn"/>
 
 
 <PortalLink fromID="2" toID="3" />