Changeset 8492 for code/branches

Timestamp:

May 16, 2011, 5:25:00 PM (14 years ago)

Author:

simonmie

Message:

New Shield effect added (from tibork), first working BasicProjectile class, changes in weapon classes to fit new BasicProjectile system, some spam messages in Pawn.cc removed

Location:

code/branches/gameimmersion

Files:

• data/levels/includes/weaponSettingsImmTest.oxi (modified) (2 diffs)
• data/particle/Shield.particle (added)
• src/modules/weapons/projectiles/BasicProjectile.cc (added)
• src/modules/weapons/projectiles/BasicProjectile.h (added)
• src/modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/projectiles/Projectile.cc (modified) (5 diffs)
• src/modules/weapons/projectiles/Projectile.h (modified) (4 diffs)
• src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/FusionFire.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/HsW01.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/LaserFire.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/LightningGun.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/RocketFire.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (4 diffs)

code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi

@@ -26 +26 @@
           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" damage=0 shielddamage=75 />
+          <LightningGun mode=1 muzzleoffset="0,0,0" damage=0 shielddamage=5 healthdamage=200 />
         </Weapon>
         <Weapon>
@@ -36 +36 @@
           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" damage=0 shielddamage=75 />
+          <LightningGun mode=1 muzzleoffset="0,0,0" damage=0 shielddamage=5 healthdamage=200 />
         </Weapon>
         <Weapon>

code/branches/gameimmersion/src/modules/weapons/projectiles/CMakeLists.txt

@@ -6 +6 @@
   Rocket.cc
   SimpleRocket.cc
+  BasicProjectile.cc
 )

code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc

@@ -36 +36 @@
 #include "worldentities/pawns/Pawn.h"
 #include "graphics/ParticleSpawner.h"
+#include "BasicProjectile.h"
 
 namespace orxonox
@@ -41 +42 @@
     CreateFactory(Projectile);
 
-    Projectile::Projectile(BaseObject* creator) : MovableEntity(creator)
+    Projectile::Projectile(BaseObject* creator) : MovableEntity(creator), BasicProjectile()
     {
         RegisterObject(Projectile);
 
         this->setConfigValues();
-        this->bDestroy_ = false;
+//        this->bDestroy_ = false;
         this->owner_ = 0;
-        this->damage_ = 115;
+//        this->damage_ = 115;
 ///////////////////me
-        this->healthdamage_ = 0;
-        this->shielddamage_ = 0;
+//        this->healthdamage_ = 0;
+//        this->shielddamage_ = 0;
 ///////////////////end me
 
@@ -88 +89 @@
             return;
 
-        if (this->bDestroy_)
+        if (this->getBDestroy())
             this->destroy(); // TODO: use a scheduler instead of deleting the object right here in tick()
     }
@@ -98 +99 @@
     }
 
+    bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    {
+        return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->owner_,this);
+    }
+
 //////////////////////////me edit
-    bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+/*    bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
         if (!this->bDestroy_ && GameMode::isMaster())
@@ -150 +156 @@
     }
 //////////////////////////////////////////////////////////////////////end edit
-
+*/
     void Projectile::setOwner(Pawn* owner)
     {
         this->owner_ = owner;
     }
+
 }

code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.h

@@ -35 +35 @@
 #include "worldentities/MovableEntity.h"
 
+#include "BasicProjectile.h"
+
 namespace orxonox
 {
-    class _WeaponsExport Projectile : public MovableEntity
+    class _WeaponsExport Projectile : public MovableEntity, public BasicProjectile
     {
         public:
@@ -49 +51 @@
             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
 
-            inline void setDamage(float damage)
+/*            inline void setDamage(float damage)
                 { this->damage_ = damage;  COUT(3) << "DAMAGE-SET-FUNKTION WIRD AUFGERUFEN" << endl; }
             inline float getDamage() const
                 { return this->damage_; }
-
+*/
             void setOwner(Pawn* owner);
             inline Pawn* getOwner() const
                 { return this->owner_; }
 
-////////////////////me
+/*///////////////////me
 
             inline void setHealthDamage(float healthdamage)
@@ -71 +73 @@
 
 ///////////////////end me
-
+*/
 
         private:
             WeakPtr<Pawn> owner_;
             float lifetime_;
-            float damage_;
+/*            float damage_;
 ///////me
             float healthdamage_;
@@ -82 +84 @@
 ///////end me
             bool bDestroy_;
-            Timer destroyTimer_;
+*/            Timer destroyTimer_;
     };
 }

