[FIX] Moved Hat, Fraction, Matrix, and Script to sigcore

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

37 files changed, 84 insertions, 77 deletions

diff --git a/sigscript/AbilityWrapper.cpp b/sigscript/AbilityWrapper.cpp
index 19fb9734..a08a8e4e 100644
--- a/sigscript/AbilityWrapper.cpp
+++ b/sigscript/AbilityWrapper.cpp
@@ -52,17 +52,17 @@ QString Sigscript::AbilityWrapper::description() const
     return m_ability->description();
 }
 
-Sigmod::Script Sigscript::AbilityWrapper::battleScript() const
+Sigcore::Script Sigscript::AbilityWrapper::battleScript() const
 {
     return m_ability->battleScript();
 }
 
-Sigmod::Script Sigscript::AbilityWrapper::worldScript() const
+Sigcore::Script Sigscript::AbilityWrapper::worldScript() const
 {
     return m_ability->worldScript();
 }
 
-Sigmod::Script Sigscript::AbilityWrapper::priorityScript() const
+Sigcore::Script Sigscript::AbilityWrapper::priorityScript() const
 {
     return m_ability->priorityScript();
 }
diff --git a/sigscript/AbilityWrapper.h b/sigscript/AbilityWrapper.h
index 5304ac39..14993072 100644
--- a/sigscript/AbilityWrapper.h
+++ b/sigscript/AbilityWrapper.h
@@ -36,9 +36,9 @@ class SIGSCRIPT_EXPORT AbilityWrapper : public ObjectWrapper
         Q_SCRIPTABLE QString name() const;
         Q_SCRIPTABLE int priority() const;
         Q_SCRIPTABLE QString description() const;
-        Q_SCRIPTABLE Sigmod::Script battleScript() const;
-        Q_SCRIPTABLE Sigmod::Script worldScript() const;
-        Q_SCRIPTABLE Sigmod::Script priorityScript() const;
+        Q_SCRIPTABLE Sigcore::Script battleScript() const;
+        Q_SCRIPTABLE Sigcore::Script worldScript() const;
+        Q_SCRIPTABLE Sigcore::Script priorityScript() const;
     private:
         AbilityWrapper(const Sigmod::Ability* ability, SigmodWrapper* parent);
         AbilityWrapper& operator=(const AbilityWrapper& rhs);
diff --git a/sigscript/BadgeWrapper.cpp b/sigscript/BadgeWrapper.cpp
index 2c0b4116..ea3f27c4 100644
--- a/sigscript/BadgeWrapper.cpp
+++ b/sigscript/BadgeWrapper.cpp
@@ -55,7 +55,7 @@ int Sigscript::BadgeWrapper::obey() const
     return m_badge->obey();
 }
 
-Sigmod::Fraction Sigscript::BadgeWrapper::stat(const Sigmod::Stat stat) const
+Sigcore::Fraction Sigscript::BadgeWrapper::stat(const Sigmod::Stat stat) const
 {
     return m_badge->stat(stat);
 }
diff --git a/sigscript/BadgeWrapper.h b/sigscript/BadgeWrapper.h
index b05311c1..29535678 100644
--- a/sigscript/BadgeWrapper.h
+++ b/sigscript/BadgeWrapper.h
@@ -40,7 +40,7 @@ class SIGSCRIPT_EXPORT BadgeWrapper : public ObjectWrapper
         Q_SCRIPTABLE SpriteWrapper* face();
         Q_SCRIPTABLE SpriteWrapper* badge();
         Q_SCRIPTABLE int obey() const;
-        Q_SCRIPTABLE Sigmod::Fraction stat(const Sigmod::Stat stat) const;
+        Q_SCRIPTABLE Sigcore::Fraction stat(const Sigmod::Stat stat) const;
     private:
         BadgeWrapper(const Sigmod::Badge* badge, SigmodWrapper* parent);
         BadgeWrapper& operator=(const BadgeWrapper& rhs);
diff --git a/sigscript/CMakeLists.txt b/sigscript/CMakeLists.txt
index d7d33c01..bbfcd8b4 100644
--- a/sigscript/CMakeLists.txt
+++ b/sigscript/CMakeLists.txt
@@ -95,6 +95,7 @@ TARGET_LINK_LIBRARIES(sigscript
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}
     ${PHONON_LIBRARY}
+    sigcore
     sigmod
 )
 
diff --git a/sigscript/CoinListWrapper.cpp b/sigscript/CoinListWrapper.cpp
index 67221bdd..a7186c45 100644
--- a/sigscript/CoinListWrapper.cpp
+++ b/sigscript/CoinListWrapper.cpp
@@ -41,7 +41,7 @@ QString Sigscript::CoinListWrapper::name() const
     return m_coinList->name();
 }
 
