Changeset 2226

Timestamp:

Nov 19, 2008, 4:06:09 PM (16 years ago)

Author:

dafrick

Message:

Resolved some issues, should be complete now.
Done some testing, no obvious errors uncovered.

Location:

code/branches/questsystem2/src/orxonox/objects/quest

Files:

• AddQuest.cc (modified) (2 diffs)
• AddQuestHint.cc (modified) (3 diffs)
• AddReward.cc (modified) (1 diff)
• ChangeQuestStatus.cc (modified) (2 diffs)
• CompleteQuest.cc (modified) (2 diffs)
• FailQuest.cc (modified) (3 diffs)
• GlobalQuest.cc (modified) (1 diff)
• GlobalQuest.h (modified) (1 diff)
• Quest.cc (modified) (1 diff)
• QuestEffectBeacon.cc (modified) (3 diffs)
• QuestEffectBeacon.h (modified) (1 diff)
• QuestHint.cc (modified) (2 diffs)

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

@@ -73 +73 @@
     {
         SUPER(AddQuest, XMLPort, xmlelement, mode);
-
+        
+        COUT(3) << "New AddQuest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
     }
 
@@ -97 +98 @@
         {
             Quest* quest = QuestManager::findQuest(this->getQuestId());
-            if(!quest->start(player))
+            if(quest == NULL || !quest->start(player))
             {
                return false;

code/branches/questsystem2/src/orxonox/objects/quest/AddQuestHint.cc

@@ -74 +74 @@
 
         XMLPortParam(AddQuestHint, "hintId", setHintId, getHintId, xmlelement, mode);
-
+        
+        COUT(3) << "New AddQuestHint, with target QuestHint {" << this->getHintId() << "}, created." << std::endl;
     }
 
@@ -113 +114 @@
         }
 
+        COUT(3) << "AddQuestHint on player: " << player << " ." << std::endl;
+
         try
         {
             QuestHint* hint = QuestManager::findHint(this->hintId_);
-            if(!hint->setActive(player))
+            if(hint == NULL || !hint->setActive(player))
             {
                 return false;
@@ -127 +130 @@
         }
 
+        COUT(3) << "QuestHint {" << this->getHintId() << "} successfully added to player." << std::endl;
         return true;
 

code/branches/questsystem2/src/orxonox/objects/quest/AddReward.cc

@@ -70 +70 @@
 
         XMLPortObject(AddReward, Rewardable, "", addRewardable, getRewardables, xmlelement, mode);
-
+        
+        COUT(3) << "New AddReward, with " << this->rewards_size() << " Rewardables created." << std::endl;
     }
 

code/branches/questsystem2/src/orxonox/objects/quest/ChangeQuestStatus.cc

@@ -61 +61 @@
     /**
     @brief
+        Method for creating a ChangeQuestStatus object through XML.
+    */
+    void ChangeQuestStatus::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(ChangeQuestStatus, XMLPort, xmlelement, mode);
+
+        XMLPortParam(ChangeQuestStatus, "questId", setQuestId, getQuestId, xmlelement, mode);
+    }
+
+    /**
+    @brief
         Sets the id of the Quest the Questffect changes the status of.
     @param id
@@ -79 +90 @@
     }
 
-    /**
-    @brief
-        Method for creating a ChangeQuestStatus object through XML.
-    */
-    void ChangeQuestStatus::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(ChangeQuestStatus, XMLPort, xmlelement, mode);
-
-        XMLPortParam(ChangeQuestStatus, "questId", setQuestId, getQuestId, xmlelement, mode);
-    }
-
 }

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

@@ -71 +71 @@
     {
         SUPER(CompleteQuest, XMLPort, xmlelement, mode);
+        
+        COUT(3) << "New CompleteQuest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
     }
 