code/branches/gameimmersion/src/modules/weapons/weaponmodes/EnergyDrink.cc

@@ -112 +112 @@
         projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         projectile->setDamage(this->getDamage());
+        projectile->setShieldDamage(this->getShieldDamage());
+        projectile->setHealthDamage(this->getHealthDamage());
 
         EnergyDrink::muendungsfeuer();

code/branches/gameimmersion/src/modules/weapons/weaponmodes/FusionFire.cc

@@ -65 +65 @@
         projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         projectile->setDamage(this->getDamage());
+        projectile->setShieldDamage(this->getShieldDamage());
+        projectile->setHealthDamage(this->getHealthDamage());
+
         projectile->setColour(ColourValue(1.0f, 0.7f, 0.3f, 1.0f));
     }

code/branches/gameimmersion/src/modules/weapons/weaponmodes/HsW01.cc

@@ -126 +126 @@
         projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         projectile->setDamage(this->getDamage());
+        projectile->setShieldDamage(this->getShieldDamage());
+        projectile->setHealthDamage(this->getHealthDamage());
 
         HsW01::muendungsfeuer();

code/branches/gameimmersion/src/modules/weapons/weaponmodes/LaserFire.cc

@@ -61 +61 @@
         projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         projectile->setDamage(this->getDamage());
+        projectile->setShieldDamage(this->getShieldDamage());
+        projectile->setHealthDamage(this->getHealthDamage());
     }
 }

code/branches/gameimmersion/src/modules/weapons/weaponmodes/LightningGun.cc

@@ -70 +70 @@
         projectile->setDamage(this->getDamage());
         projectile->setShieldDamage(this->getShieldDamage());
+        projectile->setHealthDamage(this->getHealthDamage());
     }
 }

code/branches/gameimmersion/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -71 +71 @@
         rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         rocket->setDamage(this->getDamage());
+//        rocket->setShieldDamage(this->getShieldDamage());
+//        rocket->setHealthDamage(this->getHealthDamage());
     }
 }

code/branches/gameimmersion/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -71 +71 @@
         rocket->setVelocity(this->getMuzzleDirection()*this->speed_);
         rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+
         rocket->setDamage(this->damage_);
+//        rocket->setShieldDamage(this->getShieldDamage());
+//        rocket->setHealthDamage(this->getHealthDamage());
+
         WorldEntity* pawnn=static_cast<ControllableEntity*>(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn())->getTarget();
         if (pawnn) con->setTarget(pawnn);

code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc

@@ -201 +201 @@
     {
         this->reloadRate_ = reloadrate;
-        COUT(2) << "RELOAD RATE SET TO " << this->reloadRate_ << endl;
+        //COUT(2) << "RELOAD RATE SET TO " << this->reloadRate_ << endl;
     }
 
@@ -207 +207 @@
     {
         this->reloadWaitTime_ = reloadwaittime;
-        COUT(2) << "RELOAD WAIT TIME SET TO " << this->reloadWaitTime_ << endl;
+        //COUT(2) << "RELOAD WAIT TIME SET TO " << this->reloadWaitTime_ << endl;
     }
 
@@ -293 +293 @@
             // play damage effect
         }
-        COUT(3) << "neue damage-Funktion wurde aufgerufen // " << "Shield:" << this->getShieldHealth() << endl;
+        //COUT(3) << "neue damage-Funktion wurde aufgerufen // " << "Shield:" << this->getShieldHealth() << endl;
     }
 
@@ -346 +346 @@
     void Pawn::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage, float healthdamage, float shielddamage)
     {
-        COUT(3) << "neue hit2-Funktion wurde aufgerufen // shielddamage: " << shielddamage << std::flush;
+//        COUT(3) << "neue hit2-Funktion wurde aufgerufen // shielddamage: " << shielddamage << std::flush;
         if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) )
         {