Added sigmod to TeamMember and moved id up

2 files changed, 12 insertions, 7 deletions

diff --git a/sigencore/TeamMember.cpp b/sigencore/TeamMember.cpp
index 8d85a4c3..06f2ecb3 100644
--- a/sigencore/TeamMember.cpp
+++ b/sigencore/TeamMember.cpp
@@ -157,14 +157,19 @@ Sigencore::TeamMember::TeamMember(Sigscript::MapTrainerTeamMemberWrapper* teamMe
     m_currentHp = statValue(Sigmod::ST_HP);
 }
 
-Sigencore::Containment* Sigencore::TeamMember::containment() const
+QUuid Sigencore::TeamMember::id() const
 {
-    return m_containment;
+    return m_id;
 }
 
-QUuid Sigencore::TeamMember::id() const
+Sigscript::SigmodWrapper* Sigencore::TeamMember::sigmod() const
 {
-    return m_id;
+    return m_sigmod;
+}
+
+Sigencore::Containment* Sigencore::TeamMember::containment() const
+{
+    return m_containment;
 }
 
 QString Sigencore::TeamMember::name() const
diff --git a/sigencore/TeamMember.h b/sigencore/TeamMember.h
index a7b1adbf..f6d7c44e 100644
--- a/sigencore/TeamMember.h
+++ b/sigencore/TeamMember.h
@@ -92,6 +92,8 @@ class SIGENCORE_EXPORT TeamMember : public Sigscript::Config
         
         Q_SCRIPTABLE QUuid id() const;
         
+        Q_SCRIPTABLE Sigscript::SigmodWrapper* sigmod() const;
+        
         Containment* containment() const;
         
         QString name() const;
@@ -107,9 +109,6 @@ class SIGENCORE_EXPORT TeamMember : public Sigscript::Config
         long long calcExp(int level = -1) const;
         
         bool canLearnMove(Sigscript::MoveWrapper* move) const;
-        
-        
-        Sigscript::SigmodWrapper* sigmod() const;
     public slots:
         void boostLevels(const int levels);
         
@@ -162,6 +161,7 @@ class SIGENCORE_EXPORT TeamMember : public Sigscript::Config
     protected:
         bool checkWeight(const Sigscript::ItemWrapper* item);
         
+        Sigscript::SigmodWrapper* m_sigmod;
         Containment* m_containment;