Changeset 6812 for code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h

Timestamp:

Apr 30, 2010, 4:42:58 PM (14 years ago)

Author:

jo

Message:

adding 3rd party: killers, making the gametype playable for larger groups of players, bug removed

File:

• code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h (modified) (1 diff)

code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h

@@ -44 +44 @@
             virtual ~Dynamicmatch() {}
                 
-                bool onlyChasers;
-                int getParty(PlayerInfo* player);
-                void setPlayerColour(PlayerInfo* player);//own function
-                void setConfigValues();//done
-                virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0); //ok - score function and management of parties
-                virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0); //ok - simple
+            bool notEnoughPigs;
+            bool notEnoughKillers;
+            bool notEnoughChasers;
+            virtual void evaluatePlayerParties();
+            int getParty(PlayerInfo* player);
+            void setPlayerColour(PlayerInfo* player);//own function
+            void setConfigValues();//done
+            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0); //ok - score function and management of parties
+            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0); //ok - simple
             virtual void start();
-
+            virtual void end(); //Wie geht das mit der Punkteausgabe aendern? Z.B: Persoenliche Nachricht?
+            virtual void playerEntered(PlayerInfo* player);
+            virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);//is used to initialize the player's party and colour
+            virtual bool playerLeft(PlayerInfo* player);
+            virtual bool playerChangedName(PlayerInfo* player);//unchanged
+            virtual void instructions();
+            virtual void furtherInstructions();
+            virtual void rewardPig();
+            void resetSpeedFactor(WeakPtr<Engine>* ptr);  
+            void tick (float dt);// used to end the game
+            //three different parties   TODO const machen!      
+            int chaser;
+            int piggy;
+            int killer;
+                
+            bool friendlyfire; //goal: player can switch it on/off
+            bool tutorial; //goal: new players recieve messages how the new gametype works - later it can be switched off.
+        protected:
                   
-            virtual void end(); //Wie geht das mit der Punkteausgabe? frags als Schnittstelle ausreichend?
-            virtual void playerEntered(PlayerInfo* player);
-                virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);//is used to initialize the player's party and colour
-            virtual bool playerLeft(PlayerInfo* player);//ToDo: extract the player's party record - done?
-            virtual bool playerChangedName(PlayerInfo* player);//unchanged
-
-                void resetSpeedFactor(WeakPtr<Engine>* ptr);
-        
-            
-                void tick (float dt);// used to end the game
-                
-                //inline const ColourValue& getPlayerColour(int teamnr) const
-                //{ return this->partyColours_[teamnr]; }
-                
-                protected:
-                  //the two different parties
-                  int chaser;
-                  int piggy;
-                  std::map< PlayerInfo*, int > playerParty_; //player's parties are recorded here
-                  std::vector<ColourValue> partyColours_; //aus TeamDeathmatch            
-                bool friendlyfire; //goal: player can switch it on/off
-                float gameTime_;   // from UnderAttack
-                bool gameEnded_; // true if game is over
-                int timesequence_; //used for countdown
+                  
+            std::map< PlayerInfo*, int > playerParty_; //player's parties are recorded here
+            std::vector<ColourValue> partyColours_; //aus TeamDeathmatch
+            unsigned int numberOf[3]; //array to count number of chasers, pigs, killers
+            float pointsPerTime;
+            float gameTime_;   // from UnderAttack better: use gametype interface!!!
+            bool gameEnded_; // true if game is over
+            int timesequence_; //used for countdown
+            Timer callInstructions_;
     };
 }