Clean up old code from TeamMember

2 files changed, 0 insertions, 173 deletions

diff --git a/sigencore/TeamMember.cpp b/sigencore/TeamMember.cpp
index ef8538ba..57afecf2 100644
--- a/sigencore/TeamMember.cpp
+++ b/sigencore/TeamMember.cpp
@@ -403,133 +403,6 @@ bool Sigencore::TeamMember::hasNature(Sigscript::NatureWrapper* nature) const
     return m_natures.contains(nature);
 }
 
-bool Sigencore::TeamMember::canLearnMove(Sigscript::MoveWrapper* move) const
-{
-    for (int i = 0; i < m_species->moveCount(); ++i)
-    {
-        if (move->id() == m_species->move(i)->move()->id())
-            return true;
-    }
-    return false;
-}
-
-void Sigencore::TeamMember::evolveInto(Sigscript::SpeciesWrapper* newSpecies)
-{
-    emit(evolveStart());
-    int oldStats[Sigmod::ST_SpecialDefense - Sigmod::ST_HP + 1] = {};
-    int newStats[Sigmod::ST_SpecialDefense - Sigmod::ST_HP + 1] = {};
-    oldStats[Sigmod::ST_Attack] = statValue(Sigmod::ST_Attack);
-    oldStats[Sigmod::ST_Defense] = statValue(Sigmod::ST_Defense);
-    oldStats[Sigmod::ST_Speed] = statValue(Sigmod::ST_Speed);
-    if (sigmod()->rules()->specialSplit())
-    {
-        oldStats[Sigmod::ST_SpecialAttack] = statValue(Sigmod::ST_SpecialAttack);
-        oldStats[Sigmod::ST_SpecialDefense] = statValue(Sigmod::ST_SpecialDefense);
-    }
-    else
-        oldStats[Sigmod::ST_Special] = statValue(Sigmod::ST_Special);
-    setSpecies(newSpecies);
-    newStats[Sigmod::ST_Attack] = statValue(Sigmod::ST_Attack);
-    newStats[Sigmod::ST_Defense] = statValue(Sigmod::ST_Defense);
-    newStats[Sigmod::ST_Speed] = statValue(Sigmod::ST_Speed);
-    if (sigmod()->rules()->specialSplit())
-    {
-        newStats[Sigmod::ST_SpecialAttack] = statValue(Sigmod::ST_SpecialAttack);
-        newStats[Sigmod::ST_SpecialDefense] = statValue(Sigmod::ST_SpecialDefense);
-    }
-    else
-        newStats[Sigmod::ST_Special] = statValue(Sigmod::ST_Special);
-    if (oldStats[Sigmod::ST_Attack] != newStats[Sigmod::ST_Attack])
-        emit(statChanged(Sigmod::ST_Attack, newStats[Sigmod::ST_Attack]));
-    if (oldStats[Sigmod::ST_Defense] != newStats[Sigmod::ST_Defense])
-        emit(statChanged(Sigmod::ST_Defense, newStats[Sigmod::ST_Defense]));
-    if (oldStats[Sigmod::ST_Speed] != newStats[Sigmod::ST_Speed])
-        emit(statChanged(Sigmod::ST_Speed, newStats[Sigmod::ST_Speed]));
-    if (sigmod()->rules()->specialSplit())
-    {
-        if (oldStats[Sigmod::ST_SpecialAttack] != newStats[Sigmod::ST_SpecialAttack])
-            emit(statChanged(Sigmod::ST_SpecialAttack, newStats[Sigmod::ST_SpecialAttack]));
-        if (oldStats[Sigmod::ST_SpecialDefense] != newStats[Sigmod::ST_SpecialDefense])
-            emit(statChanged(Sigmod::ST_SpecialDefense, newStats[Sigmod::ST_SpecialDefense]));
-    }
-    else
-    {
-        if (oldStats[Sigmod::ST_Special] != newStats[Sigmod::ST_Special])
-            emit(statChanged(Sigmod::ST_Special, newStats[Sigmod::ST_Special]));
-    }
-    emit(evolveEnd());
-}
-
-void Sigencore::TeamMember::cureStatus(Sigscript::StatusWrapper* status)
-{
-    if (m_status.contains(status))
-    {
-        QList<Kross::Action*> actions = m_status.values(status);
-        qDeleteAll(actions);
-        m_status.remove(status);
-        emit(statusCured(status));
-    }
-}
-
-void Sigencore::TeamMember::giveStatus(Sigscript::StatusWrapper* status)
-{
-    if (!m_status.contains(status))
-    {
-        const Sigcore::Script script = status->worldScript();
-        if (!script.script().isEmpty())
-        {
-            Kross::Action* statusAction = new Kross::Action(Kross::Manager::self().actionCollection()->collection("status"), QUuid::createUuid().toString());
-            statusAction->setInterpreter(script.interpreter());
-            statusAction->setCode(script.script().toUtf8());
-            statusAction->addObject(this, "owner");
-            statusAction->trigger();
-            m_status.insert(status, statusAction);
-            emit(statusInflicted(status));
-        }
-    }
-}
-
-void Sigencore::TeamMember::takeItem(Sigscript::ItemWrapper* item)
-{
-    if (m_items.contains(item))
-    {
-        m_items.removeAt(m_items.indexOf(item));
-        emit(itemTaken(item));
-    }
-}
-
-void Sigencore::TeamMember::giveItem(Sigscript::ItemWrapper* item)
-{
-    if ((m_items.size() < sigmod()->rules()->maxHeldItems()) && checkWeight(item))
-    {
-        m_items.append(item);
-        emit(itemGiven(item));
-    }
-}
-
-void Sigencore::TeamMember::forgetMove(Sigscript::MoveWrapper* move)
-{
-    if (m_moves.contains(move))
-    {
-        m_moves.removeAll(move);
-        emit(moveForgotten(move));
-    }
-}
-
-void Sigencore::TeamMember::teachMove(Sigscript::MoveWrapper* move)
-{
-    if (canLearnMove(move))
-    {
-        if (m_moves.size() < sigmod()->rules()->maxMoves())
-        {
-            m_moves.append(move);
-            emit(moveLearned(move));
-        }
-        emit(movesFull(move));
-    }
-    emit(unlearnableMove(move));
-}
-
 void Sigencore::TeamMember::makeActive(Arena* arena)
 {
     // TODO
@@ -587,19 +460,6 @@ void Sigencore::TeamMember::exitArena()
     m_arena = NULL;
 }
 