-Sigmod::Script Sigscript::CoinListWrapper::script() const
+Sigcore::Script Sigscript::CoinListWrapper::script() const
 {
     return m_coinList->script();
 }
diff --git a/sigscript/CoinListWrapper.h b/sigscript/CoinListWrapper.h
index 05a7fad6..5274491f 100644
--- a/sigscript/CoinListWrapper.h
+++ b/sigscript/CoinListWrapper.h
@@ -38,7 +38,7 @@ class SIGSCRIPT_EXPORT CoinListWrapper : public ObjectWrapper
         static CoinListWrapper* create(const Sigmod::CoinList* coinList, SigmodWrapper* parent);
         
         Q_SCRIPTABLE QString name() const;
-        Q_SCRIPTABLE Sigmod::Script script() const;
+        Q_SCRIPTABLE Sigcore::Script script() const;
         
         Q_SCRIPTABLE CoinListObjectWrapper* object(const int index);
         Q_SCRIPTABLE int objectCount() const;
diff --git a/sigscript/GlobalScriptWrapper.cpp b/sigscript/GlobalScriptWrapper.cpp
index e7d773af..212baffa 100644
--- a/sigscript/GlobalScriptWrapper.cpp
+++ b/sigscript/GlobalScriptWrapper.cpp
@@ -40,7 +40,7 @@ QString Sigscript::GlobalScriptWrapper::name() const
     return m_globalScript->name();
 }
 
-Sigmod::Script Sigscript::GlobalScriptWrapper::script() const
+Sigcore::Script Sigscript::GlobalScriptWrapper::script() const
 {
     return m_globalScript->script();
 }
diff --git a/sigscript/GlobalScriptWrapper.h b/sigscript/GlobalScriptWrapper.h
index 881e44d9..29447750 100644
--- a/sigscript/GlobalScriptWrapper.h
+++ b/sigscript/GlobalScriptWrapper.h
@@ -34,7 +34,7 @@ class SIGSCRIPT_EXPORT GlobalScriptWrapper : public ObjectWrapper
         static GlobalScriptWrapper* create(const Sigmod::GlobalScript* globalScript, SigmodWrapper* parent);
         
         Q_SCRIPTABLE QString name() const;
-        Q_SCRIPTABLE Sigmod::Script script() const;
+        Q_SCRIPTABLE Sigcore::Script script() const;
     private:
         GlobalScriptWrapper(const Sigmod::GlobalScript* globalScript, SigmodWrapper* parent);
         GlobalScriptWrapper& operator=(const GlobalScriptWrapper& rhs);
diff --git a/sigscript/ItemWrapper.cpp b/sigscript/ItemWrapper.cpp
index 1768ccd8..1e341144 100644
--- a/sigscript/ItemWrapper.cpp
+++ b/sigscript/ItemWrapper.cpp
@@ -74,7 +74,7 @@ QString Sigscript::ItemWrapper::description() const
     return m_item->description();
 }
 
-Sigmod::Script Sigscript::ItemWrapper::script() const
+Sigcore::Script Sigscript::ItemWrapper::script() const
 {
     return m_item->script();
 }
diff --git a/sigscript/ItemWrapper.h b/sigscript/ItemWrapper.h
index 84b33af5..4d9e30f6 100644
--- a/sigscript/ItemWrapper.h
+++ b/sigscript/ItemWrapper.h
@@ -43,7 +43,7 @@ class SIGSCRIPT_EXPORT ItemWrapper : public ObjectWrapper
         Q_SCRIPTABLE int sellPrice() const;
         Q_SCRIPTABLE int weight() const;
         Q_SCRIPTABLE QString description() const;
-        Q_SCRIPTABLE Sigmod::Script script() const;
+        Q_SCRIPTABLE Sigcore::Script script() const;
     private:
         ItemWrapper(const Sigmod::Item* item, SigmodWrapper* parent);
         ItemWrapper& operator=(const ItemWrapper& rhs);
diff --git a/sigscript/MapEffectWrapper.cpp b/sigscript/MapEffectWrapper.cpp
index a8379407..0302c89d 100644
--- a/sigscript/MapEffectWrapper.cpp
+++ b/sigscript/MapEffectWrapper.cpp
@@ -60,7 +60,7 @@ bool Sigscript::MapEffectWrapper::isGhost() const
     return m_effect->isGhost();
 }
 
-Sigmod::Script Sigscript::MapEffectWrapper::script() const
+Sigcore::Script Sigscript::MapEffectWrapper::script() const
 {
     return m_effect->script();
 }
diff --git a/sigscript/MapEffectWrapper.h b/sigscript/MapEffectWrapper.h
index ae28385a..5199f87f 100644
--- a/sigscript/MapEffectWrapper.h
+++ b/sigscript/MapEffectWrapper.h
@@ -41,7 +41,7 @@ class SIGSCRIPT_EXPORT MapEffectWrapper : public ObjectWrapper
         Q_SCRIPTABLE QPoint coordinate() const;
         Q_SCRIPTABLE SkinWrapper* skin();
         Q_SCRIPTABLE bool isGhost() const;
