Changeset 2917

Timestamp:

Apr 15, 2009, 5:03:58 PM (15 years ago)

Author:

landauf

Message:

merged pickup into pickup2

Location:

code/branches/pickups2

Files:

• . (modified) (2 props)
• bin/client1.bat.in (modified) (1 prop)
• bin/client2.bat.in (modified) (1 prop)
• bin/dedicated.bat.in (modified) (1 prop)
• bin/run.bat.in (modified) (1 prop)
• bin/server.bat.in (modified) (1 prop)
• bin/standalone.bat.in (modified) (1 prop)
• cmake/FindDirectX.cmake (modified) (1 prop)
• cmake/LibraryConfigTardis.cmake (modified) (1 prop)
• src/core/LuaBind.cc (modified) (1 prop)
• src/core/LuaBind.h (modified) (1 prop)
• src/core/Template.cc (modified) (1 prop)
• src/core/Template.h (modified) (1 prop)
• src/core/XMLFile.h (modified) (1 prop)
• src/core/XMLIncludes.h (modified) (1 prop)
• src/cpptcl/cpptcl.cc (modified) (1 prop)
• src/cpptcl/cpptcl.h (modified) (1 prop)
• src/network/synchronisable/NetworkCallback.h (modified) (1 prop)
• src/network/synchronisable/Synchronisable.cc (modified) (1 prop)
• src/network/synchronisable/Synchronisable.h (modified) (1 prop)
• src/orxonox/CameraManager.cc (modified) (1 prop)
• src/orxonox/CameraManager.h (modified) (1 prop)
• src/orxonox/objects/Level.cc (modified) (1 prop)
• src/orxonox/objects/Level.h (modified) (1 prop)
• src/orxonox/objects/collisionshapes (modified) (1 prop)
• src/orxonox/objects/controllers/HumanController.cc (modified) (4 diffs)
• src/orxonox/objects/controllers/HumanController.h (modified) (1 diff)
• src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) (1 prop)
• src/orxonox/objects/gametypes/TeamDeathmatch.h (modified) (1 prop)
• src/orxonox/objects/items/Engine.cc (modified) (1 diff)
• src/orxonox/objects/pickup/BaseItem.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/BaseItem.cc) (1 prop)
• src/orxonox/objects/pickup/BaseItem.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/BaseItem.h) (1 prop)
• src/orxonox/objects/pickup/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/pickup/DroppedItem.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/DroppedItem.cc) (1 prop)
• src/orxonox/objects/pickup/DroppedItem.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/DroppedItem.h) (1 prop)
• src/orxonox/objects/pickup/EquipmentItem.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/EquipmentItem.cc) (1 prop)
• src/orxonox/objects/pickup/EquipmentItem.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/EquipmentItem.h) (1 prop)
• src/orxonox/objects/pickup/Jump.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/Jump.cc) (1 prop)
• src/orxonox/objects/pickup/Jump.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/Jump.h) (1 prop)
• src/orxonox/objects/pickup/ModifierPickup.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.cc) (1 prop)
• src/orxonox/objects/pickup/ModifierPickup.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.h) (1 prop)
• src/orxonox/objects/pickup/ModifierType.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/ModifierType.h) (1 prop)
• src/orxonox/objects/pickup/PassiveItem.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/PassiveItem.cc) (1 prop)
• src/orxonox/objects/pickup/PassiveItem.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/PassiveItem.h) (1 prop)
• src/orxonox/objects/pickup/PickupCollection.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.cc) (1 prop)
• src/orxonox/objects/pickup/PickupCollection.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.h) (1 prop)
• src/orxonox/objects/pickup/PickupSpawner.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/PickupSpawner.cc) (1 prop)
• src/orxonox/objects/pickup/PickupSpawner.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/PickupSpawner.h) (1 prop)
• src/orxonox/objects/pickup/ShipEquipment.cc (deleted)
• src/orxonox/objects/pickup/ShipEquipment.h (deleted)
• src/orxonox/objects/pickup/ShipEquipmentClasses.cc (deleted)
• src/orxonox/objects/pickup/ShipEquipmentClasses.h (deleted)
• src/orxonox/objects/pickup/ShipItem.cc (deleted)
• src/orxonox/objects/pickup/ShipItem.h (deleted)
• src/orxonox/objects/pickup/Turbo.cc (deleted)
• src/orxonox/objects/pickup/Turbo.h (deleted)
• src/orxonox/objects/pickup/Usable.h (deleted)
• src/orxonox/objects/pickup/UsableItem.cc (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/UsableItem.cc) (1 prop)
• src/orxonox/objects/pickup/UsableItem.h (copied) (copied from code/branches/pickups/src/orxonox/objects/pickup/UsableItem.h) (1 prop)
• src/orxonox/objects/quest/AddQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/AddQuestHint.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddQuestHint.h (modified) (1 prop)
• src/orxonox/objects/quest/AddReward.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddReward.h (modified) (1 prop)
• src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) (1 prop)
• src/orxonox/objects/quest/ChangeQuestStatus.h (modified) (1 prop)
• src/orxonox/objects/quest/CompleteQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/CompleteQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/FailQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/FailQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/GlobalQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/GlobalQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/LocalQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/LocalQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/Quest.cc (modified) (1 prop)
• src/orxonox/objects/quest/Quest.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestDescription.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestDescription.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestEffect.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestEffect.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestHint.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestHint.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestItem.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestItem.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestManager.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestManager.h (modified) (1 prop)
• src/orxonox/objects/quest/Rewardable.cc (modified) (1 prop)
• src/orxonox/objects/quest/Rewardable.h (modified) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) (1 prop)
• src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/Backlight.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.h (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.h (modified) (1 prop)
• src/orxonox/objects/worldentities/ControllableEntity.h (modified) (1 diff)
• src/orxonox/objects/worldentities/MobileEntity.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/MobileEntity.h (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.h (modified) (1 prop)
• src/orxonox/objects/worldentities/StaticEntity.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/StaticEntity.h (modified) (1 prop)
• src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) (3 diffs)
• src/orxonox/objects/worldentities/pawns/Pawn.h (modified) (3 diffs)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.h (modified) (1 prop)
• src/tolua/all-5.0.lua (modified) (1 prop)
• src/tolua/all-5.1.lua (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/Exception.cc (modified) (1 prop)
• src/util/Exception.h (modified) (1 prop)
• src/util/SignalHandler.cc (modified) (1 prop)
• src/util/SignalHandler.h (modified) (1 prop)

code/branches/pickups2/src/orxonox/objects/controllers/HumanController.cc

@@ -49 +49 @@
     SetConsoleCommand(HumanController, boost,         true).keybindMode(KeybindMode::OnHold);
     SetConsoleCommand(HumanController, greet,         true);
-    SetConsoleCommand(HumanController, use,           true);
     SetConsoleCommand(HumanController, switchCamera,  true);
     SetConsoleCommand(HumanController, mouseLook,     true);
@@ -56 +55 @@
     SetConsoleCommand(HumanController, killBots,      true).defaultValues(0);
     SetConsoleCommand(HumanController, dropItems,     true);
+    SetConsoleCommand(HumanController, useItem,       true);
 
     CreateUnloadableFactory(HumanController);
@@ -133 +133 @@
     }
 
-    void HumanController::use()
-    {
-        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
-            HumanController::localController_s->controllableEntity_->use();
-    }
-
     void HumanController::switchCamera()
     {
@@ -163 +157 @@
     }
 
+    void HumanController::useItem()
+    {
+        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
+            HumanController::localController_s->controllableEntity_->useItem();
+    }
+
     void HumanController::addBots(unsigned int amount)
     {

code/branches/pickups2/src/orxonox/objects/controllers/HumanController.h

@@ -56 +56 @@
             static void boost();
             static void greet();
-            static void use();
             static void switchCamera();
             static void mouseLook();
             static void dropItems();
+            static void useItem();
 
             static void suicide();

code/branches/pickups2/src/orxonox/objects/items/Engine.cc

@@ -192 +192 @@
         }
 
-        this->ship_->setAcceleration(this->ship_->getOrientation() * acceleration);
+        this->ship_->setAcceleration(this->ship_->getPickups().processModifiers(ModifierType::Acceleration, this->ship_->getOrientation() * acceleration, false));
 
         if (!this->ship_->getPermanentBoost())

code/branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+  BaseItem.cc
+  DroppedItem.cc
+  EquipmentItem.cc
+  Jump.cc
+  ModifierPickup.cc
+  PassiveItem.cc
+  PickupCollection.cc
   PickupSpawner.cc
-  BaseItem.cc
-  Turbo.cc
-  ShipEquipment.cc
+  UsableItem.cc
 )

