Changeset 9155

Timestamp:

May 4, 2012, 3:56:56 PM (13 years ago)

Author:

lkevin

Message:

Changed pickup icon and xml for possible varieties of the pickup in the future.

Location:

code/branches/pickup2012

Files:

• data/levels/includes/pickups.oxi (modified) (1 diff)
• data/levels/pickups.oxw (modified) (1 diff)
• data/levels/templates/pickupRepresentationTemplates.oxt (modified) (1 diff)
• src/modules/pickup/items/DamageBoostPickup.cc (modified) (6 diffs)
• src/modules/pickup/items/DamageBoostPickup.h (modified) (4 diffs)
• src/modules/pickup/items/SpeedPickup.h (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/pickup2012/data/levels/includes/pickups.oxi

@@ -210 +210 @@
 </PickupRepresentation>
 
+<!-- DamageBoost Pickup -->
+
+<PickupRepresentation
+    pickupName = "DamageBoost Pickup"
+    pickupDescription = "Multiplies the ship damage."
+    spawnerTemplate = "damageboostpickupRepresentation"
+>
+    <pickup>
+        <DamageBoostPickup template=damageboostpickup />
+    </pickup>
+</PickupRepresentation>
+
 <!-- Shrink Pickup -->
 

code/branches/pickup2012/data/levels/pickups.oxw

@@ -171 +171 @@
     <!-- DamageBoost pickup -->
     
-    <PickupSpawner position="-100,300,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
-      <pickup>
-        <DamageBoostPickup template=normaldamageboostpickup />
+    <PickupSpawner position="-50,75,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
+      <pickup>
+        <DamageBoostPickup template=damageboostpickup />
       </pickup>
     </PickupSpawner>

code/branches/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxt

@@ -218 +218 @@
 <!-- DamageBoost pickups -->
 
-<Template name=normaldamageboostpickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.5>
-                        <attached>
-                            <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.5 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=normaldamageboostpickup>
+<Template name=damageboostpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.10,0.20,0.30" material="Sphere2" scale=0.1 >
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.30,0.30,0.30" material="damage" scale=0.7 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=damageboostpickup>
   <DamageBoostPickup
     duration = 10.0
+    damageMultiplier = 20.0
     activationType = "immediate"
     durationType = "continuous"

code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Eric Beier
+ *      Kevin Lengauer
  *   Co-authors:
  *      ...
@@ -28 +28 @@
 
 /**
-    @file SpeedPickup.cc
-    @brief Implementation of the SpeedPickup class.
+    @file DamageBoostPickup.cc
+    @brief Implementation of the DamageBoostPickup class.
 */
 
@@ -71 +71 @@
     {
         this->duration_ = 0.0f;
-        this->damageMultiplier_ = 20.0f;
+        this->damageMultiplier_ = 1.0f; //The default damage multiplier.
         //Defines who is allowed to pick up the pickup.
         this->addTarget(ClassIdentifier<SpaceShip>::getIdentifier());
@@ -105 +105 @@
 
         XMLPortParam(DamageBoostPickup, "duration", setDuration, getDuration, xmlelement, mode);
-        XMLPortParam(DamageBoostPickup, "damageMultiplier", setDefaultDamageMultiplier, getDefaultDamageMultiplier, xmlelement, mode);
+        XMLPortParam(DamageBoostPickup, "damageMultiplier", setDamageMultiplier, getDamageMultiplier, xmlelement, mode);
 
         this->initializeIdentifier();
     }
+
+    // Work in Progress setDamage Function
+    void DamageBoostPickup::setDamageMultiplier(float damageMultiplier)
+    {
+        if(damageMultiplier >= 1.0f)
+        {
+            this->damageMultiplier_ = damageMultiplier;
+            orxout() << "Set Damage " << damageMultiplier << endl;
+        }
+    }
+
 
     /**
@@ -138 +149 @@
                 }
             }
-            // NOTE: commented this since its use was not apparent
-            // ship->getCreator();
-
+
+            // Saves the old default Damage that is needed to restore the original damage
             this->olddamageMultiplier_ = ship->getDamageMultiplier();
+            // Sets the new Damage with the damage multiplier.
             ship->setDamageMultiplier( this->damageMultiplier_ );
         }
@@ -214 +225 @@
         else
         {
-            orxout(internal_error, context::pickups) << "Invalid duration in SpeedPickup." << endl;
+            orxout(internal_error, context::pickups) << "Invalid duration in DamagePickup." << endl;
             this->duration_ = 0.0f;
         }
     }
 
-   /* void DamageBoostPickup::setDamageBoost(float damageBoost)
-       {
-
-       }
-    void DamageBoostPickup::setDamageSave(float damageSave)
-    {
-
-    }
-    */
-
+    /**
+    @brief
+        Helper method. Is called by the Timer as soon as it expires.
+    */
     void DamageBoostPickup::pickupTimerCallback(void)
     {

code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.h

@@ -21 +21 @@
  *
  *   Author:
- *      Damian 'Mozork' Frick
+ *      Kevin Lengauer
  *   Co-authors:
  *      ...
@@ -53 +53 @@
 
             virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a DamageBoostPickup object through XML.
-            // commented out cuz was not used
-            // virtual void tick(float dt); //!< Is called every tick.
 
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
             virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
-
-            /**
-            @brief Get the damageboost that is transferred to the Pawn upon usage of this pickup.
-            @return Returns the damageboost.
-            */
-            // Commentend, may not be used
-            // inline float setDamageMultiplier(void) const
-            //    { ship->setMultiplier(); }
-
 
             /**
@@ -77 +66 @@
 
 
-            // we need these methods to set the default damage multiplier from XML
-            // not that beautiful yet
-            inline void setDefaultDamageMultiplier(float multiplier)
-                { this->damageMultiplier_ = multiplier; }
-            inline float getDefaultDamageMultiplier()
+
+            /**
+             @brief set Damage multiplier
+             @param multiplier The default damage multiplier to set
+             */
+            inline float getDamageMultiplier()
                 { return this->damageMultiplier_; }
 
@@ -89 +79 @@
         protected:
             void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
+            void setDamageMultiplier(float damageMultiplier);
 
-            // void setDamageBoost(float damageBoost);//!< Sets the damage boost.
-            // void setDamageSave(float damageSave); //!< Saves the original damage.
 
         private:
             void initialize(void); //!< Initializes the member variables.
             Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
-            SpaceShip* carrierToSpaceShipHelper(void);
+            SpaceShip* carrierToSpaceShipHelper(void); //!< Helper to transform the PickupCarrier to a SpaceShip, and throw an error message if the conversion fails.
             void pickupTimerCallback(void);
 

code/branches/pickup2012/src/modules/pickup/items/SpeedPickup.h

@@ -112 +112 @@
         private:
             void initialize(void); //!< Initializes the member variables.
-            SpaceShip* carrierToSpaceShipHelper(void); //!< Helper to transform the PickupCarrier to a SpaceSHip, and throw an error message if the conversion fails.
+            SpaceShip* carrierToSpaceShipHelper(void); //!< Helper to transform the PickupCarrier to a SpaceShip, and throw an error message if the conversion fails.
 
             Timer durationTimer_; //!< Timer.

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

@@ -234 +234 @@
         Pawn *test = dynamic_cast<Pawn *>(originator);
         if( test != NULL )
+        { orxout() << "Test " << damage << endl;
           damage *= originator->getDamageMultiplier();
+        }
 
         if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))