[FIX] List members of pokemod classes now can be returned in their entirety

[FIX] Reworked pokescripting for ease of use
[FIX] Now (selected) pokemod values can be overridden in pokescripting

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@237 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 11 insertions, 46 deletions

diff --git a/pokescripting/MapTrainerTeamMemberWrapper.h b/pokescripting/MapTrainerTeamMemberWrapper.h
index c0330469..cfc264f8 100644
--- a/pokescripting/MapTrainerTeamMemberWrapper.h
+++ b/pokescripting/MapTrainerTeamMemberWrapper.h
@@ -19,18 +19,20 @@
 #define __POKESCRIPTING_MAPTRAINERTEAMMEMBERWRAPPER__
 
 // Pokescripting includes
-#include "AbilityWrapper.h"
-#include "ItemWrapper.h"
-#include "MoveWrapper.h"
-#include "NatureWrapper.h"
 #include "ObjectWrapper.h"
-#include "SpeciesWrapper.h"
 
 // Pokemod includes
 #include "../pokemod/MapTrainerTeamMember.h"
 
 namespace Pokescripting
 {
+// Forward declarations
+class AbilityWrapper;
+class ItemWrapper;
+class MoveWrapper;
+class NatureWrapper;
+class SpeciesWrapper;
+
 class POKESCRIPTING_EXPORT MapTrainerTeamMemberWrapper : public ObjectWrapper
 {
     Q_OBJECT
@@ -45,53 +47,16 @@ class POKESCRIPTING_EXPORT MapTrainerTeamMemberWrapper : public ObjectWrapper
     public slots:
         SpeciesWrapper* species();
         int level() const;
-        bool ability(const int ability) const;
-        bool item(const int item) const;
-        bool move(const int move) const;
-        bool nature(const int nature) const;
+        QList<AbilityWrapper*> abilities();
+        QList<ItemWrapper*> items();
+        QList<MoveWrapper*> moves();
+        QList<NatureWrapper*> natures();
     private:
         MapTrainerTeamMemberWrapper(const Pokemod::MapTrainerTeamMember* teamMember, QObject* parent);
         MapTrainerTeamMemberWrapper& operator=(const MapTrainerTeamMemberWrapper& rhs);
         
         const Pokemod::MapTrainerTeamMember* m_teamMember;
 };
-
-inline MapTrainerTeamMemberWrapper::MapTrainerTeamMemberWrapper(const Pokemod::MapTrainerTeamMember* teamMember, QObject* parent) :
-        ObjectWrapper(teamMember, parent),
-        m_teamMember(teamMember)
-{
-}
-
-inline SpeciesWrapper* MapTrainerTeamMemberWrapper::species()
-{
-    return SpeciesWrapper::create(pokemod()->speciesById(m_teamMember->species()), this);
-}
-
-inline int MapTrainerTeamMemberWrapper::level() const
-{
-    return m_teamMember->level();
-}
-
-inline bool MapTrainerTeamMemberWrapper::ability(const int ability) const
-{
-    return m_teamMember->ability(ability);
-}
-
-inline bool MapTrainerTeamMemberWrapper::item(const int item) const
-{
-    return m_teamMember->item(item);
-}
-
-inline bool MapTrainerTeamMemberWrapper::move(const int move) const
-{
-    return m_teamMember->move(move);
-}
-
-inline bool MapTrainerTeamMemberWrapper::nature(const int nature) const
-{
-    return m_teamMember->nature(nature);
-}
-
 }
 
 #endif