-        Q_SCRIPTABLE Sigmod::Script script() const;
+        Q_SCRIPTABLE Sigcore::Script script() const;
     private:
         MapEffectWrapper(const Sigmod::MapEffect* effect, MapWrapper* parent);
         MapEffectWrapper& operator=(const MapEffectWrapper& rhs);
diff --git a/sigscript/MapTrainerWrapper.cpp b/sigscript/MapTrainerWrapper.cpp
index b7df74f2..c8b6e2f4 100644
--- a/sigscript/MapTrainerWrapper.cpp
+++ b/sigscript/MapTrainerWrapper.cpp
@@ -57,7 +57,7 @@ Sigscript::MapTrainerTeamMemberWrapper* Sigscript::MapTrainerWrapper::leadTeamMe
     return teamMember(m_trainer->leadTeamMember());
 }
 
-Sigmod::Script Sigscript::MapTrainerWrapper::script() const
+Sigcore::Script Sigscript::MapTrainerWrapper::script() const
 {
     return m_trainer->script();
 }
diff --git a/sigscript/MapTrainerWrapper.h b/sigscript/MapTrainerWrapper.h
index 892309cf..2e91422e 100644
--- a/sigscript/MapTrainerWrapper.h
+++ b/sigscript/MapTrainerWrapper.h
@@ -42,7 +42,7 @@ class SIGSCRIPT_EXPORT MapTrainerWrapper : public ObjectWrapper
         Q_SCRIPTABLE TrainerWrapper* trainerClass();
         Q_SCRIPTABLE int numberFight() const;
         Q_SCRIPTABLE MapTrainerTeamMemberWrapper* leadTeamMember();
-        Q_SCRIPTABLE Sigmod::Script script() const;
+        Q_SCRIPTABLE Sigcore::Script script() const;
         
         Q_SCRIPTABLE MapTrainerTeamMemberWrapper* teamMember(const int index);
         Q_SCRIPTABLE int teamMemberCount() const;
diff --git a/sigscript/MapWarpWrapper.cpp b/sigscript/MapWarpWrapper.cpp
index 63e3a53e..dfa581c6 100644
--- a/sigscript/MapWarpWrapper.cpp
+++ b/sigscript/MapWarpWrapper.cpp
@@ -71,7 +71,7 @@ Sigscript::MapWarpWrapper* Sigscript::MapWarpWrapper::toWarp()
     return sigmod()->map(m_warp->toMap())->warp(m_warp->toWarp());
 }
 
-Sigmod::Script Sigscript::MapWarpWrapper::script() const
+Sigcore::Script Sigscript::MapWarpWrapper::script() const
 {
     return m_warp->script();
 }
diff --git a/sigscript/MapWarpWrapper.h b/sigscript/MapWarpWrapper.h
index 6f6d2464..f1c3f9e9 100644
--- a/sigscript/MapWarpWrapper.h
+++ b/sigscript/MapWarpWrapper.h
@@ -42,7 +42,7 @@ class SIGSCRIPT_EXPORT MapWarpWrapper : public ObjectWrapper
         Q_SCRIPTABLE QPoint coordinate() const;
         Q_SCRIPTABLE Sigmod::MapWarp::Type type() const;
         Q_SCRIPTABLE MapWarpWrapper* toWarp();
-        Q_SCRIPTABLE Sigmod::Script script() const;
+        Q_SCRIPTABLE Sigcore::Script script() const;
     private:
         MapWarpWrapper(const Sigmod::MapWarp* warp, MapWrapper* parent);
         MapWarpWrapper& operator=(const MapWarpWrapper& rhs);
