Updated code to support new MapTrainerTeamMember item representation

2 files changed, 6 insertions, 5 deletions

diff --git a/sigscript/MapTrainerTeamMemberWrapper.cpp b/sigscript/MapTrainerTeamMemberWrapper.cpp
index 6309c1d7..d7b97cc4 100644
--- a/sigscript/MapTrainerTeamMemberWrapper.cpp
+++ b/sigscript/MapTrainerTeamMemberWrapper.cpp
@@ -56,12 +56,13 @@ QList<Sigscript::AbilityWrapper*> Sigscript::MapTrainerTeamMemberWrapper::abilit
     return abilities;
 }
 
-QList<Sigscript::ItemWrapper*> Sigscript::MapTrainerTeamMemberWrapper::items()
+QMap<Sigscript::ItemWrapper*, int> Sigscript::MapTrainerTeamMemberWrapper::items()
 {
-    QList<int> itemIds = m_teamMember->item();
-    QList<ItemWrapper*> items;
+    const QMap<int, int>& itemMap = m_teamMember->item();
+    QList<int> itemIds = itemMap.keys();
+    QMap<ItemWrapper*, int> items;
     foreach (int id, itemIds)
-        items.append(sigmod()->item(id));
+        items[sigmod()->item(id)] = itemMap[id];
     return items;
 }
 
diff --git a/sigscript/MapTrainerTeamMemberWrapper.h b/sigscript/MapTrainerTeamMemberWrapper.h
index f39259d5..e7c33235 100644
--- a/sigscript/MapTrainerTeamMemberWrapper.h
+++ b/sigscript/MapTrainerTeamMemberWrapper.h
@@ -44,7 +44,7 @@ class SIGSCRIPT_EXPORT MapTrainerTeamMemberWrapper : public ObjectWrapper
         Q_SCRIPTABLE SpeciesWrapper* species();
         Q_SCRIPTABLE int level() const;
         Q_SCRIPTABLE QList<AbilityWrapper*> abilities();
-        Q_SCRIPTABLE QList<ItemWrapper*> items();
+        Q_SCRIPTABLE QMap<ItemWrapper*, int> items();
         Q_SCRIPTABLE QList<MoveWrapper*> moves();
         Q_SCRIPTABLE QList<NatureWrapper*> natures();
     private: