Context Navigation

← Previous Change
Next Change →

objects

Timestamp:

Mar 12, 2009, 5:13:34 PM (16 years ago)

Author:

dafrick

Message:

Updated questsystem to current trunk. Synchronized it with my local state of things. The Notifications are not yet working, though.

Location:

code/branches/questsystem5/src/orxonox/objects/quest

Files:

: 2 added
: 35 edited

AddQuest.cc (modified) (2 diffs)
AddQuest.h (modified) (1 diff)
AddQuestHint.cc (modified) (1 diff)
AddQuestHint.h (modified) (1 diff)
AddReward.cc (modified) (1 diff)
AddReward.h (modified) (1 diff)
CMakeLists.txt (modified) (1 diff)
ChangeQuestStatus.cc (modified) (1 diff)
ChangeQuestStatus.h (modified) (1 diff)
CompleteQuest.cc (modified) (1 diff)
CompleteQuest.h (modified) (1 diff)
FailQuest.cc (modified) (1 diff)
FailQuest.h (modified) (1 diff)
GlobalQuest.cc (modified) (1 diff)
GlobalQuest.h (modified) (1 diff)
LocalQuest.cc (modified) (1 diff)
LocalQuest.h (modified) (1 diff)
Quest.cc (modified) (1 diff)
Quest.h (modified) (1 diff)
QuestDescription.cc (modified) (5 diffs)
QuestDescription.h (modified) (1 diff)
QuestEffect.cc (modified) (1 diff)
QuestEffect.h (modified) (1 diff)
QuestEffectBeacon.cc (modified) (1 diff)
QuestEffectBeacon.h (modified) (1 diff)
QuestHint.cc (modified) (1 diff)
QuestHint.h (modified) (1 diff)
QuestItem.cc (modified) (1 diff)
QuestItem.h (modified) (1 diff)
QuestListener.cc (modified) (1 diff)
QuestListener.h (modified) (1 diff)
QuestManager.cc (modified) (1 diff)
QuestManager.h (modified) (1 diff)
QuestNotification.cc (added)
QuestNotification.h (added)
Rewardable.cc (modified) (1 diff)
Rewardable.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

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

-                      r2710
+                      r2779
 /**
     @file
+    @file AddQuest.cc
     @brief Implementation of the AddQuest class.
 */
 …
 #include "orxonox/objects/infos/PlayerInfo.h"
 #include "QuestManager.h"
+#include "QuestDescription.h";
 #include "Quest.h"

code/branches/questsystem5/src/orxonox/objects/quest/AddQuest.h

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file AddQuest.h
31	31	@brief Definition of the AddQuest class.
32	32	*/

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

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file AddQuestHint.cc
31	31	@brief Implementation of the AddQuestHint class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.h

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file AddQuestHint.h
31	31	@brief Definition of the AddQuestHint class.
32	32	*/

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

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file AddReward.cc
31	31	@brief Implementation of the AddReward class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/AddReward.h

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file AddReward.h
31	31	@brief Definition of the AddReward class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/CMakeLists.txt

r2710	r2779
16	16	QuestListener.cc
17	17	QuestManager.cc
	18	QuestNotification.cc
18	19	Rewardable.cc
19	20	)

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

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file ChangeQuestStatus.cc
31	31	@brief Implementation of the ChangeQuestStatus class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.h

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file ChangeQuestStatus.h
31	31	@brief Definition of the ChangeQuestStatus class.
32	32	*/

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

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file CompleteQuest.cc
31	31	@brief Implementation of the CompleteQuest class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.h

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file CompleteQuest.h
31	31	@brief Definition of the CompleteQuest class.
32	32	*/

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

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file FailQuest.cc
31	31	@brief Implementation of the FailQuest class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/FailQuest.h

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file FailQuest.h
31	31	@brief Definition of the FailQuest class.
32	32	*/

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

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file GlobalQuest.cc
31	31	@brief Implementation of the GlobalQuest class.
32	32	*/

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

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file GlobalQuest.h
31	31	@brief Definition of the GlobalQuest class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.cc

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file LocalQuest.cc
31	31	@brief Implementation of the LocalQuest class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.h

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file LocalQuest.h
31	31	@brief Definition of the LocalQuest class.
32	32	*/

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

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file Quest.cc
31	31	@brief Implementation of the Quest class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/Quest.h

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file Quest.h
31	31	@brief Definition of the Quest class.
32	32	The Quest is the parent class of LocalQuest and GlobalQuest.

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

