Changeset 10504

Timestamp:

May 28, 2015, 10:41:23 AM (9 years ago)

Author:

maxima

Message:

Bugfix: See Commit 10502. New orbStation Template.

Location:

code/branches/presentationFS15

Files:

• data/levels/presentationFS15.oxw (modified) (3 diffs)
• data/levels/templates/orbStation.oxt (copied) (copied from code/branches/formationFS15/data/levels/templates/orbStation.oxt)
• src/modules/weapons/projectiles/GravityBomb.cc (modified) (4 diffs)
• src/modules/weapons/projectiles/GravityBomb.h (modified) (1 diff)
• src/modules/weapons/projectiles/GravityBombField.cc (modified) (2 diffs)
• src/modules/weapons/weaponmodes/GravityBombFire.cc (modified) (1 diff)

code/branches/presentationFS15/data/levels/presentationFS15.oxw

@@ -15 +15 @@
   include("templates/spaceshipRing.oxt")
   include("templates/spaceshipFS15.oxt")
+  include("templates/orbStation.oxt")
 
 ?>
@@ -30 +31 @@
 
     <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"/>
-    <SpawnPoint team=0 position="-2000,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipfs15/>
-    
-    
-    <SpaceShip position="0,500,500" lookat="0,1000,0" >
-      <attached>
-        <DistanceTriggerBeacon name="bcnDestroyer" />
-        <DockingTarget name="destroyer" />
-      </attached>
-      <templates>
-        <Template link=spaceshipring />
-      </templates>
-    </SpaceShip>
+    <SpawnPoint team=0 position="-500,0,0" lookat="-1000,0,0" spawnclass=SpaceShip pawndesign=spaceshipfs15/>
 
     <!-- Docking  -->
@@ -61 +51 @@
       </events>
     </Dock>
+
+    <SpaceShip position="0,0,0" lookat="0,1000,1000" >
+      <attached>
+        <DistanceTriggerBeacon name="bcnDestroyer" />
+        <DockingTarget name="destroyer" />
+      </attached>
+      <templates>
+        <Template link=spaceshipring />
+      </templates>
+      <events>
+        <visibility>
+          <EventListener event="dockMe" />
+        </visibility>
+      </events>
+    </SpaceShip>
+
+    <Billboard position="0,500,500" material="Flares/ringflare2" colour="0.8,0.4,0.2" scale=1 />
+    <DistanceTrigger position="0,500,500" distance="200" target="Pawn" name="takeControl"/>
+
+    <MovableEntity position="0,1000,1000" >
+      <templates>
+        <Template link=orbStation/>
+      </templates>
+      <events>
+        <visibility>
+          <EventListener event="dockMe" />
+        </visibility>
+      </events>
+    </MovableEntity>
+
+    <ControllerDirector position="0,0,0" scriptname="presentation">
+      <events>
+        <takeControl>
+          <EventListener event="takeControl" />
+        </takeControl>
+      </events>
+    </ControllerDirector>
+
+
   </Scene>
 </Level>

code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBomb.cc

@@ -12 +12 @@
         RegisterClass(GravityBomb);
 
-        const float GravityBomb::LIFETIME = 5;  ///< The gravity bomb lifetime in seconds.
+        const float GravityBomb::LIFETIME = 2.5;  ///< The gravity bomb lifetime in seconds.
 
         GravityBomb::GravityBomb(Context* context):
@@ -22 +22 @@
 
                         this->setMass(10.0);
-                        this->isDetonated_ = false;
+                        this->hasCollided_ = false;
                         if (GameMode::isMaster())
                         {
@@ -67 +67 @@
         void GravityBomb::tick(float dt)
         {
-                        timeToLife_ -= dt;
-                        if(timeToLife_ < 0)
-                        {
-                                //orxout(debug_output) << "bomb has stoped moving" <<endl;
-                                setVelocity(Vector3::ZERO); //Stop the bomb.
-                                isDetonated_ = true;
-                        }
-                        else
-                        {
-                                //orxout(debug_output)<< "Time to live:" << timeToLife_ <<endl;
-                                destroyCheck(); //Every BasicProjectil has to call this method in each tick.
-                        }
-                        if(isDetonated_) detonate();
-                        else SUPER(GravityBomb, tick, dt);
+                SUPER(GravityBomb, tick, dt);
+                timeToLife_ -= dt;
+                if (timeToLife_ < 0)
+                {
+                        //orxout(debug_output) << "bomb has stoped moving" <<endl;
+                        setVelocity(Vector3::ZERO); //Stop the bomb.
+                        detonate();
+                        this->destroy();
+                }
+                else 
+                {
+                        if (hasCollided_) detonate();
+                        destroyCheck(); //Bomb is going to be destroyed by destroyCheck(). As written in BasicProectile, this Method should be called by every Projectile.
+                }
         }
 
         bool GravityBomb::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
         {
-                if(otherObject != getShooter()) //Ensure that the bomb cannot collide with its shooter.
-                {
-                        orxout(debug_output) << "collides" << endl;
-                        processCollision(otherObject, contactPoint,cs);
-                        isDetonated_ = true;
-                        return true;
-                }
-                else{
-                        //orxout(debug_output) << "collided with shooter. Has no effect..." << endl;
-                        return false;
-                }
+                hasCollided_ = processCollision(otherObject, contactPoint, cs);
+                return hasCollided_;
         }
 
@@ -106 +97 @@
                 //orxout(debug_output) << "detonating. Creating GravityBombField." <<endl;
                 //orxout(debug_output) << "Field is at Position: " << getPosition() << endl;
-                this->destroy();
         }
 }

code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBomb.h

@@ -48 +48 @@
                 static const float LIFETIME;
 
-                bool isDetonated_; //Used to check whether the Bomb has to be destroyed during next tick.
+                bool hasCollided_;
                 float timeToLife_; //Time the bomb flies before it explodes.
                 WorldSound* bombSound_;

code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBombField.cc

@@ -16 +16 @@
         const float GravityBombField::FORCE_FIELD_LIFETIME = 15;
         const float GravityBombField::FORCE_SPHERE_START_RADIUS = 250;
-        const float GravityBombField::FORCE_SPHERE_START_STRENGTH = -500;
+        const float GravityBombField::FORCE_SPHERE_START_STRENGTH = -700;
         const float GravityBombField::PEAK_EXPLOSION_FORCE = 5e4;
         const float GravityBombField::FORCE_FIELD_EXPLOSION_DAMMAGE = 100;
@@ -40 +40 @@
 
                 //Make the Field visible on Radar and minimap.
-                this->setRadarObjectColour(ColourValue(0.2, 0.2, 1.0,1)); // Blue
+                this->setRadarObjectColour(ColourValue(1.0, 0.0, 0.2,1)); // Red
                 this->setRadarObjectShape(RadarViewable::Dot);
-                this->setRadarObjectScale(0.5f);
+                this->setRadarObjectScale(1.0f);
                 
 

code/branches/presentationFS15/src/modules/weapons/weaponmodes/GravityBombFire.cc

@@ -19 +19 @@
         RegisterClass(GravityBombFire);
 
-        const float GravityBombFire::BOMB_VELOCITY = 400.0; ///< The velocity of the bomb after launch
+        const float GravityBombFire::BOMB_VELOCITY = 600.0; ///< The velocity of the bomb after launch
 
         GravityBombFire::GravityBombFire(Context* context) : WeaponMode(context)