@@ -96 +98 @@
         {
             quest = QuestManager::findQuest(this->getQuestId());
-            if(!quest->complete(player))
+            if(quest == NULL || !quest->complete(player))
             {
                return false;

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

@@ -71 +71 @@
     {
         SUPER(FailQuest, XMLPort, xmlelement, mode);
+        
+        COUT(3) << "New FailQUest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
     }
 
@@ -89 +91 @@
         }
 
+        COUT(3) << "FailQuest on player: " << player << " ." << std::endl;
+
+        Quest* quest;
         try
         {
-            Quest* quest = QuestManager::findQuest(this->getQuestId());
-            if(!quest->fail(player))
+            quest = QuestManager::findQuest(this->getQuestId());
+            if(quest == NULL || !quest->fail(player))
             {
                return false;
@@ -102 +107 @@
             return false;
         }
-
+        
+        COUT(3) << "Quest {" << quest->getId() << "} failed by player: " << player << " ." << std::endl;
         return true;
     }

code/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.cc

@@ -147 +147 @@
     bool GlobalQuest::isStartable(const PlayerInfo* player) const
     {
-        return this->isInactive(player) ||  this->isActive(player);
+        return (this->isInactive(player) && !(this->status_ == questStatus::completed || this->status_ == questStatus::failed));
     }
 

code/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.h

@@ -101 +101 @@
 
             virtual questStatus::Enum getStatus(const PlayerInfo* player) const; //!< Returns the status of the Quest for a specific player.
+            
             virtual bool setStatus(PlayerInfo* player, const questStatus::Enum & status); //!< Sets the status for a specific player.
 

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

@@ -79 +79 @@
         XMLPortObject(Quest, QuestEffect, "complete-effects", addCompleteEffect, getCompleteEffect, xmlelement, mode);
 
-        QuestManager::registerQuest(this); //Registers the quest with the QuestManager.
+        QuestManager::registerQuest(this); //!<Registers the Quest with the QuestManager.
     }
 

code/branches/questsystem2/src/orxonox/objects/quest/QuestEffectBeacon.cc

@@ -79 +79 @@
         XMLPortParam(QuestEffectBeacon, "times", setTimes, getTimes, xmlelement, mode);
         XMLPortObject(QuestEffectBeacon, QuestEffect, "effects", addEffect, getEffect, xmlelement, mode);
+        
+        COUT(3) << "New QuestEffectBeacon created." << std::endl;
     }
     
@@ -107 +109 @@
         if(!b)
         {
-            //TDO: Better message, please.
-            COUT(2) << "b is false." << std::endl;
+            return false;
         }
         if(!(this->isActive())) //!< If the QuestEffectBeacon is inactive it cannot be executed.
@@ -126 +127 @@
         if(entity == NULL)
         {
-            COUT(2) << "No one triggered the beacon? Curious!" << std::endl;
+            COUT(2) << "The QuestEffectBeacon was triggered by an entity other than a ControllableEntity." << std::endl;
             return false;
         }

code/branches/questsystem2/src/orxonox/objects/quest/QuestEffectBeacon.h

@@ -71 +71 @@
             <events>
                 <execute>
-                    <PlayerTrigger /> //A PlayerTrigger triggering the execution of the QuestEffectBeacon.
+                    <EventListener event=eventIdString />
                 </execute>
             </events>
+            <attached>
+               <PlayerTrigger name=eventIdString /> //A PlayerTrigger triggering the execution of the QuestEffectBeacon.
+            </attached>
         </QuestEffectBeacon>
     @author

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

@@ -40 +40 @@
 
 #include "orxonox/objects/infos/PlayerInfo.h"
+#include "QuestManager.h"
 #include "Quest.h"
 
@@ -72 +73 @@
         SUPER(QuestHint, XMLPort, xmlelement, mode);
 
+        QuestManager::registerHint(this); //!< Registers the QuestHint with the QuestManager.
+        
         COUT(3) << "New QuestHint {" << this->getId() << "} created." << std::endl;
     }