Changeset 2346 for code/branches/questsystem3/src/orxonox/objects

Timestamp:

Dec 5, 2008, 7:38:53 AM (16 years ago)

Author:

dafrick

Message:

• QuestListener works now.
• Rearranged the places Notifications are sent from, and also created actually meaningfull Notification messages
• Done some changes to Notifications

Location:

code/branches/questsystem3/src/orxonox/objects/quest

Files:

• AddQuest.cc (modified) (2 diffs)
• CompleteQuest.cc (modified) (2 diffs)
• FailQuest.cc (modified) (1 diff)
• Quest.cc (modified) (3 diffs)
• QuestDescription.cc (modified) (2 diffs)
• QuestDescription.h (modified) (2 diffs)
• QuestHint.cc (modified) (2 diffs)
• QuestItem.h (modified) (1 diff)
• QuestListener.cc (modified) (3 diffs)
• QuestListener.h (modified) (1 diff)

code/branches/questsystem3/src/orxonox/objects/quest/AddQuest.cc

@@ -42 +42 @@
 
 #include "orxonox/objects/infos/PlayerInfo.h"
-#include "orxonox/overlays/notifications/Notification.h"
 #include "QuestManager.h"
 #include "Quest.h"
@@ -111 +110 @@
 
         COUT(3) << "Quest {" << this->getQuestId() << "} successfully added to player." << std::endl;
-        Notification* notification = new Notification("Crazy Message...", "Title", 30);
-        notification->send();
         return true;
     }

code/branches/questsystem3/src/orxonox/objects/quest/CompleteQuest.cc

@@ -42 +42 @@
 #include "QuestManager.h"
 #include "Quest.h"
-#include "orxonox/overlays/notifications/Notification.h"
 
 namespace orxonox {
@@ -111 +110 @@
 
         COUT(3) << "Quest {" << quest->getId() << "} successfully completed by player: " << player << " ." << std::endl;
-        Notification* notification = new Notification("Crazy Message...", "Title", 30);
-        notification->send();
         return true;
     }

code/branches/questsystem3/src/orxonox/objects/quest/FailQuest.cc

@@ -40 +40 @@
 
 #include "orxonox/objects/infos/PlayerInfo.h"
-#include "orxonox/overlays/notifications/Notification.h"
 #include "QuestManager.h"
 #include "Quest.h"

code/branches/questsystem3/src/orxonox/objects/quest/Quest.cc

@@ -377 +377 @@
         QuestListener::advertiseStatusChange(this->listeners_, "fail"); //!< Tells the QuestListeners, that the status has changed to failed.
         this->setStatus(player, questStatus::failed);
+        
+        this->getDescription()->sendFailQuestNotification();
         return true;
     }
@@ -392 +394 @@
         QuestListener::advertiseStatusChange(this->listeners_, "complete"); //!< Tells the QuestListeners, that the status has changed to completed.
         this->setStatus(player, questStatus::completed);
+        
+        this->getDescription()->sendCompleteQuestNotification();
         return true;
     }
@@ -414 +418 @@
         
         this->setStatus(player, questStatus::active);
+        
+        this->getDescription()->sendAddQuestNotification();
         return true;
     }

code/branches/questsystem3/src/orxonox/objects/quest/QuestDescription.cc

@@ -38 +38 @@
 
 #include "core/CoreIncludes.h"
+#include "orxonox/overlays/notifications/Notification.h"
 
 namespace orxonox {
@@ -75 +76 @@
         XMLPortParam(QuestDescription, "description", setDescription, getDescription, xmlelement, mode);
         XMLPortParam(QuestDescription, "failMessage", setFailMessage, getFailMessage, xmlelement, mode);
-        XMLPortParam(QuestDescription, "failMessage", setCompleteMessage, getCompleteMessage, xmlelement, mode);
+        XMLPortParam(QuestDescription, "completeMessage", setCompleteMessage, getCompleteMessage, xmlelement, mode);
 
         COUT(3) << "New QuestDescription with title '" << this->getTitle() << "' created." << std::endl;
+    }
+    
+    /**
+    @brief
+        This method is a helper for sending QuestDescriptions as Notifications.
+    @param item
+        The item the QuestDescription is for.
+    @param status
+        The status the QuestDescription us for.
+    @return
+        Returns true if successful.
+    */
+    bool QuestDescription::notificationHelper(const std::string & item, const std::string & status) const
+    {
+        std::string message = "";
+        std::string title = "";
+        if(item == "hint")
+        {
+            title = "You received a hint: '" + this->title_ + "'";
+            message = this->description_;
+        }
+        else if(item == "quest")
+        {
+            if(status == "start")
+            {
+                title = "You received a new quest: '" + this->title_ + "'";
+                message = this->description_;
+            }
+            else if(status == "fail")
+            {
+                title = "You failed the quest: '" + this->title_ + "'";
+                message = this->failMessage_;
+            }
+            else if(status == "complete")
+            {
+                title = "You successfully completed the quest: '" + this->title_ + "'";
+                message = this->completeMessage_;
+            }
+            else
+            {
+                COUT(2) << "Bad input in notificationHelper, this should not be happening!" << std::endl;
+                return false;
+            }
+        }
+        else
+        {
+            COUT(2) << "Bad input in notificationHelper, this should not be happening!" << std::endl;
+            return false;
+        }
+        
+        Notification* notification = new Notification(message, title, 10);
+        notification->send();
+        return true;
     }
 

