[FIX] Spelling mistake in sigscript classes

[FIX] Fixed a bug in the Growth enum in Species
[FIX] Arena functionality is getting there

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

49 files changed, 257 insertions, 122 deletions

diff --git a/Changelog b/Changelog
index 25282951..59709dfa 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,13 @@
 -----------------
+Rev:  252
+Date: 6 September 2008
+User: MathStuf
+-----------------
+[FIX] Spelling mistake in sigscript classes
+[FIX] Fixed a bug in the Growth enum in Species
+[FIX] Arena functionality is getting there
+
+-----------------
 Rev:  251
 Date: 6 September 2008
 User: MathStuf
diff --git a/sigbattle/ATBArena.cpp b/sigbattle/ATBArena.cpp
index 75c5c697..693ac4f3 100644
--- a/sigbattle/ATBArena.cpp
+++ b/sigbattle/ATBArena.cpp
@@ -24,8 +24,8 @@
 // Qt includes
 #include <QtCore/QTimer>
 
-Sigbattle::ATBArena::ATBArena(QList<Player*> players, QObject* parent) :
-        Arena(players, parent)
+Sigbattle::ATBArena::ATBArena(QList<Player*> players, const bool isWild, QObject* parent) :
+        Arena(players, isWild, parent)
 {
     setupBattle();
 }
diff --git a/sigbattle/ATBArena.h b/sigbattle/ATBArena.h
index 5fccf2ec..0736ea14 100644
--- a/sigbattle/ATBArena.h
+++ b/sigbattle/ATBArena.h
@@ -32,7 +32,7 @@ class SIGBATTLE_EXPORT ATBArena : public Arena
     Q_OBJECT
     
     public:
-        ATBArena(QList<Player*> players, QObject* parent);
+        ATBArena(QList<Player*> players, const bool isWild, QObject* parent);
         
         void handleAction(TeamMember* teamMember, TeamMember::Action action);
     signals:
diff --git a/sigbattle/Arena.cpp b/sigbattle/Arena.cpp
index d6a819a1..293619d0 100644
--- a/sigbattle/Arena.cpp
+++ b/sigbattle/Arena.cpp
@@ -21,11 +21,19 @@
 // Sigbattle includes
 #include "Player.h"
 
+// Sigscript includes
+#include "../sigscript/ItemWrapper.h"
+#include "../sigscript/MoveWrapper.h"
+#include "../sigscript/SigmodWrapper.h"
+#include "../sigscript/SpeciesWrapper.h"
+
 // Sigmod includes
+// #include "../sigmod/Fraction.h"
 #include "../sigmod/Script.h"
 
 // Qt includes
 #include <QtCore/QtConcurrentRun>
+#include <QtCore/QUuid>
 
 // KDE includes
 #include <kross/core/action.h>
@@ -42,8 +50,9 @@ Sigbattle::TeamMember::Action Sigbattle::decision(TeamMember* teamMember)
     return teamMember->requestAction();
 }
 
-Sigbattle::Arena::Arena(QList<Player*> players, QObject* parent) :
+Sigbattle::Arena::Arena(QList<Player*> players, const bool isWild, QObject* parent) :
         Sigscript::Config(parent),
+                          m_isWild(isWild),
         m_players(players),
         m_id(QUuid::createUuid())
 {
@@ -74,9 +83,14 @@ int Sigbattle::Arena::numActiveTeams() const
     return active;
 }
 
-void Sigbattle::Arena::registerScript(const QString& name, const Sigmod::Script& script)
+Sigscript::SigmodWrapper* Sigbattle::Arena::sigmod() const
+{
+    // TODO: return sigmod
+}
+
+void Sigbattle::Arena::registerScript(const Sigmod::Script& script)
 {
-    Kross::Action* action = new Kross::Action(m_actions, name);
+    Kross::Action* action = new Kross::Action(m_actions, QUuid::createUuid().toString());
     action->setInterpreter(script.interpreter());
     action->setCode(script.script().toUtf8());
     action->addObject(this, "arena");
@@ -85,25 +99,84 @@ void Sigbattle::Arena::registerScript(const QString& name, const Sigmod::Script&
 
 void Sigbattle::Arena::cleanUp()
 {
-    // TODO: clean up everything
+    QList<Kross::Action*> actions = m_actions->actions();
+    foreach (Kross::Action* action, actions)
+        m_actions->removeAction(action);
 }
 
 void Sigbattle::Arena::handleAction(TeamMember* teamMember, TeamMember::Action action)
 {
+    TeamMember::ActionData data = action.second;
     switch (action.first)
     {
         case TeamMember::Attack:
-            // TODO: Start move script
+        {
+            Sigscript::MoveWrapper* move = sigmod()->move(data.first.toInt());
+            if (move)
+            {
+                Sigmod::Script script = move->battleScript();
+                Kross::Action* kaction = new Kross::Action(m_actions, QUuid::createUuid().toString());
+                kaction->setInterpreter(script.interpreter());
+                kaction->setCode(script.script().toUtf8());
+                kaction->addObject(this, "arena");
+                kaction->addObject(teamMember, "user");
+                for (int i = 0; i < data.second.size(); ++i)
+                    kaction->addObject(findMember(data.second[i]), QString("target%1").arg(i));
+                kaction->trigger();
+            }
             break;
+        }
         case TeamMember::Item:
-            // TODO: Start item script
+        {
+            Sigscript::ItemWrapper* item = sigmod()->item(data.first.toInt());
+            if (item)
+            {
+                Sigmod::Script script = item->script();
+                Kross::Action* kaction = new Kross::Action(m_actions, QUuid::createUuid().toString());
+                kaction->setInterpreter(script.interpreter());
+                kaction->setCode(script.script().toUtf8());
+                kaction->addObject(this, "arena");
+                kaction->addObject(findMember(data.second[0]), "target");
+                kaction->trigger();
+            }
             break;
+        }
         case TeamMember::Switch:
-            // TODO: Switch with the other member
+        {
+            Player* player = qobject_cast<Player*>(teamMember->containment());
+            if (player)
+                player->switchOut(teamMember, player->findMember(data.second[0]));
             break;
+        }
         case TeamMember::Run:
-            // TODO: Run if possible, skip if fail
+        {
+            if (!m_isWild)
+                break;
+            Player* self = qobject_cast<Player*>(teamMember->containment());
+            const int numFlee = self->active().size();
+            bool canRun = true;
+            foreach (Player* player, m_players)
+            {
+                if (self == player)
+                    continue;
+                foreach (TeamMember* active, player->active())
+                {
+                    for (int i = 0; (i < numFlee) && canRun; ++i)
+                    {
+                        if (!active->species()->fleeChance().poll())
+                        {
+                            canRun = false;
+                            break;
+                        }
+                    }
+                }
+                if (!canRun)
+                    break;
+            }
+            if (canRun)
+                self->exitArena();
             break;
+        }
         case TeamMember::Skip:
         case TeamMember::Timeout:
         case TeamMember::Invalid:
@@ -113,5 +186,17 @@ void Sigbattle::Arena::handleAction(TeamMember* teamMember, TeamMember::Action a
 
 void Sigbattle::Arena::setupBattle()
 {
-    // TODO: setup all the battle stuff
+    foreach (Player* player, m_players)
+        player->enterArena(this);
+}
+
+Sigbattle::TeamMember* Sigbattle::Arena::findMember(const QUuid& id)
+{
+    foreach (Player* player, m_players)
+    {
+        TeamMember* member = player->findMember(id);
+        if (member)
+            return member;
+    }
+    return NULL;
 }
diff --git a/sigbattle/Arena.h b/sigbattle/Arena.h
index b3c53c47..aac9c8ee 100644
--- a/sigbattle/Arena.h
+++ b/sigbattle/Arena.h
@@ -40,6 +40,10 @@ namespace Sigmod
 {
 class Script;
 }
+namespace Sigscript
+{
+class SigmodWrapper;
+}
 
 namespace Sigbattle
 {
@@ -50,18 +54,18 @@ class SIGBATTLE_EXPORT Arena : public Sigscript::Config
     Q_OBJECT
     
     public:
-        Arena(QList<Player*> players, QObject* parent);
+        Arena(QList<Player*> players, const bool isWild, QObject* parent);
         ~Arena();
         
         QList<TeamMember*> active() const;
         int numActiveTeams() const;
         
-        Kross::Action* script(const QString& name);
+        Sigscript::SigmodWrapper* sigmod() const;
     signals:
         void battleStart();
         void battleEnd();
     public slots:
-        void registerScript(const QString& name, const Sigmod::Script& script);
+        void registerScript(const Sigmod::Script& script);
     protected slots:
         void cleanUp();
     protected:
@@ -69,6 +73,10 @@ class SIGBATTLE_EXPORT Arena : public Sigscript::Config
         
         virtual void setupBattle();
         
+        TeamMember* findMember(const QUuid& id);
+        
+        const bool m_isWild;
+        Sigscript::SigmodWrapper* m_sigmod;
         QList<Player*> m_players;
         Kross::ActionCollection* m_actions;
     private:
diff --git a/sigbattle/Containment.cpp b/sigbattle/Containment.cpp
index efe59712..f9f64d11 100644
--- a/sigbattle/Containment.cpp
+++ b/sigbattle/Containment.cpp
@@ -18,6 +18,9 @@
 // Header include
 #include "Containment.h"
 
+// Sigbattle includes
+#include "TeamMember.h"
+
 Sigbattle::Containment::Containment(QObject* parent) :
         QObject(parent)
 {
@@ -28,6 +31,16 @@ QList<Sigbattle::TeamMember*> Sigbattle::Containment::members() const
     return m_members;
 }
 
+Sigbattle::TeamMember* Sigbattle::Containment::findMember(const QUuid& id) const
+{
+    foreach (TeamMember* member, m_members)
+    {
+        if (member->id() == id)
+            return member;
+    }
+    return NULL;
+}
+
 Sigscript::SigmodWrapper* Sigbattle::Containment::sigmod() const
 {
     // TODO: return SigmodWrapper
diff --git a/sigbattle/Containment.h b/sigbattle/Containment.h
index 52fbfbf2..4c683049 100644
--- a/sigbattle/Containment.h
+++ b/sigbattle/Containment.h
@@ -24,6 +24,7 @@
 // Qt includes
 #include <QtCore/QMetaType>
 #include <QtCore/QObject>
+#include <QtCore/QUuid>
 
 // Forward declarations
 namespace Sigscript
@@ -46,6 +47,8 @@ class SIGBATTLE_EXPORT Containment : public QObject
         
         virtual bool isMutable() const = 0;
         
+        TeamMember* findMember(const QUuid& id) const;
+        
         Sigscript::SigmodWrapper* sigmod() const;
     signals:
     public slots:
diff --git a/sigbattle/Player.cpp b/sigbattle/Player.cpp
index 48ca5b24..b759e6d1 100644
--- a/sigbattle/Player.cpp
+++ b/sigbattle/Player.cpp
@@ -30,6 +30,7 @@ Sigbattle::Player::Player(QObject* parent) :
 
 void Sigbattle::Player::enterArena(Arena* arena)
 {
+    m_arena = arena;
     QList<TeamMember*> activeMembers = active();
     foreach (TeamMember* member, activeMembers)
         member->makeActive(arena);
@@ -47,9 +48,16 @@ QList<Sigbattle::TeamMember*> Sigbattle::Player::active()
     return activeMembers;
 }
 
+void Sigbattle::Player::switchOut(TeamMember* oldActive, TeamMember* newActive)
+{
+    oldActive->makeActive(m_arena);
+    // TODO: Update active table
+}
+
 void Sigbattle::Player::exitArena()
 {
     QList<TeamMember*> activeMembers = active();
     foreach (TeamMember* member, activeMembers)
         member->leaveArena();
+    m_arena = NULL;
 }
diff --git a/sigbattle/Player.h b/sigbattle/Player.h
index 50f2842b..f46ea2ed 100644
--- a/sigbattle/Player.h
+++ b/sigbattle/Player.h
@@ -46,6 +46,8 @@ class SIGBATTLE_EXPORT Player : public Team
         void enterArena(Arena* arena);
         
         QList<TeamMember*> active();
+        
+        void switchOut(TeamMember* oldActive, TeamMember* newActive);
     signals:
     public slots:
         void exitArena();
diff --git a/sigbattle/TeamMember.cpp b/sigbattle/TeamMember.cpp
index ef26edca..2669dd6c 100644
--- a/sigbattle/TeamMember.cpp
+++ b/sigbattle/TeamMember.cpp
@@ -143,6 +143,11 @@ Sigbattle::TeamMember::TeamMember(Sigscript::MapTrainerTeamMemberWrapper* teamMe
     m_currentHp = statValue(Sigmod::ST_HP);
 }
 
+Sigbattle::Containment* Sigbattle::TeamMember::containment() const
+{
+    return m_containment;
+}
+
 QUuid Sigbattle::TeamMember::id() const
 {
     return m_id;
diff --git a/sigbattle/TeamMember.h b/sigbattle/TeamMember.h
index b6455cbb..fdb172e9 100644
--- a/sigbattle/TeamMember.h
+++ b/sigbattle/TeamMember.h
@@ -90,6 +90,8 @@ class SIGBATTLE_EXPORT TeamMember : public Sigscript::Config
         TeamMember(const int speciesId, const QString& name, const int level, Containment* containment, const bool suppressItems = false);
         TeamMember(Sigscript::MapTrainerTeamMemberWrapper* teamMember, Containment* containment);
         
+        Containment* containment() const;
+        
         QUuid id() const;
         
         QString name() const;
diff --git a/sigbattle/TurnArena.cpp b/sigbattle/TurnArena.cpp
index a42af480..3d65f881 100644
--- a/sigbattle/TurnArena.cpp
+++ b/sigbattle/TurnArena.cpp
@@ -47,8 +47,8 @@ bool Sigbattle::sortActions(const TeamMember::RequestedAction& reqAction1, const
     return false;
 }
 
-Sigbattle::TurnArena::TurnArena(QList<Player*> players, QObject* parent) :
-        Arena(players, parent),
+Sigbattle::TurnArena::TurnArena(QList<Player*> players, const bool isWild, QObject* parent) :
+        Arena(players, isWild, parent),
         m_watcher(new QFutureWatcher<TeamMember::RequestedAction>(this)),
         m_timer(new QTimer(this))
 {
diff --git a/sigbattle/TurnArena.h b/sigbattle/TurnArena.h
index 2a3b2864..2c81931d 100644
--- a/sigbattle/TurnArena.h
+++ b/sigbattle/TurnArena.h
@@ -35,7 +35,7 @@ class SIGBATTLE_EXPORT TurnArena : public Arena
     Q_OBJECT
     
     public:
-        TurnArena(QList<Player*> players, QObject* parent);
+        TurnArena(QList<Player*> players, const bool isWild, QObject* parent);
     signals:
         void roundAboutToStart();
         void roundStart();
diff --git a/sigmod/Species.h b/sigmod/Species.h
index 8bf59bb4..7ea1bf1b 100644
--- a/sigmod/Species.h
+++ b/sigmod/Species.h
@@ -46,8 +46,8 @@ class SIGMOD_EXPORT Species : public Object
             Fading = 1,
             Slow = 2,
             Normal = 3,
-            Fast = 5,
-            Erratic = 6
+            Fast = 4,
+            Erratic = 5
         };
         static const QStringList StyleStr;
         
diff --git a/sigscript/AbilityWrapper.cpp b/sigscript/AbilityWrapper.cpp
index 5eb25bb9..e5b22529 100644
--- a/sigscript/AbilityWrapper.cpp
+++ b/sigscript/AbilityWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::AbilityWrapper* Sigscript::AbilityWrapper::create(const Sigmod::Ability* ability, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, ability->id())))
-        m_instances[Signiture(parent, ability->id())] = new AbilityWrapper(ability, parent);
-    return qobject_cast<AbilityWrapper*>(m_instances[Signiture(parent, ability->id())]);
+    if (!m_instances.contains(Signature(parent, ability->id())))
+        m_instances[Signature(parent, ability->id())] = new AbilityWrapper(ability, parent);
+    return qobject_cast<AbilityWrapper*>(m_instances[Signature(parent, ability->id())]);
 }
 
 Sigscript::AbilityWrapper::AbilityWrapper(const Sigmod::Ability* ability, SigmodWrapper* parent) :
diff --git a/sigscript/AuthorWrapper.cpp b/sigscript/AuthorWrapper.cpp
index 9398b1b8..1715ca90 100644
--- a/sigscript/AuthorWrapper.cpp
+++ b/sigscript/AuthorWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::AuthorWrapper* Sigscript::AuthorWrapper::create(const Sigmod::Author* author, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, author->id())))
-        m_instances[Signiture(parent, author->id())] = new AuthorWrapper(author, parent);
-    return qobject_cast<AuthorWrapper*>(m_instances[Signiture(parent, author->id())]);
+    if (!m_instances.contains(Signature(parent, author->id())))
+        m_instances[Signature(parent, author->id())] = new AuthorWrapper(author, parent);
+    return qobject_cast<AuthorWrapper*>(m_instances[Signature(parent, author->id())]);
 }
 
 Sigscript::AuthorWrapper::AuthorWrapper(const Sigmod::Author* author, SigmodWrapper* parent) :
diff --git a/sigscript/BadgeWrapper.cpp b/sigscript/BadgeWrapper.cpp
index d5444a31..abb16d6c 100644
--- a/sigscript/BadgeWrapper.cpp
+++ b/sigscript/BadgeWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::BadgeWrapper* Sigscript::BadgeWrapper::create(const Sigmod::Badge* badge, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, badge->id())))
-        m_instances[Signiture(parent, badge->id())] = new BadgeWrapper(badge, parent);
-    return qobject_cast<BadgeWrapper*>(m_instances[Signiture(parent, badge->id())]);
+    if (!m_instances.contains(Signature(parent, badge->id())))
+        m_instances[Signature(parent, badge->id())] = new BadgeWrapper(badge, parent);
+    return qobject_cast<BadgeWrapper*>(m_instances[Signature(parent, badge->id())]);
 }
 
 Sigscript::BadgeWrapper::BadgeWrapper(const Sigmod::Badge* badge, SigmodWrapper* parent) :
diff --git a/sigscript/CoinListObjectWrapper.cpp b/sigscript/CoinListObjectWrapper.cpp
index a445fe09..b0b0f0c6 100644
--- a/sigscript/CoinListObjectWrapper.cpp
+++ b/sigscript/CoinListObjectWrapper.cpp
@@ -24,9 +24,9 @@
 
 Sigscript::CoinListObjectWrapper* Sigscript::CoinListObjectWrapper::create(const Sigmod::CoinListObject* object, CoinListWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, object->id())))
-        m_instances[Signiture(parent, object->id())] = new CoinListObjectWrapper(object, parent);
-    return qobject_cast<CoinListObjectWrapper*>(m_instances[Signiture(parent, object->id())]);
+    if (!m_instances.contains(Signature(parent, object->id())))
+        m_instances[Signature(parent, object->id())] = new CoinListObjectWrapper(object, parent);
+    return qobject_cast<CoinListObjectWrapper*>(m_instances[Signature(parent, object->id())]);
 }
 
 Sigscript::CoinListObjectWrapper::CoinListObjectWrapper(const Sigmod::CoinListObject* object, CoinListWrapper* parent) :
diff --git a/sigscript/CoinListWrapper.cpp b/sigscript/CoinListWrapper.cpp
index a15c25a3..623476d4 100644
--- a/sigscript/CoinListWrapper.cpp
+++ b/sigscript/CoinListWrapper.cpp
@@ -24,9 +24,9 @@
 
 Sigscript::CoinListWrapper* Sigscript::CoinListWrapper::create(const Sigmod::CoinList* coinList, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, coinList->id())))
-        m_instances[Signiture(parent, coinList->id())] = new CoinListWrapper(coinList, parent);
-    return qobject_cast<CoinListWrapper*>(m_instances[Signiture(parent, coinList->id())]);
+    if (!m_instances.contains(Signature(parent, coinList->id())))
+        m_instances[Signature(parent, coinList->id())] = new CoinListWrapper(coinList, parent);
+    return qobject_cast<CoinListWrapper*>(m_instances[Signature(parent, coinList->id())]);
 }
 
 Sigscript::CoinListWrapper::CoinListWrapper(const Sigmod::CoinList* coinList, SigmodWrapper* parent) :
diff --git a/sigscript/EggGroupWrapper.cpp b/sigscript/EggGroupWrapper.cpp
index 7ed1ddf2..fee20d84 100644
--- a/sigscript/EggGroupWrapper.cpp
+++ b/sigscript/EggGroupWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::EggGroupWrapper* Sigscript::EggGroupWrapper::create(const Sigmod::EggGroup* eggGroup, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, eggGroup->id())))
-        m_instances[Signiture(parent, eggGroup->id())] = new EggGroupWrapper(eggGroup, parent);
-    return qobject_cast<EggGroupWrapper*>(m_instances[Signiture(parent, eggGroup->id())]);
+    if (!m_instances.contains(Signature(parent, eggGroup->id())))
+        m_instances[Signature(parent, eggGroup->id())] = new EggGroupWrapper(eggGroup, parent);
+    return qobject_cast<EggGroupWrapper*>(m_instances[Signature(parent, eggGroup->id())]);
 }
 
 Sigscript::EggGroupWrapper::EggGroupWrapper(const Sigmod::EggGroup* eggGroup, SigmodWrapper* parent) :
diff --git a/sigscript/GlobalScriptWrapper.cpp b/sigscript/GlobalScriptWrapper.cpp
index 0be3e2ed..abef6aad 100644
--- a/sigscript/GlobalScriptWrapper.cpp
+++ b/sigscript/GlobalScriptWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::GlobalScriptWrapper* Sigscript::GlobalScriptWrapper::create(const Sigmod::GlobalScript* globalScript, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, globalScript->id())))
-        m_instances[Signiture(parent, globalScript->id())] = new GlobalScriptWrapper(globalScript, parent);
-    return qobject_cast<GlobalScriptWrapper*>(m_instances[Signiture(parent, globalScript->id())]);
+    if (!m_instances.contains(Signature(parent, globalScript->id())))
+        m_instances[Signature(parent, globalScript->id())] = new GlobalScriptWrapper(globalScript, parent);
+    return qobject_cast<GlobalScriptWrapper*>(m_instances[Signature(parent, globalScript->id())]);
 }
 
 Sigscript::GlobalScriptWrapper::GlobalScriptWrapper(const Sigmod::GlobalScript* globalScript, SigmodWrapper* parent) :
diff --git a/sigscript/ItemTypeWrapper.cpp b/sigscript/ItemTypeWrapper.cpp
index 11808787..12f47876 100644
--- a/sigscript/ItemTypeWrapper.cpp
+++ b/sigscript/ItemTypeWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::ItemTypeWrapper* Sigscript::ItemTypeWrapper::create(const Sigmod::ItemType* itemType, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, itemType->id())))
-        m_instances[Signiture(parent, itemType->id())] = new ItemTypeWrapper(itemType, parent);
-    return qobject_cast<ItemTypeWrapper*>(m_instances[Signiture(parent, itemType->id())]);
+    if (!m_instances.contains(Signature(parent, itemType->id())))
+        m_instances[Signature(parent, itemType->id())] = new ItemTypeWrapper(itemType, parent);
+    return qobject_cast<ItemTypeWrapper*>(m_instances[Signature(parent, itemType->id())]);
 }
 
 Sigscript::ItemTypeWrapper::ItemTypeWrapper(const Sigmod::ItemType* itemType, SigmodWrapper* parent) :
diff --git a/sigscript/ItemWrapper.cpp b/sigscript/ItemWrapper.cpp
index c1732e56..1fb400db 100644
--- a/sigscript/ItemWrapper.cpp
+++ b/sigscript/ItemWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::ItemWrapper* Sigscript::ItemWrapper::create(const Sigmod::Item* item, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, item->id())))
-        m_instances[Signiture(parent, item->id())] = new ItemWrapper(item, parent);
-    return qobject_cast<ItemWrapper*>(m_instances[Signiture(parent, item->id())]);
+    if (!m_instances.contains(Signature(parent, item->id())))
+        m_instances[Signature(parent, item->id())] = new ItemWrapper(item, parent);
+    return qobject_cast<ItemWrapper*>(m_instances[Signature(parent, item->id())]);
 }
 
 Sigscript::ItemWrapper::ItemWrapper(const Sigmod::Item* item, SigmodWrapper* parent) :
diff --git a/sigscript/MapEffectWrapper.cpp b/sigscript/MapEffectWrapper.cpp
index f1d135c8..03ebb30f 100644
--- a/sigscript/MapEffectWrapper.cpp
+++ b/sigscript/MapEffectWrapper.cpp
@@ -24,9 +24,9 @@
 
 Sigscript::MapEffectWrapper* Sigscript::MapEffectWrapper::create(const Sigmod::MapEffect* effect, MapWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, effect->id())))
-        m_instances[Signiture(parent, effect->id())] = new MapEffectWrapper(effect, parent);
-    return qobject_cast<MapEffectWrapper*>(m_instances[Signiture(parent, effect->id())]);
+    if (!m_instances.contains(Signature(parent, effect->id())))
+        m_instances[Signature(parent, effect->id())] = new MapEffectWrapper(effect, parent);
+    return qobject_cast<MapEffectWrapper*>(m_instances[Signature(parent, effect->id())]);
 }
 
 Sigscript::MapEffectWrapper::MapEffectWrapper(const Sigmod::MapEffect* effect, MapWrapper* parent) :
diff --git a/sigscript/MapTrainerTeamMemberWrapper.cpp b/sigscript/MapTrainerTeamMemberWrapper.cpp
index 74966579..6d0ea036 100644
--- a/sigscript/MapTrainerTeamMemberWrapper.cpp
+++ b/sigscript/MapTrainerTeamMemberWrapper.cpp
@@ -24,9 +24,9 @@
 
 Sigscript::MapTrainerTeamMemberWrapper* Sigscript::MapTrainerTeamMemberWrapper::create(const Sigmod::MapTrainerTeamMember* teamMember, MapTrainerWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, teamMember->id())))
-        m_instances[Signiture(parent, teamMember->id())] = new MapTrainerTeamMemberWrapper(teamMember, parent);
-    return qobject_cast<MapTrainerTeamMemberWrapper*>(m_instances[Signiture(parent, teamMember->id())]);
+    if (!m_instances.contains(Signature(parent, teamMember->id())))
+        m_instances[Signature(parent, teamMember->id())] = new MapTrainerTeamMemberWrapper(teamMember, parent);
+    return qobject_cast<MapTrainerTeamMemberWrapper*>(m_instances[Signature(parent, teamMember->id())]);
 }
 
 Sigscript::MapTrainerTeamMemberWrapper::MapTrainerTeamMemberWrapper(const Sigmod::MapTrainerTeamMember* teamMember, MapTrainerWrapper* parent) :
diff --git a/sigscript/MapTrainerWrapper.cpp b/sigscript/MapTrainerWrapper.cpp
index dc2830b4..39ce9a46 100644
--- a/sigscript/MapTrainerWrapper.cpp
+++ b/sigscript/MapTrainerWrapper.cpp
@@ -25,9 +25,9 @@
 
 Sigscript::MapTrainerWrapper* Sigscript::MapTrainerWrapper::create(const Sigmod::MapTrainer* trainer, MapWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, trainer->id())))
-        m_instances[Signiture(parent, trainer->id())] = new MapTrainerWrapper(trainer, parent);
-    return qobject_cast<MapTrainerWrapper*>(m_instances[Signiture(parent, trainer->id())]);
+    if (!m_instances.contains(Signature(parent, trainer->id())))
+        m_instances[Signature(parent, trainer->id())] = new MapTrainerWrapper(trainer, parent);
+    return qobject_cast<MapTrainerWrapper*>(m_instances[Signature(parent, trainer->id())]);
 }
 
 Sigscript::MapTrainerWrapper::MapTrainerWrapper(const Sigmod::MapTrainer* trainer, MapWrapper* parent) :
diff --git a/sigscript/MapWarpWrapper.cpp b/sigscript/MapWarpWrapper.cpp
index fe6bdd42..32e1c14d 100644
--- a/sigscript/MapWarpWrapper.cpp
+++ b/sigscript/MapWarpWrapper.cpp
@@ -24,9 +24,9 @@
 
 Sigscript::MapWarpWrapper* Sigscript::MapWarpWrapper::create(const Sigmod::MapWarp* warp, MapWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, warp->id())))
-        m_instances[Signiture(parent, warp->id())] = new MapWarpWrapper(warp, parent);
-    return qobject_cast<MapWarpWrapper*>(m_instances[Signiture(parent, warp->id())]);
+    if (!m_instances.contains(Signature(parent, warp->id())))
+        m_instances[Signature(parent, warp->id())] = new MapWarpWrapper(warp, parent);
+    return qobject_cast<MapWarpWrapper*>(m_instances[Signature(parent, warp->id())]);
 }
 
 Sigscript::MapWarpWrapper::MapWarpWrapper(const Sigmod::MapWarp* warp, MapWrapper* parent) :
diff --git a/sigscript/MapWildListEncounterWrapper.cpp b/sigscript/MapWildListEncounterWrapper.cpp
index cf01d938..3945f8bc 100644
--- a/sigscript/MapWildListEncounterWrapper.cpp
+++ b/sigscript/MapWildListEncounterWrapper.cpp
@@ -24,9 +24,9 @@
 
 Sigscript::MapWildListEncounterWrapper* Sigscript::MapWildListEncounterWrapper::create(const Sigmod::MapWildListEncounter* encounter, MapWildListWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, encounter->id())))
-        m_instances[Signiture(parent, encounter->id())] = new MapWildListEncounterWrapper(encounter, parent);
-    return qobject_cast<MapWildListEncounterWrapper*>(m_instances[Signiture(parent, encounter->id())]);
+    if (!m_instances.contains(Signature(parent, encounter->id())))
+        m_instances[Signature(parent, encounter->id())] = new MapWildListEncounterWrapper(encounter, parent);
+    return qobject_cast<MapWildListEncounterWrapper*>(m_instances[Signature(parent, encounter->id())]);
 }
 
 Sigscript::MapWildListEncounterWrapper::MapWildListEncounterWrapper(const Sigmod::MapWildListEncounter* encounter, MapWildListWrapper* parent) :
diff --git a/sigscript/MapWildListWrapper.cpp b/sigscript/MapWildListWrapper.cpp
index f00442da..2271e60f 100644
--- a/sigscript/MapWildListWrapper.cpp
+++ b/sigscript/MapWildListWrapper.cpp
@@ -24,9 +24,9 @@
 
 Sigscript::MapWildListWrapper* Sigscript::MapWildListWrapper::create(const Sigmod::MapWildList* wildList, MapWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, wildList->id())))
-        m_instances[Signiture(parent, wildList->id())] = new MapWildListWrapper(wildList, parent);
-    return qobject_cast<MapWildListWrapper*>(m_instances[Signiture(parent, wildList->id())]);
+    if (!m_instances.contains(Signature(parent, wildList->id())))
+        m_instances[Signature(parent, wildList->id())] = new MapWildListWrapper(wildList, parent);
+    return qobject_cast<MapWildListWrapper*>(m_instances[Signature(parent, wildList->id())]);
 }
 
 Sigscript::MapWildListWrapper::MapWildListWrapper(const Sigmod::MapWildList* wildList, MapWrapper* parent) :
diff --git a/sigscript/MapWrapper.cpp b/sigscript/MapWrapper.cpp
index 279e0b58..a035a03b 100644
--- a/sigscript/MapWrapper.cpp
+++ b/sigscript/MapWrapper.cpp
@@ -27,9 +27,9 @@
 
 Sigscript::MapWrapper* Sigscript::MapWrapper::create(const Sigmod::Map* map, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, map->id())))
-        m_instances[Signiture(parent, map->id())] = new MapWrapper(map, parent);
-    return qobject_cast<MapWrapper*>(m_instances[Signiture(parent, map->id())]);
+    if (!m_instances.contains(Signature(parent, map->id())))
+        m_instances[Signature(parent, map->id())] = new MapWrapper(map, parent);
+    return qobject_cast<MapWrapper*>(m_instances[Signature(parent, map->id())]);
 }
 
 Sigscript::MapWrapper::MapWrapper(const Sigmod::Map* map, SigmodWrapper* parent) :
diff --git a/sigscript/MoveWrapper.cpp b/sigscript/MoveWrapper.cpp
index 8ddc47d1..98f13702 100644
--- a/sigscript/MoveWrapper.cpp
+++ b/sigscript/MoveWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::MoveWrapper* Sigscript::MoveWrapper::create(const Sigmod::Move* move, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, move->id())))
-        m_instances[Signiture(parent, move->id())] = new MoveWrapper(move, parent);
-    return qobject_cast<MoveWrapper*>(m_instances[Signiture(parent, move->id())]);
+    if (!m_instances.contains(Signature(parent, move->id())))
+        m_instances[Signature(parent, move->id())] = new MoveWrapper(move, parent);
+    return qobject_cast<MoveWrapper*>(m_instances[Signature(parent, move->id())]);
 }
 
 Sigscript::MoveWrapper::MoveWrapper(const Sigmod::Move* move, SigmodWrapper* parent) :
diff --git a/sigscript/NatureWrapper.cpp b/sigscript/NatureWrapper.cpp
index 49ca54a3..16e0f772 100644
--- a/sigscript/NatureWrapper.cpp
+++ b/sigscript/NatureWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::NatureWrapper* Sigscript::NatureWrapper::create(const Sigmod::Nature* nature, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, nature->id())))
-        m_instances[Signiture(parent, nature->id())] = new NatureWrapper(nature, parent);
-    return qobject_cast<NatureWrapper*>(m_instances[Signiture(parent, nature->id())]);
+    if (!m_instances.contains(Signature(parent, nature->id())))
+        m_instances[Signature(parent, nature->id())] = new NatureWrapper(nature, parent);
+    return qobject_cast<NatureWrapper*>(m_instances[Signature(parent, nature->id())]);
 }
 
 Sigscript::NatureWrapper::NatureWrapper(const Sigmod::Nature* nature, SigmodWrapper* parent) :
diff --git a/sigscript/ObjectWrapper.cpp b/sigscript/ObjectWrapper.cpp
index 8917c375..b91827de 100644
--- a/sigscript/ObjectWrapper.cpp
+++ b/sigscript/ObjectWrapper.cpp
@@ -21,7 +21,7 @@
 // Sigscript includes
 #include "SigmodWrapper.h"
 
-QMap<Sigscript::ObjectWrapper::Signiture, Sigscript::ObjectWrapper*> Sigscript::ObjectWrapper::m_instances;
+QMap<Sigscript::ObjectWrapper::Signature, Sigscript::ObjectWrapper*> Sigscript::ObjectWrapper::m_instances;
 
 Sigscript::ObjectWrapper::ObjectWrapper(const Sigmod::Object* object, ObjectWrapper* parent) :
         Config(parent),
diff --git a/sigscript/ObjectWrapper.h b/sigscript/ObjectWrapper.h
index d5260b74..91486581 100644
--- a/sigscript/ObjectWrapper.h
+++ b/sigscript/ObjectWrapper.h
@@ -41,7 +41,7 @@ class SIGSCRIPT_EXPORT ObjectWrapper : public Config
     Q_PROPERTY(int id READ id)
     
     public:
-        typedef QPair<ObjectWrapper*, int> Signiture;
+        typedef QPair<ObjectWrapper*, int> Signature;
         
         ObjectWrapper(const Sigmod::Object* object, ObjectWrapper* parent);
         
@@ -53,7 +53,7 @@ class SIGSCRIPT_EXPORT ObjectWrapper : public Config
         const SigmodWrapper* sigmod() const;
         SigmodWrapper* sigmod();
     protected:
-        static QMap<Signiture, ObjectWrapper*> m_instances;
+        static QMap<Signature, ObjectWrapper*> m_instances;
     private:
         ObjectWrapper* m_parent;
         const Sigmod::Object* m_object;
diff --git a/sigscript/RulesWrapper.cpp b/sigscript/RulesWrapper.cpp
index aa2a2108..d549c395 100644
--- a/sigscript/RulesWrapper.cpp
+++ b/sigscript/RulesWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::RulesWrapper* Sigscript::RulesWrapper::create(const Sigmod::Rules* rules, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, rules->id())))
-        m_instances[Signiture(parent, rules->id())] = new RulesWrapper(rules, parent);
-    return qobject_cast<RulesWrapper*>(m_instances[Signiture(parent, rules->id())]);
+    if (!m_instances.contains(Signature(parent, rules->id())))
+        m_instances[Signature(parent, rules->id())] = new RulesWrapper(rules, parent);
+    return qobject_cast<RulesWrapper*>(m_instances[Signature(parent, rules->id())]);
 }
 
 Sigscript::RulesWrapper::RulesWrapper(const Sigmod::Rules* rules, SigmodWrapper* parent) :
diff --git a/sigscript/SkinWrapper.cpp b/sigscript/SkinWrapper.cpp
index 4fa49120..60c35dc3 100644
--- a/sigscript/SkinWrapper.cpp
+++ b/sigscript/SkinWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::SkinWrapper* Sigscript::SkinWrapper::create(const Sigmod::Skin* skin, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, skin->id())))
-        m_instances[Signiture(parent, skin->id())] = new SkinWrapper(skin, parent);
-    return qobject_cast<SkinWrapper*>(m_instances[Signiture(parent, skin->id())]);
+    if (!m_instances.contains(Signature(parent, skin->id())))
+        m_instances[Signature(parent, skin->id())] = new SkinWrapper(skin, parent);
+    return qobject_cast<SkinWrapper*>(m_instances[Signature(parent, skin->id())]);
 }
 
 Sigscript::SkinWrapper::SkinWrapper(const Sigmod::Skin* skin, SigmodWrapper* parent) :
diff --git a/sigscript/SoundWrapper.cpp b/sigscript/SoundWrapper.cpp
index 0e48d5cc..1ba51567 100644
--- a/sigscript/SoundWrapper.cpp
+++ b/sigscript/SoundWrapper.cpp
@@ -30,9 +30,9 @@
 
 Sigscript::SoundWrapper* Sigscript::SoundWrapper::create(const Sigmod::Sound* sound, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, sound->id())))
-        m_instances[Signiture(parent, sound->id())] = new SoundWrapper(sound, parent);
-    return qobject_cast<SoundWrapper*>(m_instances[Signiture(parent, sound->id())]);
+    if (!m_instances.contains(Signature(parent, sound->id())))
+        m_instances[Signature(parent, sound->id())] = new SoundWrapper(sound, parent);
+    return qobject_cast<SoundWrapper*>(m_instances[Signature(parent, sound->id())]);
 }
 
 Sigscript::SoundWrapper::SoundWrapper(const Sigmod::Sound* sound, SigmodWrapper* parent) :
diff --git a/sigscript/SpeciesAbilityWrapper.cpp b/sigscript/SpeciesAbilityWrapper.cpp
index e5aafc19..71cbe8a3 100644
--- a/sigscript/SpeciesAbilityWrapper.cpp
+++ b/sigscript/SpeciesAbilityWrapper.cpp
@@ -24,9 +24,9 @@
 
 Sigscript::SpeciesAbilityWrapper* Sigscript::SpeciesAbilityWrapper::create(const Sigmod::SpeciesAbility* ability, SpeciesWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, ability->id())))
-        m_instances[Signiture(parent, ability->id())] = new SpeciesAbilityWrapper(ability, parent);
-    return qobject_cast<SpeciesAbilityWrapper*>(m_instances[Signiture(parent, ability->id())]);
+    if (!m_instances.contains(Signature(parent, ability->id())))
+        m_instances[Signature(parent, ability->id())] = new SpeciesAbilityWrapper(ability, parent);
+    return qobject_cast<SpeciesAbilityWrapper*>(m_instances[Signature(parent, ability->id())]);
 }
 
 Sigscript::SpeciesAbilityWrapper::SpeciesAbilityWrapper(const Sigmod::SpeciesAbility* ability, SpeciesWrapper* parent) :
diff --git a/sigscript/SpeciesItemWrapper.cpp b/sigscript/SpeciesItemWrapper.cpp
index 16807886..707c0b57 100644
--- a/sigscript/SpeciesItemWrapper.cpp
+++ b/sigscript/SpeciesItemWrapper.cpp
@@ -24,9 +24,9 @@
 
 Sigscript::SpeciesItemWrapper* Sigscript::SpeciesItemWrapper::create(const Sigmod::SpeciesItem* item, SpeciesWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, item->id())))
-        m_instances[Signiture(parent, item->id())] = new SpeciesItemWrapper(item, parent);
-    return qobject_cast<SpeciesItemWrapper*>(m_instances[Signiture(parent, item->id())]);
+    if (!m_instances.contains(Signature(parent, item->id())))
+        m_instances[Signature(parent, item->id())] = new SpeciesItemWrapper(item, parent);
+    return qobject_cast<SpeciesItemWrapper*>(m_instances[Signature(parent, item->id())]);
 }
 
 Sigscript::SpeciesItemWrapper::SpeciesItemWrapper(const Sigmod::SpeciesItem* item, SpeciesWrapper* parent) :
diff --git a/sigscript/SpeciesMoveWrapper.cpp b/sigscript/SpeciesMoveWrapper.cpp
index b98905a5..6e3c0bca 100644
--- a/sigscript/SpeciesMoveWrapper.cpp
+++ b/sigscript/SpeciesMoveWrapper.cpp
@@ -24,9 +24,9 @@
 
 Sigscript::SpeciesMoveWrapper* Sigscript::SpeciesMoveWrapper::create(const Sigmod::SpeciesMove* move, SpeciesWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, move->id())))
-        m_instances[Signiture(parent, move->id())] = new SpeciesMoveWrapper(move, parent);
-    return qobject_cast<SpeciesMoveWrapper*>(m_instances[Signiture(parent, move->id())]);
+    if (!m_instances.contains(Signature(parent, move->id())))
+        m_instances[Signature(parent, move->id())] = new SpeciesMoveWrapper(move, parent);
+    return qobject_cast<SpeciesMoveWrapper*>(m_instances[Signature(parent, move->id())]);
 }
 
 Sigscript::SpeciesMoveWrapper::SpeciesMoveWrapper(const Sigmod::SpeciesMove* move, SpeciesWrapper* parent) :
diff --git a/sigscript/SpeciesWrapper.cpp b/sigscript/SpeciesWrapper.cpp
index 6b730d30..7eef05e8 100644
--- a/sigscript/SpeciesWrapper.cpp
+++ b/sigscript/SpeciesWrapper.cpp
@@ -26,9 +26,9 @@
 
 Sigscript::SpeciesWrapper* Sigscript::SpeciesWrapper::create(const Sigmod::Species* species, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, species->id())))
-        m_instances[Signiture(parent, species->id())] = new SpeciesWrapper(species, parent);
-    return qobject_cast<SpeciesWrapper*>(m_instances[Signiture(parent, species->id())]);
+    if (!m_instances.contains(Signature(parent, species->id())))
+        m_instances[Signature(parent, species->id())] = new SpeciesWrapper(species, parent);
+    return qobject_cast<SpeciesWrapper*>(m_instances[Signature(parent, species->id())]);
 }
 
 Sigscript::SpeciesWrapper::SpeciesWrapper(const Sigmod::Species* species, SigmodWrapper* parent) :
diff --git a/sigscript/SpriteWrapper.cpp b/sigscript/SpriteWrapper.cpp
index 440d41fa..4b972574 100644
--- a/sigscript/SpriteWrapper.cpp
+++ b/sigscript/SpriteWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::SpriteWrapper* Sigscript::SpriteWrapper::create(const Sigmod::Sprite* sprite, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, sprite->id())))
-        m_instances[Signiture(parent, sprite->id())] = new SpriteWrapper(sprite, parent);
-    return qobject_cast<SpriteWrapper*>(m_instances[Signiture(parent, sprite->id())]);
+    if (!m_instances.contains(Signature(parent, sprite->id())))
+        m_instances[Signature(parent, sprite->id())] = new SpriteWrapper(sprite, parent);
+    return qobject_cast<SpriteWrapper*>(m_instances[Signature(parent, sprite->id())]);
 }
 
 Sigscript::SpriteWrapper::SpriteWrapper(const Sigmod::Sprite* sprite, SigmodWrapper* parent) :
diff --git a/sigscript/StatusWrapper.cpp b/sigscript/StatusWrapper.cpp
index 54269671..5988d0bf 100644
--- a/sigscript/StatusWrapper.cpp
+++ b/sigscript/StatusWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::StatusWrapper* Sigscript::StatusWrapper::create(const Sigmod::Status* status, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, status->id())))
-        m_instances[Signiture(parent, status->id())] = new StatusWrapper(status, parent);
-    return qobject_cast<StatusWrapper*>(m_instances[Signiture(parent, status->id())]);
+    if (!m_instances.contains(Signature(parent, status->id())))
+        m_instances[Signature(parent, status->id())] = new StatusWrapper(status, parent);
+    return qobject_cast<StatusWrapper*>(m_instances[Signature(parent, status->id())]);
 }
 
 Sigscript::StatusWrapper::StatusWrapper(const Sigmod::Status* status, SigmodWrapper* parent) :
diff --git a/sigscript/StoreWrapper.cpp b/sigscript/StoreWrapper.cpp
index c747b4eb..cf0af548 100644
--- a/sigscript/StoreWrapper.cpp
+++ b/sigscript/StoreWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::StoreWrapper* Sigscript::StoreWrapper::create(const Sigmod::Store* store, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, store->id())))
-        m_instances[Signiture(parent, store->id())] = new StoreWrapper(store, parent);
-    return qobject_cast<StoreWrapper*>(m_instances[Signiture(parent, store->id())]);
+    if (!m_instances.contains(Signature(parent, store->id())))
+        m_instances[Signature(parent, store->id())] = new StoreWrapper(store, parent);
+    return qobject_cast<StoreWrapper*>(m_instances[Signature(parent, store->id())]);
 }
 
 Sigscript::StoreWrapper::StoreWrapper(const Sigmod::Store* store, SigmodWrapper* parent) :
diff --git a/sigscript/TileWrapper.cpp b/sigscript/TileWrapper.cpp
index 8efbe209..575fc0ac 100644
--- a/sigscript/TileWrapper.cpp
+++ b/sigscript/TileWrapper.cpp
@@ -24,9 +24,9 @@
 
 Sigscript::TileWrapper* Sigscript::TileWrapper::create(const Sigmod::Tile* tile, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, tile->id())))
-        m_instances[Signiture(parent, tile->id())] = new TileWrapper(tile, parent);
-    return qobject_cast<TileWrapper*>(m_instances[Signiture(parent, tile->id())]);
+    if (!m_instances.contains(Signature(parent, tile->id())))
+        m_instances[Signature(parent, tile->id())] = new TileWrapper(tile, parent);
+    return qobject_cast<TileWrapper*>(m_instances[Signature(parent, tile->id())]);
 }
 
 Sigscript::TileWrapper::TileWrapper(const Sigmod::Tile* tile, SigmodWrapper* parent) :
diff --git a/sigscript/TimeWrapper.cpp b/sigscript/TimeWrapper.cpp
index befcee9b..24b5b533 100644
--- a/sigscript/TimeWrapper.cpp
+++ b/sigscript/TimeWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::TimeWrapper* Sigscript::TimeWrapper::create(const Sigmod::Time* time, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, time->id())))
-        m_instances[Signiture(parent, time->id())] = new TimeWrapper(time, parent);
-    return qobject_cast<TimeWrapper*>(m_instances[Signiture(parent, time->id())]);
+    if (!m_instances.contains(Signature(parent, time->id())))
+        m_instances[Signature(parent, time->id())] = new TimeWrapper(time, parent);
+    return qobject_cast<TimeWrapper*>(m_instances[Signature(parent, time->id())]);
 }
 
 Sigscript::TimeWrapper::TimeWrapper(const Sigmod::Time* time, SigmodWrapper* parent) :
diff --git a/sigscript/TrainerWrapper.cpp b/sigscript/TrainerWrapper.cpp
index c3ca4c7a..7d60be1e 100644
--- a/sigscript/TrainerWrapper.cpp
+++ b/sigscript/TrainerWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::TrainerWrapper* Sigscript::TrainerWrapper::create(const Sigmod::Trainer* trainer, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, trainer->id())))
-        m_instances[Signiture(parent, trainer->id())] = new TrainerWrapper(trainer, parent);
-    return qobject_cast<TrainerWrapper*>(m_instances[Signiture(parent, trainer->id())]);
+    if (!m_instances.contains(Signature(parent, trainer->id())))
+        m_instances[Signature(parent, trainer->id())] = new TrainerWrapper(trainer, parent);
+    return qobject_cast<TrainerWrapper*>(m_instances[Signature(parent, trainer->id())]);
 }
 
 Sigscript::TrainerWrapper::TrainerWrapper(const Sigmod::Trainer* trainer, SigmodWrapper* parent) :
diff --git a/sigscript/TypeWrapper.cpp b/sigscript/TypeWrapper.cpp
index 216916d4..50849ab3 100644
--- a/sigscript/TypeWrapper.cpp
+++ b/sigscript/TypeWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::TypeWrapper* Sigscript::TypeWrapper::create(const Sigmod::Type* type, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, type->id())))
-        m_instances[Signiture(parent, type->id())] = new TypeWrapper(type, parent);
-    return qobject_cast<TypeWrapper*>(m_instances[Signiture(parent, type->id())]);
+    if (!m_instances.contains(Signature(parent, type->id())))
+        m_instances[Signature(parent, type->id())] = new TypeWrapper(type, parent);
+    return qobject_cast<TypeWrapper*>(m_instances[Signature(parent, type->id())]);
 }
 
 Sigscript::TypeWrapper::TypeWrapper(const Sigmod::Type* type, SigmodWrapper* parent) :
diff --git a/sigscript/WeatherWrapper.cpp b/sigscript/WeatherWrapper.cpp
index 34965d9d..3473572c 100644
--- a/sigscript/WeatherWrapper.cpp
+++ b/sigscript/WeatherWrapper.cpp
@@ -23,9 +23,9 @@
 
 Sigscript::WeatherWrapper* Sigscript::WeatherWrapper::create(const Sigmod::Weather* weather, SigmodWrapper* parent)
 {
-    if (!m_instances.contains(Signiture(parent, weather->id())))
-        m_instances[Signiture(parent, weather->id())] = new WeatherWrapper(weather, parent);
-    return qobject_cast<WeatherWrapper*>(m_instances[Signiture(parent, weather->id())]);
+    if (!m_instances.contains(Signature(parent, weather->id())))
+        m_instances[Signature(parent, weather->id())] = new WeatherWrapper(weather, parent);
+    return qobject_cast<WeatherWrapper*>(m_instances[Signature(parent, weather->id())]);
 }
 
 Sigscript::WeatherWrapper::WeatherWrapper(const Sigmod::Weather* weather, SigmodWrapper* parent) :