Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9858


Ignore:
Timestamp:
Dec 2, 2013, 4:08:30 PM (11 years ago)
Author:
zifloria
Message:

hbskdjbs

Location:
code/branches/invaders
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/invaders/data/levels/includes/invaderWeapon.oxi

    r9744 r9858  
    1414        </links>
    1515        <Weapon>
    16           <InvaderWeapon mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam.mesh" />
     16          <InvaderWeapon mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
    1717          <!--InvaderWeapon mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam.mesh" /-->
    1818        </Weapon>
    1919        <Weapon>
    20           <InvaderWeapon mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam.mesh" />
     20          <InvaderWeapon mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
    2121          <!--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" /-->
    2222        </Weapon>
  • code/branches/invaders/src/modules/invader/Invader.cc

    r9854 r9858  
    9898    }
    9999
     100    void Invader::costLife()
     101    {
     102        lives--;
     103        multiplier = 0;
     104        if (lives <= 0) end();
     105    };
     106
    100107    void Invader::comboControll()
    101108    {
  • code/branches/invaders/src/modules/invader/Invader.h

    r9854 r9858  
    6868            int getMultiplier(){return this->multiplier;}
    6969
    70             void costLife(){lives--; if (lives <= 0) end();};
     70            void costLife();
    7171            void levelUp(){level++;}
    7272            void addPoints(int numPoints){point += numPoints * multiplier; b_combo = true;}
  • code/branches/invaders/src/modules/invader/InvaderEnemy.cc

    r9854 r9858  
    6868    inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
    6969    {
    70         setVelocity(Vector3(1000,0,0));
     70        // setVelocity(Vector3(1000,0,0));
    7171        removeHealth(2000);
    7272        return false;
Note: See TracChangeset for help on using the changeset viewer.