1 files changed, 50 insertions, 46 deletions

diff --git a/sigscript/SpeciesWrapper.cpp b/sigscript/SpeciesWrapper.cpp
index 08a435dc..fb0fd21b 100644
--- a/sigscript/SpeciesWrapper.cpp
+++ b/sigscript/SpeciesWrapper.cpp
@@ -22,7 +22,11 @@
 #include "GameWrapper.h"
 #include "SpeciesMoveWrapper.h"
 
-Sigscript::SpeciesWrapper* Sigscript::SpeciesWrapper::create(const Sigmod::Species* species, GameWrapper* parent)
+using namespace Sigcore;
+using namespace Sigmod;
+using namespace Sigscript;
+
+SpeciesWrapper* SpeciesWrapper::create(const Species* species, GameWrapper* parent)
 {
     Signature sig = Signature(parent, Subsignature(species->className(), species->id()));
     if (!m_instances.contains(sig))
@@ -30,164 +34,164 @@ Sigscript::SpeciesWrapper* Sigscript::SpeciesWrapper::create(const Sigmod::Speci
     return qobject_cast<SpeciesWrapper*>(m_instances[sig]);
 }
 
-Sigscript::SpeciesWrapper::SpeciesWrapper(const Sigmod::Species* species, GameWrapper* parent) :
+SpeciesWrapper::SpeciesWrapper(const Species* species, GameWrapper* parent) :
         ObjectWrapper(species, parent),
         m_species(species)
 {
 }
 
-Sigcore::Hat<Sigscript::AbilityWrapper*> Sigscript::SpeciesWrapper::abilityHat()
+Hat<AbilityWrapper*> SpeciesWrapper::abilityHat()
 {
     QMap<AbilityWrapper*, int> abilityMap = abilities();
     const QList<AbilityWrapper*> abilities = abilityMap.keys();
-    Sigcore::Hat<AbilityWrapper*> hat;
+    Hat<AbilityWrapper*> hat;
     foreach (AbilityWrapper* ability, abilities)
         hat.add(ability, abilityMap[ability]);
     return hat;
 }
 
-Sigcore::Hat<Sigscript::ItemWrapper*> Sigscript::SpeciesWrapper::itemHat()
+Hat<ItemWrapper*> SpeciesWrapper::itemHat()
 {
     QMap<ItemWrapper*, int> itemMap = items();
     const QList<ItemWrapper*> items = itemMap.keys();
-    Sigcore::Hat<ItemWrapper*> hat;
+    Hat<ItemWrapper*> hat;
     foreach (ItemWrapper* item, items)
         hat.add(item, itemMap[item]);
     return hat;
 }
 
-Sigmod::Species::Style Sigscript::SpeciesWrapper::growth(const QString& name) const
+Species::Style SpeciesWrapper::growth(const QString& name) const
 {
     if (name == "Fluctuating")
-        return Sigmod::Species::Fluctuating;
+        return Species::Fluctuating;
     else if (name == "Fading")
-        return Sigmod::Species::Fading;
+        return Species::Fading;
     else if (name == "Slow")
-        return Sigmod::Species::Slow;
+        return Species::Slow;
     else if (name == "Normal")
-        return Sigmod::Species::Normal;
+        return Species::Normal;
     else if (name == "Fast")
-        return Sigmod::Species::Fast;
+        return Species::Fast;
     else if (name == "Erratic")
-        return Sigmod::Species::Erratic;
-    return QVariant(-1).value<Sigmod::Species::Style>();
+        return Species::Erratic;
+    return QVariant(-1).value<Species::Style>();
 }
 
-QString Sigscript::SpeciesWrapper::name() const
+QString SpeciesWrapper::name() const
 {
     return m_species->name();
 }
 
-int Sigscript::SpeciesWrapper::baseStat(const Sigmod::Stat stat) const
+int SpeciesWrapper::baseStat(const Stat stat) const
 {
     return m_species->baseStat(stat);
 }
 
-int Sigscript::SpeciesWrapper::effortValue(const Sigmod::Stat stat) const
+int SpeciesWrapper::effortValue(const Stat stat) const
 {
     return m_species->effortValue(stat);
 }
 
-Sigmod::Species::Style Sigscript::SpeciesWrapper::growth() const
+Species::Style SpeciesWrapper::growth() const
 {
     return m_species->growth();
 }
 
-int Sigscript::SpeciesWrapper::experienceValue() const
+int SpeciesWrapper::experienceValue() const
 {
     return m_species->experienceValue();
 }
 
-int Sigscript::SpeciesWrapper::catchValue() const
+int SpeciesWrapper::catchValue() const
 {
     return m_species->catchValue();
 }
 
-int Sigscript::SpeciesWrapper::maxHoldWeight() const
+int SpeciesWrapper::maxHoldWeight() const
 {
     return m_species->maxHoldWeight();
 }
 
-Sigcore::Fraction Sigscript::SpeciesWrapper::runChance() const
+Fraction SpeciesWrapper::runChance() const
 {
-    ALLOW_OVERRIDE_SO(species, Sigcore::Fraction, runChance);
+    ALLOW_OVERRIDE_SO(species, Fraction, runChance);
     return m_species->runChance();
 }
 
-Sigcore::Fraction Sigscript::SpeciesWrapper::fleeChance() const
+Fraction SpeciesWrapper::fleeChance() const
 {
-    ALLOW_OVERRIDE_SO(species, Sigcore::Fraction, fleeChance);
+    ALLOW_OVERRIDE_SO(species, Fraction, fleeChance);
     return m_species->fleeChance();
 }
 
-Sigcore::Fraction Sigscript::SpeciesWrapper::itemChance() const
+Fraction SpeciesWrapper::itemChance() const
 {
-    ALLOW_OVERRIDE_SO(species, Sigcore::Fraction, itemChance);
+    ALLOW_OVERRIDE_SO(species, Fraction, itemChance);
     return m_species->itemChance();
 }
 
-int Sigscript::SpeciesWrapper::encyclopediaNumber() const
+int SpeciesWrapper::encyclopediaNumber() const
 {
     return m_species->encyclopediaNumber();
 }
 
-int Sigscript::SpeciesWrapper::weight() const
+int SpeciesWrapper::weight() const
 {
     return m_species->weight();
 }
 
-int Sigscript::SpeciesWrapper::height() const
+int SpeciesWrapper::height() const
 {
     return m_species->height();
 }
 
-QString Sigscript::SpeciesWrapper::encyclopediaEntry() const
+QString SpeciesWrapper::encyclopediaEntry() const
 {
     return m_species->encyclopediaEntry();
 }
 
-Sigscript::SpriteWrapper* Sigscript::SpeciesWrapper::frontMaleSprite()
+SpriteWrapper* SpeciesWrapper::frontMaleSprite()
 {
     return game()->sprite(m_species->frontMaleSprite());
 }
 
-Sigscript::SpriteWrapper* Sigscript::SpeciesWrapper::backMaleSprite()
+SpriteWrapper* SpeciesWrapper::backMaleSprite()
 {
     return game()->sprite(m_species->backMaleSprite());
 }
 
-Sigscript::SpriteWrapper* Sigscript::SpeciesWrapper::frontFemaleSprite()
+SpriteWrapper* SpeciesWrapper::frontFemaleSprite()
 {
     return game()->sprite(m_species->frontFemaleSprite());
 }
 
-Sigscript::SpriteWrapper* Sigscript::SpeciesWrapper::backFemaleSprite()
+SpriteWrapper* SpeciesWrapper::backFemaleSprite()
 {
     return game()->sprite(m_species->backFemaleSprite());
 }
 
-Sigscript::SkinWrapper* Sigscript::SpeciesWrapper::skin()
+SkinWrapper* SpeciesWrapper::skin()
 {
     return game()->skin(m_species->skin());
 }
 
-Sigcore::Fraction Sigscript::SpeciesWrapper::genderFactor() const
+Fraction SpeciesWrapper::genderFactor() const
 {
     return m_species->genderFactor();
 }
 
-int Sigscript::SpeciesWrapper::eggSpecies() const
+int SpeciesWrapper::eggSpecies() const
 {
     ALLOW_OVERRIDE_SO(species, int, eggSpecies);
     return m_species->eggSpecies();
 }
 
-int Sigscript::SpeciesWrapper::eggSteps() const
+int SpeciesWrapper::eggSteps() const
 {
     return m_species->eggSteps();
 }
 
-QList<Sigscript::TypeWrapper*> Sigscript::SpeciesWrapper::types()
+QList<TypeWrapper*> SpeciesWrapper::types()
 {
     QList<int> typeIds = m_species->type();
     QList<TypeWrapper*> types;
@@ -196,7 +200,7 @@ QList<Sigscript::TypeWrapper*> Sigscript::SpeciesWrapper::types()
     return types;
 }
 
-QList<Sigscript::EggGroupWrapper*> Sigscript::SpeciesWrapper::eggGroups()
+QList<EggGroupWrapper*> SpeciesWrapper::eggGroups()
 {
     QList<int> eggGroupIds = m_species->eggGroup();
     QList<EggGroupWrapper*> eggGroups;
@@ -205,12 +209,12 @@ QList<Sigscript::EggGroupWrapper*> Sigscript::SpeciesWrapper::eggGroups()
     return eggGroups;
 }
 
-Sigcore::Script Sigscript::SpeciesWrapper::evolution() const
+Script SpeciesWrapper::evolution() const
 {
     return m_species->evolution();
 }
 
-QMap<Sigscript::AbilityWrapper*, int> Sigscript::SpeciesWrapper::abilities()
+QMap<AbilityWrapper*, int> SpeciesWrapper::abilities()
 {
     const QMap<int, int>& abilityMap = m_species->ability();
     QList<int> abilityIds = abilityMap.keys();
@@ -220,7 +224,7 @@ QMap<Sigscript::AbilityWrapper*, int> Sigscript::SpeciesWrapper::abilities()
     return abilities;
 }
 
-QMap<Sigscript::ItemWrapper*, int> Sigscript::SpeciesWrapper::items()
+QMap<ItemWrapper*, int> SpeciesWrapper::items()
 {
     const QMap<int, int>& itemMap = m_species->item();
     QList<int> itemIds = itemMap.keys();
@@ -230,12 +234,12 @@ QMap<Sigscript::ItemWrapper*, int> Sigscript::SpeciesWrapper::items()
     return items;
 }
 
-Sigscript::SpeciesMoveWrapper* Sigscript::SpeciesWrapper::move(const int index)
+SpeciesMoveWrapper* SpeciesWrapper::move(const int index)
 {
     return SpeciesMoveWrapper::create(m_species->move(index), this);
 }
 
-int Sigscript::SpeciesWrapper::moveCount() const
+int SpeciesWrapper::moveCount() const
 {
     return m_species->moveCount();
 }