-void Sigencore::TeamMember::writeBack()
-{
-    // TODO: write back all (applicable) differences between config and local storage
-}
-
-bool Sigencore::TeamMember::checkWeight(const Sigscript::ItemWrapper* item)
-{
-    int totalWeight = item->weight();
-    foreach (Sigscript::ItemWrapper* item, m_items)
-        totalWeight += item->weight();
-    return (totalWeight <= species()->maxHoldWeight());
-}
-
 void Sigencore::TeamMember::makeConnections()
 {
     // TODO: make connections that are necessary (watching Config changes mainly)
diff --git a/sigencore/TeamMember.h b/sigencore/TeamMember.h
index 1723ce93..8f7a9ee8 100644
--- a/sigencore/TeamMember.h
+++ b/sigencore/TeamMember.h
@@ -32,8 +32,6 @@
 #include <QtCore/QFuture>
 #include <QtCore/QList>
 #include <QtCore/QMap>
-#include <QtCore/QMultiMap>
-#include <QtCore/QObject>
 #include <QtCore/QPair>
 #include <QtCore/QString>
 #include <QtCore/QUuid>
@@ -108,7 +106,6 @@ class SIGENCORE_EXPORT TeamMember : public Sigscript::Config
         Q_SCRIPTABLE long long levelExperience() const;
         static long long calcLevelExperience(const Sigmod::Species::Style growth, const int level);
         
-        bool canLearnMove(Sigscript::MoveWrapper* move) const;
         Q_SCRIPTABLE int currentHp() const;
         Q_SCRIPTABLE int dv(const Sigmod::Stat stat) const;
         Q_SCRIPTABLE long long statExperience(const Sigmod::Stat stat) const;
@@ -127,15 +124,6 @@ class SIGENCORE_EXPORT TeamMember : public Sigscript::Config
         bool setLevelExperience(const long long levelExp);
         bool giveLevelExperience(const long long levelExp);
         
-        void evolveInto(Sigscript::SpeciesWrapper* newSpecies);
-        
-        void cureStatus(Sigscript::StatusWrapper* status);
-        void giveStatus(Sigscript::StatusWrapper* status);
-        void takeItem(Sigscript::ItemWrapper* item);
-        void giveItem(Sigscript::ItemWrapper* item);
-        void forgetMove(Sigscript::MoveWrapper* move);
-        void teachMove(Sigscript::MoveWrapper* move);
-        
         bool setCurrentHp(const int hp);
         bool changeCurrentHp(const int hp);
         
@@ -148,43 +136,25 @@ class SIGENCORE_EXPORT TeamMember : public Sigscript::Config
         bool addNature(Sigscript::NatureWrapper* nature);
         bool removeNature(Sigscript::NatureWrapper* nature);
         
-        virtual void writeBack();
         virtual void makeActive(Arena* arena);
         virtual void exitArena();
     signals:
-        
         void nameChanged(const QString& newName);
         void genderChanged(const Gender newGender);
         
-        void evolveStart();
-        void evolveEnd();
-        
-        void statusCured(Sigscript::StatusWrapper* status);
-        void statusInflicted(Sigscript::StatusWrapper* status);
-        
         void effortFull(const int stat);
         void totalEffortFull();
         void levelChanged(const int newLevel);
         void levelExperienceChanged(const int newExp);
         
-        void itemTaken(Sigscript::ItemWrapper* item);
-        void itemGiven(Sigscript::ItemWrapper* item);
-        
-        void moveForgotten(Sigscript::MoveWrapper* move);
-        void moveLearned(Sigscript::MoveWrapper* move);
-        void movesFull(Sigscript::MoveWrapper* move);
-        void unlearnableMove(Sigscript::MoveWrapper* move);
         void currentHpChanged(const int newHp);
         void dvChanged(const Sigmod::Stat stat, const int newDv);
         void statExperienceChanged(const Sigmod::Stat stat, const long long newStatExp);
         void statStageChanged(const Sigmod::Stat stat, const int newStage);
         void statValueChanged(const Sigmod::Stat stat, const int newValue);
         
-        void knockedOut();
         void natureAdded(Sigscript::NatureWrapper* nature);
         void natureRemoved(Sigscript::NatureWrapper* nature);
-    protected:
-        bool checkWeight(const Sigscript::ItemWrapper* item);
         
         Sigscript::SigmodWrapper* m_sigmod;
         Containment* m_containment;
@@ -202,11 +172,8 @@ class SIGENCORE_EXPORT TeamMember : public Sigscript::Config
         int m_dv[Sigmod::ST_SpecialDefense - Sigmod::ST_HP + 1];
         long long m_statExp[Sigmod::ST_SpecialDefense - Sigmod::ST_HP + 1];
         int m_stages[Sigmod::ST_Evasion - Sigmod::ST_Attack + 1];
-        QMultiMap<Sigscript::StatusWrapper*, Kross::Action*> m_status;
-        QMap<Sigscript::AbilityWrapper*, Kross::Action*> m_abilities;
         QList<Sigscript::ItemWrapper*> m_items;
         QList<Sigscript::MoveWrapper*> m_moves;
-        
         QList<Sigscript::NatureWrapper*> m_natures;
         
         QList<Kross::Action*> m_abilityBattleScripts;