diff --git a/sigscript/MapWildListWrapper.cpp b/sigscript/MapWildListWrapper.cpp
index 29484d88..d49c8f2c 100644
--- a/sigscript/MapWildListWrapper.cpp
+++ b/sigscript/MapWildListWrapper.cpp
@@ -36,9 +36,9 @@ Sigscript::MapWildListWrapper::MapWildListWrapper(const Sigmod::MapWildList* wil
 {
 }
 
-Sigmod::Hat<Sigscript::MapWildListEncounterWrapper*> Sigscript::MapWildListWrapper::encounterHat()
+Sigcore::Hat<Sigscript::MapWildListEncounterWrapper*> Sigscript::MapWildListWrapper::encounterHat()
 {
-    Sigmod::Hat<MapWildListEncounterWrapper*> hat;
+    Sigcore::Hat<MapWildListEncounterWrapper*> hat;
     for (int i = 0; i < encounterCount(); ++i)
         hat.add(encounter(i), encounter(i)->weight());
     return hat;
diff --git a/sigscript/MapWildListWrapper.h b/sigscript/MapWildListWrapper.h
index a00e8e3c..b76cde82 100644
--- a/sigscript/MapWildListWrapper.h
+++ b/sigscript/MapWildListWrapper.h
@@ -21,8 +21,10 @@
 // Sigscript includes
 #include "ObjectWrapper.h"
 
+// Sigcore includes
+#include "../sigcore/Hat.h"
+
 // Sigmod includes
-#include "../sigmod/Hat.h"
 #include "../sigmod/MapWildList.h"
 
 namespace Sigscript
@@ -38,7 +40,7 @@ class SIGSCRIPT_EXPORT MapWildListWrapper : public ObjectWrapper
     public:
         static MapWildListWrapper* create(const Sigmod::MapWildList* wildList, MapWrapper* parent);
         
-        Sigmod::Hat<MapWildListEncounterWrapper*> encounterHat();
+        Sigcore::Hat<MapWildListEncounterWrapper*> encounterHat();
         
         Q_SCRIPTABLE QString name() const;
         
diff --git a/sigscript/MoveWrapper.cpp b/sigscript/MoveWrapper.cpp
index 1848fc33..8242e88f 100644
--- a/sigscript/MoveWrapper.cpp
+++ b/sigscript/MoveWrapper.cpp
@@ -40,10 +40,10 @@ QString Sigscript::MoveWrapper::name() const
     return m_move->name();
 }
 
-Sigmod::Fraction Sigscript::MoveWrapper::accuracy() const
+Sigcore::Fraction Sigscript::MoveWrapper::accuracy() const
 {
-    if (sigmod()->singlePlayer() && hasValueOfType<Sigmod::Fraction>("accuracy"))
-        return valueOfType<Sigmod::Fraction>("accuracy");
+    if (sigmod()->singlePlayer() && hasValueOfType<Sigcore::Fraction>("accuracy"))
+        return valueOfType<Sigcore::Fraction>("accuracy");
     return m_move->accuracy();
 }
 
@@ -81,17 +81,17 @@ QString Sigscript::MoveWrapper::description() const
     return m_move->description();
 }
 
-Sigmod::Script Sigscript::MoveWrapper::battleScript() const
+Sigcore::Script Sigscript::MoveWrapper::battleScript() const
 {
     return m_move->battleScript();
 }
 
-Sigmod::Script Sigscript::MoveWrapper::worldScript() const
+Sigcore::Script Sigscript::MoveWrapper::worldScript() const
 {
     return m_move->worldScript();
 }
 
-Sigmod::Script Sigscript::MoveWrapper::priorityScript() const
+Sigcore::Script Sigscript::MoveWrapper::priorityScript() const
 {
     return m_move->priorityScript();
 }
diff --git a/sigscript/MoveWrapper.h b/sigscript/MoveWrapper.h
index 521bd26b..8c961187 100644
--- a/sigscript/MoveWrapper.h
+++ b/sigscript/MoveWrapper.h
@@ -37,16 +37,16 @@ class SIGSCRIPT_EXPORT MoveWrapper : public ObjectWrapper
         static MoveWrapper* create(const Sigmod::Move* move, SigmodWrapper* parent);
         
         Q_SCRIPTABLE QString name() const;
-        Q_SCRIPTABLE Sigmod::Fraction accuracy() const;
+        Q_SCRIPTABLE Sigcore::Fraction accuracy() const;
         Q_SCRIPTABLE int power() const;
         Q_SCRIPTABLE TypeWrapper* type();
         Q_SCRIPTABLE bool special() const;
         Q_SCRIPTABLE int powerPoints() const;
         Q_SCRIPTABLE int priority() const;
         Q_SCRIPTABLE QString description() const;
-        Q_SCRIPTABLE Sigmod::Script battleScript() const;
-        Q_SCRIPTABLE Sigmod::Script worldScript() const;
-        Q_SCRIPTABLE Sigmod::Script priorityScript() const;
+        Q_SCRIPTABLE Sigcore::Script battleScript() const;
+        Q_SCRIPTABLE Sigcore::Script worldScript() const;
+        Q_SCRIPTABLE Sigcore::Script priorityScript() const;
     private:
         MoveWrapper(const Sigmod::Move* move, SigmodWrapper* parent);
         MoveWrapper& operator=(const MoveWrapper& rhs);
diff --git a/sigscript/NatureWrapper.cpp b/sigscript/NatureWrapper.cpp
index 5c6fe3b7..e6af8718 100644
--- a/sigscript/NatureWrapper.cpp
+++ b/sigscript/NatureWrapper.cpp
@@ -40,7 +40,7 @@ QString Sigscript::NatureWrapper::name() const
     return m_nature->name();
 }
 
