Moved item initialization to completeData()

1 files changed, 15 insertions, 15 deletions

diff --git a/sigencore/TeamMember.cpp b/sigencore/TeamMember.cpp
index e218ab9e..4639bc09 100644
--- a/sigencore/TeamMember.cpp
+++ b/sigencore/TeamMember.cpp
@@ -701,7 +701,21 @@ void Sigencore::TeamMember::completeData()
     Sigcore::Hat<Sigscript::AbilityWrapper*> abilityHat = m_species->abilityHat();
     while ((m_abilities.size() < sigmod()->rules()->maxAbilities()) && abilityHat.count())
         addAbility(abilityHat.takeAndClear());
-    // TODO: Item choosing
+    Sigcore::Hat<Sigscript::ItemWrapper*> itemHat = m_species->itemHat();
+    int i = 0;
+    while ((i < m_sigmod->rules()->maxHeldItems()) && itemHat.count())
+    {
+        if (m_species->itemChance().poll())
+        {
+            Sigscript::ItemWrapper* item = itemHat.pick();
+            if (addItems(item, 1))
+                ++i;
+            else
+                itemHat.setCount(item, 0);
+        }
+        else
+            ++i;
+    }
     // TODO: Move choosing
     Sigcore::Hat<Sigscript::NatureWrapper*> natureHat = sigmod()->natureHat();
     while ((m_natures.size() < m_sigmod->rules()->maxNatures()) && natureHat.count())
@@ -719,17 +733,3 @@ void Sigencore::TeamMember::makeConnections()
     connect(this, SIGNAL(statExperienceChanged(Sigmod::Stat, long long)), SLOT(recalcStat(Sigmod::Stat)));
     connect(this, SIGNAL(statStageChanged(Sigmod::Stat, int)), SLOT(recalcStat(Sigmod::Stat)));
 }
-
-void Sigencore::TeamMember::initItems()
-{
-    Sigcore::Hat<Sigscript::ItemWrapper*> hat = m_species->itemHat();
-    for (int i = 0; i < sigmod()->rules()->maxHeldItems(); ++i)
-    {
-        if (m_species->itemChance().poll())
-        {
-            Sigscript::ItemWrapper* item = hat.pick();
-            if (checkWeight(item))
-                m_items.append(item);
-        }
-    }
-}