[Orxonox-commit 7293] r11910 - in code/branches/Masterserver_FS18/data: levels overlays

varyo at orxonox.net varyo at orxonox.net
Thu Apr 26 15:56:12 CEST 2018


Author: varyo
Date: 2018-04-26 15:56:12 +0200 (Thu, 26 Apr 2018)
New Revision: 11910

Modified:
   code/branches/Masterserver_FS18/data/levels/testMultiplayerLevel.oxw
   code/branches/Masterserver_FS18/data/overlays/lastTeamStandingHUD.oxo
Log:
minor changes to test multiplayer levels

Modified: code/branches/Masterserver_FS18/data/levels/testMultiplayerLevel.oxw
===================================================================
--- code/branches/Masterserver_FS18/data/levels/testMultiplayerLevel.oxw	2018-04-26 13:50:24 UTC (rev 11909)
+++ code/branches/Masterserver_FS18/data/levels/testMultiplayerLevel.oxw	2018-04-26 13:56:12 UTC (rev 11910)
@@ -1,21 +1,23 @@
 <LevelInfo
- name = "00 Test Multiplayer level"
- description = "A level to test the multiplayer"
+ name = "00 Team Multiplayer Level"
+ description = "Team Deathmatch."
  tags = "test"
- screenshot = "emptylevel.png"
+ screenshot = "teamdeathmatch.png"
 />
-
 <?lua
   include("stats.oxo")
   include("HUDTemplates3.oxo")
   include("templates/lodInformation.oxt")
-  include("templates/spaceshipEscort.oxt")
+  include("lastTeamStandingHUD.oxo")
+  include("templates/spaceshipAssff.oxt")
   include("templates/spaceshipPirate.oxt")
-  include("templates/spaceshipAssff.oxt")
+  include("templates/pickupRepresentationTemplates.oxt")
 ?>
 
 <Level
- gametype = "TeamGametype"
+ name         = "00 Team Multiplayer Level"
+ description  = "testmap for gametype teamdeathmatch"
+ gametype     =  "TeamDeathmatch"
 >
   <templates>
     <Template link=lodtemplate_default />
@@ -24,13 +26,113 @@
 
   <Scene
     ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/Starbox"
+    skybox       = "Orxonox/skyBoxBasic"
   >
 
-    <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"/>
+    <?lua
+      include("includes/pickups.oxi")
+    ?>
+    
+    <WorldAmbientSound source="Nebula_metal.ogg" looping="true" playOnLoad="true" />
 
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
-    
+<Bot />
+
+<!-- ------------ middle asteroid -------------- -->
+    <StaticEntity position="0,20,0" collisionType=static>
+       <attached>
+           <Model position="0,0,0" scale=140 mesh="asteroid_UV.mesh" shadow=true />
+           <!-- ParticleEmitter position="0,0,0" source="Orxonox/Steam" / -->
+       </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="145" />
+      </collisionShapes>
+    </StaticEntity>
+
+    <PickupSpawner pickup=hugeinvisiblepickup position="-160,60,17" triggerDistance="20" respawnTime="5" maxSpawnedItems="10" /><!--EasterEgg-->
+    <StaticEntity position="-160,60,28.4"><!--EasterEgg-Indicator-->
+      <attached>
+        <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
+      </attached>
+    </StaticEntity>
+
+<!-- ---------------asteroid dome----------------- -->
+<?lua
+max = 16
+for i = 0, max, 1
+do
+    y = math.sin(i/max*6)*750
+    z = math.cos(i/max*6)*750
+    j = 1
+    ?>
+
+    <TeamSpawnPoint team=0 position="<?lua print(y*1.4+z*0.2) ?>,0,<?lua print(z*1.4-y*0.2) ?>" direction="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <TeamSpawnPoint team=1 position="<?lua print(y*1.4+z*0.2) ?>,0,<?lua print(z*1.4-y*0.2) ?>" direction="0,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
+
+    <StaticEntity position="<?lua print(y) ?>,0,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
+      <attached>
+        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
+        </Model>
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape    halfExtents="<?lua print(j * 2) ?>,100,<?lua print(j * 2) ?>" position = "0,0,0" />
+      </collisionShapes>
+    </StaticEntity>
+
+    <StaticEntity position="<?lua print(y) ?>,100,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
+      <attached>
+        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i+3,6) + 1) ?>.mesh">
+        </Model>
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
+      </collisionShapes>
+    </StaticEntity>
+
+    <StaticEntity position="<?lua print(y) ?>,200,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
+      <attached>
+        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*5,6) + 1) ?>.mesh">
+        </Model>
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
+      </collisionShapes>
+    </StaticEntity>
+
+    <StaticEntity position="<?lua print(y) ?>,-100,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
+      <attached>
+        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*13+1,6) + 1) ?>.mesh">
+        </Model>
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
+      </collisionShapes>
+    </StaticEntity>
+
+    <StaticEntity position="<?lua print(y) ?>,-200,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
+      <attached>
+        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*17,6) + 1) ?>.mesh">
+        </Model>
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
+      </collisionShapes>
+    </StaticEntity>
+
+<!-- ---------Top Asteroid----------- -->
+    <StaticEntity position="<?lua print(y) ?>,300,<?lua print(z) ?>" scale="<?lua print(j * 2.1) ?>" pitch="90" roll="180" yaw="<?lua print(-90+i*360/max) ?>" collisionType=static >
+      <attached>
+        <Model position="0,0,0" scale=25 mesh="ast6.mesh">
+        </Model>
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape    halfExtents="50,140,30" position="0,0,0"/>
+      </collisionShapes>
+    </StaticEntity>
+
+
+<?lua end ?>
+
   </Scene>
 </Level>
 
+

Modified: code/branches/Masterserver_FS18/data/overlays/lastTeamStandingHUD.oxo
===================================================================
--- code/branches/Masterserver_FS18/data/overlays/lastTeamStandingHUD.oxo	2018-04-26 13:50:24 UTC (rev 11909)
+++ code/branches/Masterserver_FS18/data/overlays/lastTeamStandingHUD.oxo	2018-04-26 13:56:12 UTC (rev 11910)
@@ -1,7 +1,7 @@
 <Template name="lastTeamStandingHUD">
   <OverlayGroup name="lastTeamStandingHUD" scale = "1, 1">
     <LastTeamStandingInfos
-     position  = "0.14, 0.02"
+     position  = "0.5, 0.02"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
      textsize  = 0.04
@@ -13,7 +13,7 @@
     />
 
     <OverlayText
-     position  = "0.02, 0.02"
+     position  = "0.38, 0.02"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
      textsize  = 0.04
@@ -23,7 +23,7 @@
     />
 
     <OverlayText
-     position  = "0.02, 0.055"
+     position  = "0.38, 0.055"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
      textsize  = 0.04
@@ -33,7 +33,7 @@
     />
 
     <LastTeamStandingInfos
-     position  = "0.14, 0.055"
+     position  = "0.5, 0.055"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
      textsize  = 0.04



More information about the Orxonox-commit mailing list