Add disciplinePlus to Karma class.

diff --git a/Deeangband/Karma.cpp b/Deeangband/Karma.cpp
index b87d25f..b2d35b4 100644 (file)
--- a/Deeangband/Karma.cpp
+++ b/Deeangband/Karma.cpp
@@ -11,11 +11,13 @@
 
 Karma::Karma(ID id, Tag tag, GameWorld *gameWorld) : CreatureTemplate(id, tag, gameWorld)
 {
+       Karma();
        return;
 }
 
 Karma::Karma(void)
 {
+       this->desciplinePlus.SetPoint(0, 0, 0, 0, 0);
        return;
 }
 
@@ -23,3 +25,9 @@ Karma::~Karma(void)
 {
        return;
 }
+
+const Discipline* Karma::GetDiscipline(void)
+{
+       return &(this->desciplinePlus);
+}
+

diff --git a/Deeangband/Karma.h b/Deeangband/Karma.h
index 7e3679e..c43095d 100644 (file)
--- a/Deeangband/Karma.h
+++ b/Deeangband/Karma.h
@@ -17,41 +17,41 @@
  */
 enum KARMA_TYPE
 {
-       KARMA_IDEAL,       //!> \83J\83\8b\83}:\97\9d\91z
-       KARMA_PRAGMATIC,   //!> \83J\83\8b\83}:\8eÀ\97\98
-       KARMA_HARMONY,     //!> \83J\83\8b\83}:\92²\98a
-       KARMA_ALOOFNESS,   //!> \83J\83\8b\83}:\8cÇ\8d\82
-       KARMA_TEMPERATE,   //!> \83J\83\8b\83}:\90ß\90§
-       KARMA_INDULGENT,   //!> \83J\83\8b\83}:\96z\95ú
-       KARMA_CHASTE,      //!> \83J\83\8b\83}:\92å\90ß
-       KARMA_PASSION,     //!> \83J\83\8b\83}:\8fî\97~
-       KARMA_MERCY,       //!> \83J\83\8b\83}:\8e\9c\94ß
-       KARMA_CRUELTY,     //!> \83J\83\8b\83}:\97â\8d\93
-       KARMA_HONEST,      //!> \83J\83\8b\83}:\90½\8eÀ
-       KARMA_CLEVER,      //!> \83J\83\8b\83}:àÂàÏ
-       KARMA_FORGIVING,   //!> \83J\83\8b\83}:\8a°\91å
-       KARMA_AVENGE,      //!> \83J\83\8b\83}:\8e·\94O
-       KARMA_GENEROUS,    //!> \83J\83\8b\83}:\9c\97\92W
-       KARMA_GREED,       //!> \83J\83\8b\83}:æÃ\97~
-       KARMA_MODEST,      //!> \83J\83\8b\83}:\8cª\8b\95
-       KARMA_PROUD,       //!> \83J\83\8b\83}:\98ü\96\9d
-       KARMA_TRSUTING,    //!> \83J\83\8b\83}:\8f\83\96p
-       KARMA_SUSPICION,   //!> \83J\83\8b\83}:àÈ\8b^
-       KARMA_ZEALOTRY,    //!> \83J\83\8b\83}:\94M\90S
-       KARMA_SCEPTICISM,  //!> \83J\83\8b\83}:\89ù\8b^
-       KARMA_DELIGENT,    //!> \83J\83\8b\83}:\8bÎ\95×
-       KARMA_IDLENESS,    //!> \83J\83\8b\83}:\96³\88×
-       KARMA_CREATION,    //!> \83J\83\8b\83}:\91n\91¢
-       KARMA_DESTRUCTION, //!> \83J\83\8b\83}:\94j\89ó
-       KARMA_PLEASURE,    //!> \83J\83\8b\83}:\89õ\8ay
-       KARMA_PAIN,        //!> \83J\83\8b\83}:\8bê\92É
-       KARMA_WEALTH,      //!> \83J\83\8b\83}:\95x\97T
-       KARMA_PRESITIGE,   //!> \83J\83\8b\83}:\91¸\8cµ
-       KARMA_ERUDITION,   //!> \83J\83\8b\83}:\94\8e\8e¯
-       KARMA_BRAVE,       //!> \83J\83\8b\83}:\97E\96Ò
-       KARMA_DISCRETION,  //!> \83J\83\8b\83}:\8ev\97¶
-       KARMA_FORTUNE,     //!> \83J\83\8b\83}:\93V\89^
-       MAX_KARMAS,        //!> \83J\83\8b\83}\90\94
+       KARMA_IDEAL,       //!< \83J\83\8b\83}:\97\9d\91z
+       KARMA_PRAGMATIC,   //!< \83J\83\8b\83}:\8eÀ\97\98
+       KARMA_HARMONY,     //!< \83J\83\8b\83}:\92²\98a
+       KARMA_ALOOFNESS,   //!< \83J\83\8b\83}:\8cÇ\8d\82
+       KARMA_TEMPERATE,   //!< \83J\83\8b\83}:\90ß\90§
+       KARMA_INDULGENT,   //!< \83J\83\8b\83}:\96z\95ú
+       KARMA_CHASTE,      //!< \83J\83\8b\83}:\92å\90ß
+       KARMA_PASSION,     //!< \83J\83\8b\83}:\8fî\97~
+       KARMA_MERCY,       //!< \83J\83\8b\83}:\8e\9c\94ß
+       KARMA_CRUELTY,     //!< \83J\83\8b\83}:\97â\8d\93
+       KARMA_HONEST,      //!< \83J\83\8b\83}:\90½\8eÀ
+       KARMA_CLEVER,      //!< \83J\83\8b\83}:àÂàÏ
+       KARMA_FORGIVING,   //!< \83J\83\8b\83}:\8a°\91å
+       KARMA_AVENGE,      //!< \83J\83\8b\83}:\8e·\94O
+       KARMA_GENEROUS,    //!< \83J\83\8b\83}:\9c\97\92W
+       KARMA_GREED,       //!< \83J\83\8b\83}:æÃ\97~
+       KARMA_MODEST,      //!< \83J\83\8b\83}:\8cª\8b\95
+       KARMA_PROUD,       //!< \83J\83\8b\83}:\98ü\96\9d
+       KARMA_TRSUTING,    //!< \83J\83\8b\83}:\8f\83\96p
+       KARMA_SUSPICION,   //!< \83J\83\8b\83}:àÈ\8b^
+       KARMA_ZEALOTRY,    //!< \83J\83\8b\83}:\94M\90S
+       KARMA_SCEPTICISM,  //!< \83J\83\8b\83}:\89ù\8b^
+       KARMA_DELIGENT,    //!< \83J\83\8b\83}:\8bÎ\95×
+       KARMA_IDLENESS,    //!< \83J\83\8b\83}:\96³\88×
+       KARMA_CREATION,    //!< \83J\83\8b\83}:\91n\91¢
+       KARMA_DESTRUCTION, //!< \83J\83\8b\83}:\94j\89ó
+       KARMA_PLEASURE,    //!< \83J\83\8b\83}:\89õ\8ay
+       KARMA_PAIN,        //!< \83J\83\8b\83}:\8bê\92É
+       KARMA_WEALTH,      //!< \83J\83\8b\83}:\95x\97T
+       KARMA_PRESITIGE,   //!< \83J\83\8b\83}:\91¸\8cµ
+       KARMA_ERUDITION,   //!< \83J\83\8b\83}:\94\8e\8e¯
+       KARMA_BRAVE,       //!< \83J\83\8b\83}:\97E\96Ò
+       KARMA_DISCRETION,  //!< \83J\83\8b\83}:\8ev\97¶
+       KARMA_FORTUNE,     //!< \83J\83\8b\83}:\93V\89^
+       MAX_KARMAS,        //!< \83J\83\8b\83}\90\94
 };
 
 /*! 
@@ -61,6 +61,7 @@ enum KARMA_TYPE
 class Karma : public CreatureTemplate
 {
 private:
+       Discipline desciplinePlus; //!< \8fC\97{\92l\8fC\90³
 
 public:
 
@@ -72,8 +73,19 @@ public:
         */
        Karma::Karma(ID id, Tag tag, GameWorld *gameWorld);
 
+       /*! 
+        * @brief Karma\83N\83\89\83X\83R\83\93\83X\83g\83\89\83N\83^(\8f\89\8aú\92l\91ã\93ü)
+        */
        Karma::Karma(void);
 
+       /*! 
+        * @brief Karma\83N\83\89\83X\83f\83X\83g\83\89\83N\83^
+        */
        Karma::~Karma(void);
 
+       /*! 
+        * @brief \8fC\97{\92l\8fC\90³\82ð\95Ô\82·
+        * @return \8fC\97{\92l\82Ì\8eQ\8fÆ\83|\83C\83\93\83^
+        */
+       const Discipline* Karma::GetDiscipline(void);
 };