-Sigmod::Fraction Sigscript::NatureWrapper::stat(const Sigmod::Stat stat) const
+Sigcore::Fraction Sigscript::NatureWrapper::stat(const Sigmod::Stat stat) const
 {
     return m_nature->stat(stat);
 }
diff --git a/sigscript/NatureWrapper.h b/sigscript/NatureWrapper.h
index 239d7159..5cac992d 100644
--- a/sigscript/NatureWrapper.h
+++ b/sigscript/NatureWrapper.h
@@ -34,7 +34,7 @@ class SIGSCRIPT_EXPORT NatureWrapper : public ObjectWrapper
         static NatureWrapper* create(const Sigmod::Nature* nature, SigmodWrapper* parent);
         
         Q_SCRIPTABLE QString name() const;
-        Q_SCRIPTABLE Sigmod::Fraction stat(const Sigmod::Stat stat) const;
+        Q_SCRIPTABLE Sigcore::Fraction stat(const Sigmod::Stat stat) const;
         Q_SCRIPTABLE int weight() const;
     private:
         NatureWrapper(const Sigmod::Nature* nature, SigmodWrapper* parent);
diff --git a/sigscript/SigmodWrapper.cpp b/sigscript/SigmodWrapper.cpp
index cb70ec64..88969686 100644
--- a/sigscript/SigmodWrapper.cpp
+++ b/sigscript/SigmodWrapper.cpp
@@ -50,9 +50,9 @@ Sigscript::SigmodWrapper::SigmodWrapper(const Sigmod::Sigmod* sigmod) :
 {
 }
 
-Sigmod::Hat<Sigscript::NatureWrapper*> Sigscript::SigmodWrapper::natureHat()
+Sigcore::Hat<Sigscript::NatureWrapper*> Sigscript::SigmodWrapper::natureHat()
 {
-    Sigmod::Hat<NatureWrapper*> hat;
+    Sigcore::Hat<NatureWrapper*> hat;
     for (int i = 0; i < m_sigmod->natureCount(); ++i)
     {
         NatureWrapper* nature = NatureWrapper::create(m_sigmod->nature(i), this);
@@ -234,7 +234,7 @@ Sigscript::MapWarpWrapper* Sigscript::SigmodWrapper::startWarp()
     return map(m_sigmod->startMap())->warp(m_sigmod->startWarp());
 }
 
-Sigmod::Fraction Sigscript::SigmodWrapper::effectiveness(const TypeWrapper* attacker, const TypeWrapper* defender) const
+Sigcore::Fraction Sigscript::SigmodWrapper::effectiveness(const TypeWrapper* attacker, const TypeWrapper* defender) const
 {
     return m_sigmod->typechart(m_sigmod->typeIndex(attacker->id()), m_sigmod->typeIndex(defender->id()));
 }
diff --git a/sigscript/SigmodWrapper.h b/sigscript/SigmodWrapper.h
index fa740a8a..04cb66be 100644
--- a/sigscript/SigmodWrapper.h
+++ b/sigscript/SigmodWrapper.h
@@ -21,8 +21,10 @@
 // Sigscript includes
 #include "ObjectWrapper.h"
 
+// Sigcore includes
+#include "../sigcore/Hat.h"
+
 // Sigmod includes
-#include "../sigmod/Hat.h"
 #include "../sigmod/Sigmod.h"
 
 namespace Sigscript
@@ -60,7 +62,7 @@ class SIGSCRIPT_EXPORT SigmodWrapper : public ObjectWrapper
     public:
         SigmodWrapper(const Sigmod::Sigmod* sigmod);
         
-        Sigmod::Hat<NatureWrapper*> natureHat();
+        Sigcore::Hat<NatureWrapper*> natureHat();
         
         AbilityWrapper* ability(const int id);
         AuthorWrapper* author(const int id);
@@ -93,7 +95,7 @@ class SIGSCRIPT_EXPORT SigmodWrapper : public ObjectWrapper
         Q_SCRIPTABLE QString description() const;
         Q_SCRIPTABLE bool singlePlayer() const;
         Q_SCRIPTABLE MapWarpWrapper* startWarp();
-        Q_SCRIPTABLE Sigmod::Fraction effectiveness(const TypeWrapper* attacker, const TypeWrapper* defender) const;
+        Q_SCRIPTABLE Sigcore::Fraction effectiveness(const TypeWrapper* attacker, const TypeWrapper* defender) const;
         Q_SCRIPTABLE RulesWrapper* rules();
         
         Q_SCRIPTABLE AbilityWrapper* ability(const QString& name);
diff --git a/sigscript/SkinWrapper.cpp b/sigscript/SkinWrapper.cpp
index f1761812..bcdd3351 100644
--- a/sigscript/SkinWrapper.cpp
+++ b/sigscript/SkinWrapper.cpp
@@ -40,7 +40,7 @@ QString Sigscript::SkinWrapper::name() const
     return m_skin->name();
 }
 
