[Orxonox-commit 7570] r12173 - in code/branches/wagnis_HS18: data/levels src/modules/wagnis

stadlero at orxonox.net stadlero at orxonox.net
Sat Dec 8 18:04:57 CET 2018


Author: stadlero
Date: 2018-12-08 18:04:56 +0100 (Sat, 08 Dec 2018)
New Revision: 12173

Modified:
   code/branches/wagnis_HS18/data/levels/Wagnis.oxw
   code/branches/wagnis_HS18/data/levels/Wagnis_testlevel.oxw
   code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc
   code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h
Log:
Continent color Billboards and arrows added.

Modified: code/branches/wagnis_HS18/data/levels/Wagnis.oxw
===================================================================
--- code/branches/wagnis_HS18/data/levels/Wagnis.oxw	2018-12-07 18:51:28 UTC (rev 12172)
+++ code/branches/wagnis_HS18/data/levels/Wagnis.oxw	2018-12-08 17:04:56 UTC (rev 12173)
@@ -1,5 +1,5 @@
 <LevelInfo
- name = "Wagnis_testlevel"
+ name = "Wagnis"
  description = "A clone of the iconic Risk."
  tags = ""
  screenshot = "emptylevel.png"
@@ -31,10 +31,11 @@
 
 
   <Provinces>
-
-    <WagnisProvince ID="1" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" position="0,28,8" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <!-- SA -->
+    <WagnisProvince ID="1" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="2" position="0,28,8" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.926, 0.293, 0.082"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -41,9 +42,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="2" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" position="0,39,4" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="2" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="2" position="0,39,4" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.926, 0.293, 0.082"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -50,9 +52,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="3" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" position="0,34,17" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="3" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="2" position="0,34,17" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.926, 0.293, 0.082"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -59,9 +62,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="4" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" position="0,46,14" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="4" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="2" position="0,46,14" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.926, 0.293, 0.082"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -68,9 +72,14 @@
       </collisionShapes>
     </WagnisProvince>
 
+
+
+
+    <!-- NA -->
     <WagnisProvince ID="5" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" position="0,61,8" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.926, 0.8125, 0.082"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -80,6 +89,7 @@
     <WagnisProvince ID="6" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" position="0,73,9" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.926, 0.8125, 0.082"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -89,6 +99,7 @@
     <WagnisProvince ID="7" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" position="0,65,20" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.926, 0.8125, 0.082"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -98,6 +109,7 @@
     <WagnisProvince ID="8" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" position="0,70,29" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.926, 0.8125, 0.082"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -107,6 +119,7 @@
     <WagnisProvince ID="9" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" position="0,60,32" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.926, 0.8125, 0.082"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -116,6 +129,7 @@
     <WagnisProvince ID="10" position="0,66,41" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.926, 0.8125, 0.082"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -125,6 +139,7 @@
     <WagnisProvince ID="11" position="0,76,38" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.926, 0.8125, 0.082"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -134,6 +149,7 @@
     <WagnisProvince ID="12" position="0,80,25" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.926, 0.8125, 0.082"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -143,6 +159,7 @@
     <WagnisProvince ID="13" position="0,82,52" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.926, 0.8125, 0.082"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -149,9 +166,15 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="14" position="0,58,62" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+
