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

[zifloria at orxonox.net]

Author: zifloria
Date: 2013-12-02 16:42:46 +0100 (Mon, 02 Dec 2013)
New Revision: 9862

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

Modified: code/branches/invaders/data/levels/includes/invaderWeapon.oxi
===================================================================
--- code/branches/invaders/data/levels/includes/invaderWeapon.oxi	2013-12-02 15:37:11 UTC (rev 9861)
+++ code/branches/invaders/data/levels/includes/invaderWeapon.oxi	2013-12-02 15:42:46 UTC (rev 9862)
@@ -13,7 +13,7 @@
           <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="cokebottle.mesh" />
+          <InvaderWeapon mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="laserbeam.mesh" />
           <!--InvaderWeapon mode=0 munitionpershot=0 delay=0   
 
           LaserBeam2
@@ -21,7 +21,7 @@
             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="cokebottle.mesh" />
+          <InvaderWeapon mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="laserbeam.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:37:11 UTC (rev 9861)
+++ code/branches/invaders/src/modules/invader/InvaderEnemy.cc	2013-12-02 15:42:46 UTC (rev 9862)
@@ -55,7 +55,7 @@
         }
         if (player != NULL)
         {
-            float newZ = abs(getPosition().x - player->getPosition().x) * (player->getPosition().z - getPosition().z);
+            float newZ = 2/(pow(abs(getPosition().x - player->getPosition().x) * 0.01, 2) + 1) * (player->getPosition().z - getPosition().z);
             // if (newZ < 0)
             //     newZ = (-100 < newZ)?-100:newZ;
             // else