[Orxonox-commit 5194] r9859 - in code/branches/invaders: data/levels/includes src/modules/invader

[zifloria at orxonox.net]

Author: zifloria
Date: 2013-12-02 16:28:22 +0100 (Mon, 02 Dec 2013)
New Revision: 9859

Modified:
   code/branches/invaders/data/levels/includes/invaderWeapon.oxi
   code/branches/invaders/src/modules/invader/InvaderEnemy.cc
Log:
fail

Modified: code/branches/invaders/data/levels/includes/invaderWeapon.oxi
===================================================================
--- code/branches/invaders/data/levels/includes/invaderWeapon.oxi	2013-12-02 15:08:30 UTC (rev 9858)
+++ code/branches/invaders/data/levels/includes/invaderWeapon.oxi	2013-12-02 15:28:22 UTC (rev 9859)
@@ -13,11 +13,15 @@
           <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
         </links>
         <Weapon>
-          <InvaderWeapon mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
-          <!--InvaderWeapon mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam.mesh" /-->
+          <InvaderWeapon mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="cokebottle.mesh" />
+          <!--InvaderWeapon mode=0 munitionpershot=0 delay=0   
+
+          LaserBeam2
+
+            damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam.mesh" /-->
         </Weapon>
         <Weapon>
-          <InvaderWeapon mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
+          <InvaderWeapon mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="cokebottle.mesh" />
           <!--InvaderWeapon mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" projectileMesh="LaserBeam.mesh" /-->
         </Weapon>
       </WeaponPack>

Modified: code/branches/invaders/src/modules/invader/InvaderEnemy.cc
===================================================================
--- code/branches/invaders/src/modules/invader/InvaderEnemy.cc	2013-12-02 15:08:30 UTC (rev 9858)
+++ code/branches/invaders/src/modules/invader/InvaderEnemy.cc	2013-12-02 15:28:22 UTC (rev 9859)
@@ -55,11 +55,11 @@
         }
         if (player != NULL)
         {
-            float newZ = player->getPosition().z - getPosition().z;
-            if (newZ < 0)
-                newZ = (-100 < newZ)?-100:newZ;
-            else
-                newZ = (100 > newZ)?100:newZ;
+            float newZ = abs(getPosition().x - player->getPosition().x) * (player->getPosition().z - getPosition().z);
+            // if (newZ < 0)
+            //     newZ = (-100 < newZ)?-100:newZ;
+            // else
+            //     newZ = (100 > newZ)?100:newZ;
             setVelocity(Vector3(1000 - level * 100 , 0, newZ));
         }
         SUPER(InvaderEnemy, tick, dt);