code/branches/pickups2/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc

@@ -124 +124 @@
 
             Pawn* victim = dynamic_cast<Pawn*>(otherObject);
+
+            float dmg = this->damage_;
+            if (this->owner_)
+                dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
+
             if (victim)
-                victim->damage(this->damage_, this->owner_);
+                victim->damage(dmg, this->owner_);
         }
         return false;

code/branches/pickups2/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -88 +88 @@
             virtual void boost() {}
             virtual void greet() {}
-            virtual void use() {}
+            virtual void useItem() {}
             virtual void dropItems() {}
             virtual void switchCamera();

code/branches/pickups2/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -61 +61 @@
         this->spawnparticleduration_ = 3.0f;
 
-        this->getPickUp().setPlayer(this);
+        this->getPickups().setOwner(this);
 
         if (GameMode::isMaster())
@@ -205 +205 @@
             this->setDestroyWhenPlayerLeft(false);
 
+            this->dropItems();
+
             if (this->getGametype())
                 this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
@@ -266 +268 @@
     void Pawn::dropItems()
     {
-        pickUp.eraseAll();
+        this->getPickups().clear();
     }
 

code/branches/pickups2/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-#include "objects/pickup/ShipEquipment.h"
 #include "objects/worldentities/ControllableEntity.h"
 #include "objects/RadarViewable.h"
 #include "objects/weaponSystem/WeaponSystem.h"
+#include "objects/pickup/PickupCollection.h"
 
 namespace orxonox
@@ -107 +107 @@
                 { return this->numexplosionchunks_; }
 
-            inline ShipEquipment& getPickUp()
-                {return this->pickUp;}
-
             virtual void dropItems();
+            inline PickupCollection& getPickups()
+                { return this->pickups_; }
+            virtual void useItem()
+                { this->pickups_.useItem(); }
 
         protected:
@@ -117 +118 @@
             virtual void spawneffect();
 
-            ShipEquipment pickUp;
             bool bAlive_;
 
+            PickupCollection pickups_;
 
             float health_;