code/branches/questsystem3/src/orxonox/objects/quest/QuestDescription.h

@@ -91 +91 @@
             inline const std::string & getCompleteMessage(void) const
                 { return this->completeMessage_; }
+            
+            /**
+            @brief Sends a Notification displaying that a QuestHint was added.
+            @return Returns true if successful.
+            */
+            inline bool sendAddHintNotification(void) const
+                { return notificationHelper("hint", ""); }
+            
+            /**
+            @brief Sends a Notification displaying that a Quest was added.
+            @return Returns true if successful.
+            */
+            inline bool sendAddQuestNotification(void) const
+                { return notificationHelper("quest", "start"); }
+            
+            /**
+            @brief Sends a Notification displaying that a Quest was failed.
+            @return Returns true if successful.
+            */
+            inline bool sendFailQuestNotification(void) const
+                { return notificationHelper("quest", "fail"); }
+            
+            /**
+            @brief Sends a Notification displaying that a Quest was completed.
+            @return Returns true if successful.
+            */
+            inline bool sendCompleteQuestNotification(void) const
+                { return notificationHelper("quest", "complete"); }
 
         private:
@@ -97 +125 @@
             std::string failMessage_; //!< The message displayed when the Quest is failed.
             std::string completeMessage_; //!< The message displayed when the Quest is completed.
+
+            bool notificationHelper(const std::string & item, const std::string & status) const; //!< Helper for sending QuestDescriptions as Notifications.
 
             /**

code/branches/questsystem3/src/orxonox/objects/quest/QuestHint.cc

@@ -41 +41 @@
 #include "orxonox/objects/infos/PlayerInfo.h"
 #include "QuestManager.h"
+#include "QuestDescription.h"
 #include "Quest.h"
 
@@ -122 +123 @@
             {
                 this->playerStatus_[player] = questHintStatus::active;
+                
+                this->getDescription()->sendAddHintNotification();
                 return true;
             }

code/branches/questsystem3/src/orxonox/objects/quest/QuestItem.h

@@ -67 +67 @@
             /**
             @brief Returns the id of this QuestItem.
-        @return Returns the id of the QuestItem.
+            @return Returns the id of the QuestItem.
             */
             inline const std::string & getId(void) const
                 { return this->id_; }
-        /**
-        @brief Returns the QuestDescription of the QuestItem.
-        @return Returns a pointer to the QuestDescription object of the QuestItem.
-        */
+            /**
+            @brief Returns the QuestDescription of the QuestItem.
+            @return Returns a pointer to the QuestDescription object of the QuestItem.
+            */
             inline const QuestDescription* getDescription(void) const
                 { return this->description_; }

code/branches/questsystem3/src/orxonox/objects/quest/QuestListener.cc

@@ -43 +43 @@
     {
         RegisterObject(QuestListener);
+        
+        this->status_ = questListenerStatus::start;
+        this->quest_ = NULL;
     }
     
@@ -62 +65 @@
         this->quest_->addListener(this);
         
-        COUT(3) << "QuestListener created for quest: {" << this->quest_->getId() << "} and status '" << this->status_ << "'." << std::endl;
+        COUT(3) << "QuestListener created for quest: {" << this->quest_->getId() << "} and status '" << this->getQuestStatus() << "'." << std::endl;
     }
     
@@ -80 +83 @@
     {
         this->fireEvent(true); //TDO This' right?
-        
-        COUT(3) << "QuestListener fired Event, expect for something to happen." << std::endl; //TDO remove
-        
         return true;
     }

code/branches/questsystem3/src/orxonox/objects/quest/QuestListener.h

@@ -80 +80 @@
             questListenerStatus::Enum status_;
             Quest* quest_;
-            BaseObject* target_;
     
     };