+
+
+
+    <!-- EU -->
+    <WagnisProvince ID="14" position="0,58,62" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="4" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.085,0.457,0.804"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -158,9 +181,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="15" position="0,50,57" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="15" position="0,50,57" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="4" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.085,0.457,0.804"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -167,9 +191,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="16" position="0,53,74" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="16" position="0,53,74" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="4" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.085,0.457,0.804"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -176,9 +201,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="17" position="0,40,72" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="17" position="0,40,72" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="4" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.085,0.457,0.804"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -185,9 +211,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="18" position="0,45,86" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="18" position="0,45,86" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="4" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.085,0.457,0.804"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -194,9 +221,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="19" position="0,39,58" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="19" position="0,39,58" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="4" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.085,0.457,0.804"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -203,9 +231,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="20" position="0,32,81" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="20" position="0,32,81" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="4" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.085,0.457,0.804"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -212,9 +241,15 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="21" position="0,20,45" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+
+
+
+
+    <!-- AF -->
+    <WagnisProvince ID="21" position="0,20,45" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="2" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.515,0.199,0.054"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -221,9 +256,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="22" position="0,23,62" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="22" position="0,23,62" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="2" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.515,0.199,0.054"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -230,9 +266,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="23" position="0,16,73" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="23" position="0,16,73" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="2" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.515,0.199,0.054"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -239,9 +276,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="24" position="0,10,50" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="24" position="0,10,50" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="2" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.515,0.199,0.054"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -248,9 +286,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="25" position="0,4,61" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="25" position="0,4,61" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="2" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.515,0.199,0.054"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -257,9 +296,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="26" position="0,5,76" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="26" position="0,5,76" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="2" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.515,0.199,0.054"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -266,9 +306,16 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="27" position="0,81,76" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+
+
+
+
+
+    <!-- AS -->
+    <WagnisProvince ID="27" position="0,81,76" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="5" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.256,0.804,0.085"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -275,9 +322,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="28" position="0,82,103" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="28" position="0,82,103" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="5" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.256,0.804,0.085"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -284,9 +332,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="29" position="0,69,112" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="29" position="0,69,112" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="5" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.256,0.804,0.085"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -293,9 +342,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="30" position="0,72,95" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="30" position="0,72,95" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="5" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.256,0.804,0.085"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -302,9 +352,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="31" position="0,70,79" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="31" position="0,70,79" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="5" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.256,0.804,0.085"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -311,9 +362,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="32" position="0,60,93" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="32" position="0,60,93" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="5" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.256,0.804,0.085"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -320,9 +372,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="33" position="0,52,105" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="33" position="0,52,105" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="5" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.256,0.804,0.085"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -329,9 +382,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="34" position="0,50,121" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="34" position="0,50,121" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="5" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.256,0.804,0.085"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -338,9 +392,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="35" position="0,41,105" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="35" position="0,41,105" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="5" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.256,0.804,0.085"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -347,9 +402,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="36" position="0,30,101" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="36" position="0,30,101" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="5" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.256,0.804,0.085"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -356,9 +412,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="37" position="0,33,116" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="37" position="0,33,116" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="5" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.256,0.804,0.085"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -365,9 +422,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="38" position="0,35,127" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="38" position="0,35,127" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="5" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.256,0.804,0.085"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -374,9 +432,15 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="39" position="0,22,131" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+
+
+
+
+    <!-- AU -->
+    <WagnisProvince ID="39" position="0,22,131" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="6" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.695,0.085,0.804"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -383,9 +447,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="40" position="0,13,121" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="40" position="0,13,121" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="6" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.695,0.085,0.804"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -392,9 +457,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="41" position="0,13,141" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="41" position="0,13,141" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="6" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.695,0.085,0.804"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -401,9 +467,10 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="42" position="0,5,130" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
+    <WagnisProvince ID="42" position="0,5,130" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="6" rotationrate="<?lua print(math.random() * 50) ?>" rotationaxis="<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>,<?lua print((math.random()-1)*5)?>">
       <attached>
         <Model position="0,0,0" mesh="ast1.mesh" scale3D="1.4,1.4,1.4" />
+        <Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.695,0.085,0.804"/>
       </attached>
       <collisionShapes>
         <BoxCollisionShape position="0,0,0" halfExtents="3,3,3" /> 
@@ -410,7 +477,7 @@
       </collisionShapes>
     </WagnisProvince>
 
-    <WagnisProvince ID="1000" radarname="continue" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="1" position="0,75,137" pitch=90 rotationrate="0" rotationaxis="0,0,0">
+    <WagnisProvince ID="1000" radarname="continue" health = 10000000 maxhealth = 10000000 initialhealth = 10000000 collisionType=kinematic mass=100 continent="0" position="0,75,137" pitch=90 rotationrate="0" rotationaxis="0,0,0">
       <attached>
         <Model position="0,0,0" mesh="broke-satellite.mesh" scale3D="3,3,3" />
       </attached>
@@ -423,6 +490,32 @@
   </Provinces>
 </WagnisGameboard>
 
