Changeset 2000 for code/branches/pickups

Timestamp:

Oct 22, 2008, 10:30:59 PM (16 years ago)

Author:

dsommer

Message:

Adding Subclasses to ShipItem.h

Location:

code/branches/pickups/src/orxonox/objects/pickup

Files:

• ShipEquipment.h (added)
• ShipItem.h (modified) (1 diff)

code/branches/pickups/src/orxonox/objects/pickup/ShipItem.h

@@ -6 +6 @@
 #include "ShipEquipmentClasses.h"
 
-enum itemType{ //Diffrent Types of Items
-        
-                Usable,
-                Powerups,
-                Permanent
-                };
+
 
 namespace orxonox{
+Class _OrxonoxExport ShipItem{
+
+        enum itemType{ //Diffrent Types of Items
+
+                        Useable,
+                        Powerups,
+                        Permanent
+                        };
+
+        public:
+                itemType CheckType();
+
+        private:
+                itemType type;
+        };
 
 
+/* Useables are Items the Player can choose when to activate and then show an instant action/effect
+ * or for a certain duration */
+Class _OrxonoxExport Useable : public ShipItem{
 
 
-Class _OrxonoxExport ShipItem : public SpaceShip{
-        
-        public:
-                itemType CheckType();
-         
-        private:
-                itemType type; 
-                
-        
+        enum subItemTypeUseable{ //Diffrent Types of Items of the Type Useable
+                        Rockets,
+                        Repairkits,
+                        Triggers,               //trigger events usable by the player (Quests f.exp.)
+                        Boosters,
+                        Shields,
+                        Appearance,
+                        };
 
+                        public:
+                                subItemTypeUseable CheckSubType();
 
+                        private:
+                                subItemTypeUseable subtype;
+};
+
+/* Permanents are Items, that effect the Player or his Ship from the instance he picks them up
+   until he drops them again */
+Class _OrxonoxExport Permanent : public ShipItem{
+
+        enum subItemTypePermanent{ //Diffrent Types of Items of the Type Permanent
+                        Weapon,
+                        Thrusters,
+                        Shields,
+                        Armor
+                        };
+                        public:
+                                subItemTypePermanent CheckSubType();
+
+                        private:
+                                subItemTypePermanent subtype;
+};
+
+// Powerups effect the Player right after he picks them up for a certain Duration /or permanently.
+Class _OrxonoxExport Powerups : public ShipItem{
+
+        enum subItemTypePowerups{ //Diffrent Types of Items of the Type Powerups
+                        Weapon,
+                        Boosters,
+                        Shields,
+                        Repairkits,
+                        Appearance,
+                        Trigger
+                        };
+                        public:
+                        subItemTypePowerups CheckSubType();
+
+                        private:
+                        subItemTypePowerups subtype;
+};
+
+}