-Sigmod::Script Sigscript::SkinWrapper::script() const
+Sigcore::Script Sigscript::SkinWrapper::script() const
 {
     return m_skin->script();
 }
diff --git a/sigscript/SkinWrapper.h b/sigscript/SkinWrapper.h
index ca3b1315..8639db92 100644
--- a/sigscript/SkinWrapper.h
+++ b/sigscript/SkinWrapper.h
@@ -34,7 +34,7 @@ class SIGSCRIPT_EXPORT SkinWrapper : public ObjectWrapper
         static SkinWrapper* create(const Sigmod::Skin* skin, SigmodWrapper* parent);
         
         Q_SCRIPTABLE QString name() const;
-        Q_SCRIPTABLE Sigmod::Script script() const;
+        Q_SCRIPTABLE Sigcore::Script script() const;
     private:
         SkinWrapper(const Sigmod::Skin* skin, SigmodWrapper* parent);
         SkinWrapper& operator=(const SkinWrapper& rhs);
diff --git a/sigscript/SpeciesWrapper.cpp b/sigscript/SpeciesWrapper.cpp
index 200f1b52..9afda9b0 100644
--- a/sigscript/SpeciesWrapper.cpp
+++ b/sigscript/SpeciesWrapper.cpp
@@ -38,17 +38,17 @@ Sigscript::SpeciesWrapper::SpeciesWrapper(const Sigmod::Species* species, Sigmod
 {
 }
 
-Sigmod::Hat<Sigscript::AbilityWrapper*> Sigscript::SpeciesWrapper::abilityHat()
+Sigcore::Hat<Sigscript::AbilityWrapper*> Sigscript::SpeciesWrapper::abilityHat()
 {
-    Sigmod::Hat<AbilityWrapper*> hat;
+    Sigcore::Hat<AbilityWrapper*> hat;
     for (int i = 0; i < abilityCount(); ++i)
         hat.add(ability(i)->ability(), ability(i)->weight());
     return hat;
 }
 
-Sigmod::Hat<Sigscript::ItemWrapper*> Sigscript::SpeciesWrapper::itemHat()
+Sigcore::Hat<Sigscript::ItemWrapper*> Sigscript::SpeciesWrapper::itemHat()
 {
-    Sigmod::Hat<ItemWrapper*> hat;
+    Sigcore::Hat<ItemWrapper*> hat;
     for (int i = 0; i < itemCount(); ++i)
         hat.add(item(i)->item(), item(i)->weight());
     return hat;
@@ -106,24 +106,24 @@ int Sigscript::SpeciesWrapper::maxHoldWeight() const
     return m_species->maxHoldWeight();
 }
 
-Sigmod::Fraction Sigscript::SpeciesWrapper::runChance() const
+Sigcore::Fraction Sigscript::SpeciesWrapper::runChance() const
 {
-    if (sigmod()->singlePlayer() && hasValueOfType<Sigmod::Fraction>("runChance"))
-        return valueOfType<Sigmod::Fraction>("runChance");
+    if (sigmod()->singlePlayer() && hasValueOfType<Sigcore::Fraction>("runChance"))
+        return valueOfType<Sigcore::Fraction>("runChance");
     return m_species->runChance();
 }
 
-Sigmod::Fraction Sigscript::SpeciesWrapper::fleeChance() const
+Sigcore::Fraction Sigscript::SpeciesWrapper::fleeChance() const
 {
-    if (sigmod()->singlePlayer() && hasValueOfType<Sigmod::Fraction>("fleeChance"))
-        return valueOfType<Sigmod::Fraction>("fleeChance");
+    if (sigmod()->singlePlayer() && hasValueOfType<Sigcore::Fraction>("fleeChance"))
+        return valueOfType<Sigcore::Fraction>("fleeChance");
     return m_species->fleeChance();
 }
 
-Sigmod::Fraction Sigscript::SpeciesWrapper::itemChance() const
+Sigcore::Fraction Sigscript::SpeciesWrapper::itemChance() const
 {
-    if (sigmod()->singlePlayer() && hasValueOfType<Sigmod::Fraction>("itemChance"))
-        return valueOfType<Sigmod::Fraction>("itemChance");
+    if (sigmod()->singlePlayer() && hasValueOfType<Sigcore::Fraction>("itemChance"))
+        return valueOfType<Sigcore::Fraction>("itemChance");
     return m_species->itemChance();
 }
 
@@ -172,7 +172,7 @@ Sigscript::SkinWrapper* Sigscript::SpeciesWrapper::skin()
     return sigmod()->skin(m_species->skin());
 }
 
-Sigmod::Fraction Sigscript::SpeciesWrapper::genderFactor() const
+Sigcore::Fraction Sigscript::SpeciesWrapper::genderFactor() const
 {
     return m_species->genderFactor();
 }