-                      r2710
+                      r2779
 /**
     @file
+    @file QuestDescription.cc
     @brief Implementation of the QuestDescription class.
 */
 …
 #include "core/CoreIncludes.h"
 #include "orxonox/overlays/notifications/Notification.h"
+#include "QuestNotification.h"
 namespace orxonox
 …
     @return
         Returns true if successful.
+    @todo
+        Make sure the messages meet the conditions.
     */
     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_;
+            message = "You received a hint: '" + this->title_ + "'";
+        }
         else if(item == "quest")
 …
             if(status == "start")
+            {
+                title = "You received a new quest: '" + this->title_ + "'";
+                message = this->description_;
+                message = "You received a new quest: '" + this->title_ + "'";
+            }
             else if(status == "fail")
+            {
+                title = "You failed the quest: '" + this->title_ + "'";
+                message = this->failMessage_;
+                message = "You failed the quest: '" + this->title_ + "'";
+            }
             else if(status == "complete")
+            {
+                title = "You successfully completed the quest: '" + this->title_ + "'";
+                message = this->completeMessage_;
+                message = "You successfully completed the quest: '" + this->title_ + "'";
+            }
             else
 …
+        }
         Notification* notification = new Notification(0, message, title, 30);
+        QuestNotification* notification = new QuestNotification(message);
         notification->send();
         return true;

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

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file QuestDescription.h
31	31	@brief Definition of the QuestDescription class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.cc

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file QuestEffect.cc
31	31	@brief Implementation of the QuestEffect class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.h

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file QuestEffect.h
31	31	@brief Definition of the QuestEffect class.
32	32	*/

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

r2662	r2779
28	28
29	29	/**
30		@file
	30	@file QuestEffectBeacon.cc
31	31	@brief Implementation of the QuestEffectBeacon class.
32	32	*/

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

r2662	r2779
28	28
29	29	/**
30		@file
	30	@file QuestEffectBeacon.h
31	31	@brief Definition of the QuestEffectBeacon class.
32	32	*/

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

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file QuestHint.cc
31	31	@brief Implementation of the QuestHint class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/QuestHint.h

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file QuestHint.h
31	31	@brief Definition of the QuestHint class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/QuestItem.cc

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file QuestItem.cc
31	31	@brief Implementation of the QuestItem class.
32	32	*/

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

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file QuestItem.h
31	31	@brief Definition of the QuestItem class.
32	32	The QuestItem is the parent class of Quest and QuestHint.

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

r2662	r2779
28	28
29	29	/**
30		@file
	30	@file QuestListener.cc
31	31	@brief Implementation of the QuestListener class.
32	32	*/

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

r2662	r2779
28	28
29	29	/**
30		@file
	30	@file QuestListener.h
31	31	@brief Definition of the QuestListener class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file QuestManager.cc
31	31	@brief Implementation of the QuestManager class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.h

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file QuestManager.h
31	31	@brief Definition of the QuestManager class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/Rewardable.cc

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file Rewardable.cc
31	31	@brief Implementation of the Rewardable class.
32	32	*/

code/branches/questsystem5/src/orxonox/objects/quest/Rewardable.h

r2710	r2779
28	28
29	29	/**
30		@file
	30	@file Rewardable.h
31	31	@brief Definition of the Rewardable class.
32	32	*/

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 2779 for code/branches/questsystem5/src/orxonox/objects

Legend:

Download in other formats: