[Orxonox-commit 7808] r12400 - in code/branches/OrxoBlox_FS19: data/levels data/levels/templates src/modules/OrxoBlox src/modules/weapons/projectiles

[jeromela at orxonox.net]

Author: jeromela
Date: 2019-05-20 14:26:49 +0200 (Mon, 20 May 2019)
New Revision: 12400

Modified:
   code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
   code/branches/OrxoBlox_FS19/data/levels/templates/spaceshipEscort.oxt
   code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h
   code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc
   code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc
Log:
Changed counter

Modified: code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
===================================================================
--- code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-05-17 14:36:37 UTC (rev 12399)
+++ code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-05-20 12:26:49 UTC (rev 12400)
@@ -18,17 +18,6 @@
   include("templates/spaceshipEscort.oxt")
 ?>
 
-<!--Template name=OrxoBloxbatcameras defaults=0>
-  <OrxoBloxStones>
-    <camerapositions>
-      <CameraPosition position="0,150,0"  absolute=true />
-      <CameraPosition position="0,50,160" drag=true mouselook=true />
-      <CameraPosition position="0,40,125" drag=true mouselook=true />
-      <CameraPosition position="0,30, 90" drag=true mouselook=true />
-    </camerapositions>
-  </OrxoBloxStones>
-</Template-->
-
 <Template name=OrxoBloxball>
   <OrxoBloxBall 
    defScoreSound = "sounds/PlayerWinScore_cut.ogg"
@@ -46,26 +35,8 @@
     </eventlisteners>
   </OrxoBloxBall>
 </Template>
-
-
   
-  <!-- <Template name=OrxoBloxstone>
-    <OrxoBloxStones collisionType=static>
-      <attached>
-        <Model position="0,0,0" mesh="CuboidBody.mesh" scale3D="4.5,4.5,4.5" />
-        <Model position="0,0,0" mesh="cube_orange.mesh" scale=4.3 />
-      </attached>
-      <collisionShapes> 
-        <BoxCollisionShape position="0,0,0" halfExtents="2,2,2" /> 
-      </collisionShapes> 
-    </OrxoBloxStones>
-  </Template> -->
-
-  <!-- <StaticEntity position="0,-10000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 > -->
-   
   
-  
-  
   <Template name=OrxoBloxwall>
     <OrxoBloxWall>
     </OrxoBloxWall>
@@ -90,7 +61,7 @@
 
     <!-- <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"/> -->
     <Light type=directional position="-100, 10000, -700" direction="0.2, -1, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-    <SpawnPoint team=0 position="0,-4.5,49" lookat="-10000,0,0" spawnclass= SpaceShip pawndesign=spaceshipOrxoBlox/>
+    <SpawnPoint team=0 position="0,-4.5,49" lookat="-10000,0,0" spawnclass=SpaceShip pawndesign=spaceshipOrxoBlox/>
 
     <!--SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort /--->
 

Modified: code/branches/OrxoBlox_FS19/data/levels/templates/spaceshipEscort.oxt
===================================================================
--- code/branches/OrxoBlox_FS19/data/levels/templates/spaceshipEscort.oxt	2019-05-17 14:36:37 UTC (rev 12399)
+++ code/branches/OrxoBlox_FS19/data/levels/templates/spaceshipEscort.oxt	2019-05-20 12:26:49 UTC (rev 12400)
@@ -43,7 +43,7 @@
     </engines>
     <attached>
       <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=4 mesh="escortShip.mesh" />
-      <Model position="0,0,0" yaw=180 pitch=90 roll=0 scale=4 mesh="escortWeapon.mesh" />
+      <Model position="50,0,0" yaw=180 pitch=90 roll=0 scale=4 mesh="escortWeapon.mesh" />
 <!--Model mesh="cube.mesh" mass=10 position="0,0,3" scale3D="10,4,8" />
 <Model mesh="cube.mesh" mass=10 position="12.6,-2,3" scale3D="2.8,2.8,11" />
 <Model mesh="cube.mesh" mass=10 position="-12.6,-2,3" scale3D="2.8,2.8,11" />

Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h	2019-05-17 14:36:37 UTC (rev 12399)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h	2019-05-20 12:26:49 UTC (rev 12400)
@@ -70,7 +70,7 @@
             
             WeakPtr<OrxoBloxWall> futureWall_;
             int counter;
-            const int max_counter = 4;
+            const int max_counter = 5;
 
     };
 }

Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc	2019-05-17 14:36:37 UTC (rev 12399)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc	2019-05-20 12:26:49 UTC (rev 12400)
@@ -42,7 +42,7 @@
                 this->attach(stone);
                 float x_=(this->center_->getFieldDimension()).x;
                 float y_=(this->center_->getFieldDimension()).y;
-                stone->setPosition(size_*i -x_/2 +4.5f, -3.5f, -y_/2 + 6.5f);
+                stone->setPosition(size_*i -x_/2 +4.5f, -3.5f, -y_/2 - 2.25f);
 
 
 

Modified: code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc	2019-05-17 14:36:37 UTC (rev 12399)
+++ code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc	2019-05-20 12:26:49 UTC (rev 12400)
@@ -27,7 +27,7 @@
         this->orxoblox_ = this->getOrxoBlox();
         this->setCollisionShapeRadius(2.5);
         this->setDamage(1000);
-
+        orxoblox_->count();
         //setEffect("Orxonox/sparks2");
     }
 
@@ -145,7 +145,6 @@
                 // Set the ball to be exactly at the boundary.
                 position.z = this-> fieldHeight_;
                 
-                orxoblox_->count();
                 suicidal = true;
                 
             }