@@ -207,7 +207,7 @@ QList<Sigscript::EggGroupWrapper*> Sigscript::SpeciesWrapper::eggGroups()
     return eggGroups;
 }
 
-Sigmod::Script Sigscript::SpeciesWrapper::evolution() const
+Sigcore::Script Sigscript::SpeciesWrapper::evolution() const
 {
     return m_species->evolution();
 }
diff --git a/sigscript/SpeciesWrapper.h b/sigscript/SpeciesWrapper.h
index 5a4209da..5fa446f5 100644
--- a/sigscript/SpeciesWrapper.h
+++ b/sigscript/SpeciesWrapper.h
@@ -21,8 +21,10 @@
 // Sigscript includes
 #include "ObjectWrapper.h"
 
+// Sigcore includes
+#include "../sigcore/Hat.h"
+
 // Sigmod includes
-#include "../sigmod/Hat.h"
 #include "../sigmod/Species.h"
 
 namespace Sigscript
@@ -45,8 +47,8 @@ class SIGSCRIPT_EXPORT SpeciesWrapper : public ObjectWrapper
     public:
         static SpeciesWrapper* create(const Sigmod::Species* species, SigmodWrapper* parent);
         
-        Sigmod::Hat<AbilityWrapper*> abilityHat();
-        Sigmod::Hat<ItemWrapper*> itemHat();
+        Sigcore::Hat<AbilityWrapper*> abilityHat();
+        Sigcore::Hat<ItemWrapper*> itemHat();
         
         Q_SCRIPTABLE Sigmod::Species::Style growth(const QString& name) const;
         
@@ -57,9 +59,9 @@ class SIGSCRIPT_EXPORT SpeciesWrapper : public ObjectWrapper
         Q_SCRIPTABLE int experienceValue() const;
         Q_SCRIPTABLE int catchValue() const;
         Q_SCRIPTABLE int maxHoldWeight() const;
-        Q_SCRIPTABLE Sigmod::Fraction runChance() const;
-        Q_SCRIPTABLE Sigmod::Fraction fleeChance() const;
-        Q_SCRIPTABLE Sigmod::Fraction itemChance() const;
+        Q_SCRIPTABLE Sigcore::Fraction runChance() const;
+        Q_SCRIPTABLE Sigcore::Fraction fleeChance() const;
+        Q_SCRIPTABLE Sigcore::Fraction itemChance() const;
         Q_SCRIPTABLE int encyclopediaNumber() const;
         Q_SCRIPTABLE int weight() const;
         Q_SCRIPTABLE int height() const;
@@ -69,12 +71,12 @@ class SIGSCRIPT_EXPORT SpeciesWrapper : public ObjectWrapper
         Q_SCRIPTABLE SpriteWrapper* frontFemaleSprite();
         Q_SCRIPTABLE SpriteWrapper* backFemaleSprite();
         Q_SCRIPTABLE SkinWrapper* skin();
-        Q_SCRIPTABLE Sigmod::Fraction genderFactor() const;
+        Q_SCRIPTABLE Sigcore::Fraction genderFactor() const;
         Q_SCRIPTABLE int eggSpecies() const;
         Q_SCRIPTABLE int eggSteps() const;
         Q_SCRIPTABLE QList<TypeWrapper*> types();
         Q_SCRIPTABLE QList<EggGroupWrapper*> eggGroups();
-        Q_SCRIPTABLE Sigmod::Script evolution() const;
+        Q_SCRIPTABLE Sigcore::Script evolution() const;
         
         Q_SCRIPTABLE SpeciesAbilityWrapper* ability(const int index);
         Q_SCRIPTABLE int abilityCount() const;
diff --git a/sigscript/StatusWrapper.cpp b/sigscript/StatusWrapper.cpp
index 274c3e2b..7625af77 100644
--- a/sigscript/StatusWrapper.cpp
+++ b/sigscript/StatusWrapper.cpp
@@ -40,12 +40,12 @@ QString Sigscript::StatusWrapper::name() const
     return m_status->name();
 }
 
-Sigmod::Script Sigscript::StatusWrapper::battleScript() const
+Sigcore::Script Sigscript::StatusWrapper::battleScript() const
 {
     return m_status->battleScript();
 }
 
-Sigmod::Script Sigscript::StatusWrapper::worldScript() const
+Sigcore::Script Sigscript::StatusWrapper::worldScript() const
 {
     return m_status->worldScript();
 }
diff --git a/sigscript/StatusWrapper.h b/sigscript/StatusWrapper.h
index 512e1a26..3a6857d5 100644
--- a/sigscript/StatusWrapper.h
+++ b/sigscript/StatusWrapper.h
@@ -34,8 +34,8 @@ class SIGSCRIPT_EXPORT StatusWrapper : public ObjectWrapper
         static StatusWrapper* create(const Sigmod::Status* status, SigmodWrapper* parent);
         
         Q_SCRIPTABLE QString name() const;