+<Billboard position="0,27,32" amplitude=1 material="Wagnis/Arrow" rotation="0.4" colour="1,1,1"/> <!--3,21-->
+<Billboard position="0,53.5,11" amplitude=1 material="Wagnis/Arrow" rotation="1.1" colour="1,1,1"/> <!--4,5-->
+<Billboard position="0,29.5,52" amplitude=1 material="Wagnis/Arrow" rotation="2.2" colour="1,1,1"/> <!--19,21-->
+<Billboard position="0,28,62" amplitude=1 material="Wagnis/Arrow" rotation="2.8" colour="1,1,1"/> <!--20,21-->
+<Billboard position="0,27.5,71.5" amplitude=1 material="Wagnis/Arrow" rotation="2.7" colour="1,1,1"/> <!--20,22-->
+<Billboard position="0,26.5,81.5" amplitude=1 material="Wagnis/Arrow" rotation="3" colour="1,1,1"/> <!--22,36-->
+<Billboard position="0,23,87" amplitude=1 material="Wagnis/Arrow" rotation="2.7" colour="1,1,1"/> <!--23,36-->
+<Billboard position="0,81.5,64" amplitude=1 material="Wagnis/Arrow" rotation="0" colour="1,1,1"/> <!--13,27-->
+<Billboard position="0,81.5,38.5" amplitude=1 material="Wagnis/Arrow" rotation="-0.1" colour="1,1,1"/> <!--12,13-->
+<Billboard position="0,76,96" amplitude=1 material="Wagnis/Arrow" rotation="0.3" colour="1,1,1"/> <!--27,29-->
+<Billboard position="0,62,51.5" amplitude=1 material="Wagnis/Arrow" rotation="0.2" colour="1,1,1"/> <!--10,14-->
+<Billboard position="0,31,91" amplitude=1 material="Wagnis/Arrow" rotation="0.1" colour="1,1,1"/> <!--20,36-->
+<Billboard position="0,43,95.5" amplitude=1 material="Wagnis/Arrow" rotation="0.1" colour="1,1,1"/> <!--18,35-->
+<Billboard position="0,37.5,93.5" amplitude=1 material="Wagnis/Arrow" rotation="0.7" colour="1,1,1"/> <!--18,36-->
+<Billboard position="0,48.5,95.5" amplitude=1 material="Wagnis/Arrow" rotation="-0.5" colour="1,1,1"/> <!--18,33-->
+
+
+
+<!--
+<Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.926, 0.8125, 0.082"/>
+<Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.926, 0.293, 0.082"/>
+<Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.515,0.199,0.054"/>
+<Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.085,0.457,0.804"/>
+<Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.256,0.804,0.085"/>
+<Billboard position="0,0,0" amplitude=1 material="Wagnis/Background" colour="0.695,0.085,0.804"/>
+-->
     
   </Scene>
 </Level>

Modified: code/branches/wagnis_HS18/data/levels/Wagnis_testlevel.oxw
===================================================================
--- code/branches/wagnis_HS18/data/levels/Wagnis_testlevel.oxw	2018-12-07 18:51:28 UTC (rev 12172)
+++ code/branches/wagnis_HS18/data/levels/Wagnis_testlevel.oxw	2018-12-08 17:04:56 UTC (rev 12173)
@@ -121,6 +121,10 @@
   </Provinces>
 </WagnisGameboard>
 
+<Billboard position="0,45,75" amplitude=1 material="Wagnis/Background" colour="1,1,1">
+
+</Billboard>
+
     
   </Scene>
 </Level>

Modified: code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc	2018-12-07 18:51:28 UTC (rev 12172)
+++ code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.cc	2018-12-08 17:04:56 UTC (rev 12173)
@@ -17,7 +17,7 @@
     this->active_player = 1;
     this->initial_reinforcements_left = 2; //changed here
 
-    int n = 6;
+    int n = 4;
     for(int i = 0;i < n;i++){
         WagnisPlayer* p = new WagnisPlayer(context);
         p->Player_ID = i+1;
@@ -73,7 +73,7 @@
             if(this->unoccupiedProvinces() > 0){
                 //Still empty provinces left
 
-                if(this->active_player < this->players.size()){
+                if(this->active_player < (int)this->players.size()){
                     this->active_player++;
                 }else{
                     this->active_player = 1;
@@ -100,7 +100,7 @@
             
             if(this->initial_reinforcements_left > 0){
                 player->setActive(false);
-                if(this->active_player == this->players.size()){
+                if(this->active_player == (int)this->players.size()){
                     //Last player finished this round of initial troops.
                     this->initial_reinforcements_left -= 1;
                     WagnisPlayer* next = this->players.at(0);
@@ -141,7 +141,7 @@
             player->setActive(false);
             int tc;
             do{
-                if(this->active_player < this->players.size()){
+                if(this->active_player < (int)this->players.size()){
                     this->active_player++;
                 }else{
                     this->active_player = 1;

Modified: code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h
===================================================================
--- code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h	2018-12-07 18:51:28 UTC (rev 12172)
+++ code/branches/wagnis_HS18/src/modules/wagnis/Wagnis.h	2018-12-08 17:04:56 UTC (rev 12173)
@@ -1,3 +1,30 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *                    > www.orxonox.net <
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Authors:
+ *  
+ *   Co-authors:
+ *      ...
+ *
+ */
 
 
 



More information about the Orxonox-commit mailing list