-        Q_SCRIPTABLE Sigmod::Script battleScript() const;
-        Q_SCRIPTABLE Sigmod::Script worldScript() const;
+        Q_SCRIPTABLE Sigcore::Script battleScript() const;
+        Q_SCRIPTABLE Sigcore::Script worldScript() const;
     private:
         StatusWrapper(const Sigmod::Status* status, SigmodWrapper* parent);
         StatusWrapper& operator=(const StatusWrapper& rhs);
diff --git a/sigscript/TileWrapper.cpp b/sigscript/TileWrapper.cpp
index 65265d9e..37c10601 100644
--- a/sigscript/TileWrapper.cpp
+++ b/sigscript/TileWrapper.cpp
@@ -59,7 +59,7 @@ bool Sigscript::TileWrapper::from(const Sigmod::Direction direction) const
     return m_tile->from(direction);
 }
 
-Sigmod::Script Sigscript::TileWrapper::script() const
+Sigcore::Script Sigscript::TileWrapper::script() const
 {
     return m_tile->script();
 }
diff --git a/sigscript/TileWrapper.h b/sigscript/TileWrapper.h
index 2cc500cc..26d03957 100644
--- a/sigscript/TileWrapper.h
+++ b/sigscript/TileWrapper.h
@@ -39,7 +39,7 @@ class SIGSCRIPT_EXPORT TileWrapper : public ObjectWrapper
         Q_SCRIPTABLE QString name() const;
         Q_SCRIPTABLE SpriteWrapper* sprite();
         Q_SCRIPTABLE bool from(const Sigmod::Direction direction) const;
-        Q_SCRIPTABLE Sigmod::Script script() const;
+        Q_SCRIPTABLE Sigcore::Script script() const;
     private:
         TileWrapper(const Sigmod::Tile* tile, SigmodWrapper* parent);
         TileWrapper& operator=(const TileWrapper& rhs);
diff --git a/sigscript/TypeWrapper.cpp b/sigscript/TypeWrapper.cpp
index 3597ce47..f2731cb5 100644
--- a/sigscript/TypeWrapper.cpp
+++ b/sigscript/TypeWrapper.cpp
@@ -40,7 +40,7 @@ QString Sigscript::TypeWrapper::TypeWrapper::name() const
     return m_type->name();
 }
 
-Sigmod::Fraction Sigscript::TypeWrapper::TypeWrapper::stab() const
+Sigcore::Fraction Sigscript::TypeWrapper::TypeWrapper::stab() const
 {
     return m_type->stab();
 }
diff --git a/sigscript/TypeWrapper.h b/sigscript/TypeWrapper.h
index 370eaa89..f95f9c56 100644
--- a/sigscript/TypeWrapper.h
+++ b/sigscript/TypeWrapper.h
@@ -34,7 +34,7 @@ class SIGSCRIPT_EXPORT TypeWrapper : public ObjectWrapper
         static TypeWrapper* create(const Sigmod::Type* type, SigmodWrapper* parent);
         
         Q_SCRIPTABLE QString name() const;
-        Q_SCRIPTABLE Sigmod::Fraction stab() const;
+        Q_SCRIPTABLE Sigcore::Fraction stab() const;
     private:
         TypeWrapper(const Sigmod::Type* type, SigmodWrapper* parent);
         TypeWrapper& operator=(const TypeWrapper& rhs);
diff --git a/sigscript/WeatherWrapper.cpp b/sigscript/WeatherWrapper.cpp
index 58bc2910..637437e8 100644
--- a/sigscript/WeatherWrapper.cpp
+++ b/sigscript/WeatherWrapper.cpp
@@ -40,7 +40,7 @@ QString Sigscript::WeatherWrapper::name() const
     return m_weather->name();
 }
 
-Sigmod::Script Sigscript::WeatherWrapper::script() const
+Sigcore::Script Sigscript::WeatherWrapper::script() const
 {
     return m_weather->script();
 }
diff --git a/sigscript/WeatherWrapper.h b/sigscript/WeatherWrapper.h
index 89a22126..40ac5b59 100644
--- a/sigscript/WeatherWrapper.h
+++ b/sigscript/WeatherWrapper.h
@@ -34,7 +34,7 @@ class SIGSCRIPT_EXPORT WeatherWrapper : public ObjectWrapper
         static WeatherWrapper* create(const Sigmod::Weather* weather, SigmodWrapper* parent);
         
         Q_SCRIPTABLE QString name() const;
-        Q_SCRIPTABLE Sigmod::Script script() const;
+        Q_SCRIPTABLE Sigcore::Script script() const;
     private:
         WeatherWrapper(const Sigmod::Weather* weather, SigmodWrapper* parent);
         WeatherWrapper& operator=(const WeatherWrapper& rhs);