Fix internal references to be Sigencore instead of Sigbattle

11 files changed, 166 insertions, 129 deletions

diff --git a/sigencore/Arena.cpp b/sigencore/Arena.cpp
index 8a6dc7bd..9589e2e0 100644
--- a/sigencore/Arena.cpp
+++ b/sigencore/Arena.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2007-2009 Ben Boeckel <MathStuf@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 // Header include
 #include "Arena.h"
 
-// Sigbattle includes
+// Sigencore includes
 #include "Player.h"
 
 // Sigscript includes
@@ -40,17 +40,17 @@
 #include <QtCore/QtConcurrentRun>
 #include <QtCore/QUuid>
 
-Sigbattle::TeamMember::RequestedAction Sigbattle::requestDecision(TeamMember* teamMember)
+Sigencore::TeamMember::RequestedAction Sigencore::requestDecision(TeamMember* teamMember)
 {
     return TeamMember::RequestedAction(teamMember, QtConcurrent::run(decision, teamMember));
 }
 
-Sigbattle::TeamMember::Action Sigbattle::decision(TeamMember* teamMember)
+Sigencore::TeamMember::Action Sigencore::decision(TeamMember* teamMember)
 {
     return teamMember->requestAction();
 }
 
-Sigbattle::Arena::Arena(Sigscript::SigmodWrapper* sigmod, QSet<Player*> players, const bool isWild, Sigscript::Config* parent) :
+Sigencore::Arena::Arena(Sigscript::SigmodWrapper* sigmod, QSet<Player*> players, const bool isWild, Sigscript::Config* parent) :
         Sigscript::Config(parent),
         m_sigmod(sigmod),
         m_isWild(isWild),
@@ -64,20 +64,20 @@ Sigbattle::Arena::Arena(Sigscript::SigmodWrapper* sigmod, QSet<Player*> players,
         player->enterArena(this);
 }
 
-Sigbattle::Arena::~Arena()
+Sigencore::Arena::~Arena()
 {
     delete m_actions;
 }
 
-QList<Sigbattle::TeamMember*> Sigbattle::Arena::active() const
+QList<Sigencore::TeamMember*> Sigencore::Arena::active() const
 {
-    QList<Sigbattle::TeamMember*> active;
+    QList<Sigencore::TeamMember*> active;
     foreach (Player* player, m_players)
         active += player->active();
     return active;
 }
 
-int Sigbattle::Arena::numActiveTeams() const
+int Sigencore::Arena::numActiveTeams() const
 {
     int active = 0;
     foreach (Player* player, m_players)
@@ -85,17 +85,17 @@ int Sigbattle::Arena::numActiveTeams() const
     return active;
 }
 
-bool Sigbattle::Arena::isOver() const
+bool Sigencore::Arena::isOver() const
 {
     return m_isOver;
 }
 
-Sigscript::SigmodWrapper* Sigbattle::Arena::sigmod() const
+Sigscript::SigmodWrapper* Sigencore::Arena::sigmod() const
 {
     return m_sigmod;
 }
 
-void Sigbattle::Arena::registerScript(const Sigcore::Script& script)
+void Sigencore::Arena::registerScript(const Sigcore::Script& script)
 {
     if (!script.script().isEmpty())
     {
@@ -107,7 +107,7 @@ void Sigbattle::Arena::registerScript(const Sigcore::Script& script)
     }
 }
 
-void Sigbattle::Arena::cleanUp()
+void Sigencore::Arena::cleanUp()
 {
     emit(aboutToClearActions());
     m_isOver = true;
@@ -119,7 +119,7 @@ void Sigbattle::Arena::cleanUp()
         player->exitArena();
 }
 
-void Sigbattle::Arena::handleAction(TeamMember* teamMember, TeamMember::Action action)
+void Sigencore::Arena::handleAction(TeamMember* teamMember, TeamMember::Action action)
 {
     TeamMember::ActionData data = action.second;
     switch (action.first)
@@ -206,13 +206,13 @@ void Sigbattle::Arena::handleAction(TeamMember* teamMember, TeamMember::Action a
     checkForLosers();
 }
 
-void Sigbattle::Arena::setupBattle()
+void Sigencore::Arena::setupBattle()
 {
     foreach (Player* player, m_players)
         player->enterArena(this);
 }
 
-void Sigbattle::Arena::distributeWinnings()
+void Sigencore::Arena::distributeWinnings()
 {
     foreach (Player* player, m_players)
     {
@@ -227,7 +227,7 @@ void Sigbattle::Arena::distributeWinnings()
     }
 }
 
-void Sigbattle::Arena::checkForLosers()
+void Sigencore::Arena::checkForLosers()
 {
     static QSet<Player*> losers;
     foreach (Player* player, m_players)
@@ -236,7 +236,7 @@ void Sigbattle::Arena::checkForLosers()
     }
 }
 
-Sigbattle::TeamMember* Sigbattle::Arena::findMember(const QUuid& id)
+Sigencore::TeamMember* Sigencore::Arena::findMember(const QUuid& id)
 {
     foreach (Player* player, m_players)
     {
diff --git a/sigencore/Arena.h b/sigencore/Arena.h
index 2a7c5350..4b982fdb 100644
--- a/sigencore/Arena.h
+++ b/sigencore/Arena.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2007-2009 Ben Boeckel <MathStuf@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,10 +15,10 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGBATTLE_ARENA
-#define SIGBATTLE_ARENA
+#ifndef SIGENCORE_ARENA
+#define SIGENCORE_ARENA
 
-// Sigbattle includes
+// Sigencore includes
 #include "Global.h"
 #include "Team.h"
 #include "TeamMember.h"
@@ -45,11 +45,11 @@ namespace Sigscript
 class SigmodWrapper;
 }
 
-namespace Sigbattle
+namespace Sigencore
 {
 class Player;
 
-class SIGBATTLE_EXPORT Arena : public Sigscript::Config
+class SIGENCORE_EXPORT Arena : public Sigscript::Config
 {
     Q_OBJECT
     
@@ -98,10 +98,10 @@ class SIGBATTLE_EXPORT Arena : public Sigscript::Config
         const QUuid m_id;
 };
 
-SIGBATTLE_EXPORT TeamMember::RequestedAction requestDecision(TeamMember* teamMember);
-SIGBATTLE_EXPORT TeamMember::Action decision(TeamMember* teamMember);
+SIGENCORE_EXPORT TeamMember::RequestedAction requestDecision(TeamMember* teamMember);
+SIGENCORE_EXPORT TeamMember::Action decision(TeamMember* teamMember);
 
 }
-Q_DECLARE_METATYPE(Sigbattle::Arena*)
+Q_DECLARE_METATYPE(Sigencore::Arena*)
 
 #endif
diff --git a/sigencore/Containment.cpp b/sigencore/Containment.cpp
index 12d778aa..23047e91 100644
--- a/sigencore/Containment.cpp
+++ b/sigencore/Containment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,25 +18,25 @@
 // Header include
 #include "Containment.h"
 
-// Sigbattle includes
+// Sigencore includes
 #include "TeamMember.h"
 
 // Sigscript includes
 #include "../sigscript/RulesWrapper.h"
 #include "../sigscript/SigmodWrapper.h"
 
-Sigbattle::Containment::Containment(Sigscript::SigmodWrapper* sigmod, Sigscript::Config* parent) :
+Sigencore::Containment::Containment(Sigscript::SigmodWrapper* sigmod, Sigscript::Config* parent) :
         Sigscript::Config(parent),
         m_sigmod(sigmod)
 {
 }
 
-QList<Sigbattle::TeamMember*> Sigbattle::Containment::members() const
+QList<Sigencore::TeamMember*> Sigencore::Containment::members() const
 {
     return m_members;
 }
 
-bool Sigbattle::Containment::addMember(TeamMember* member)
+bool Sigencore::Containment::addMember(TeamMember* member)
 {
     if (m_members.size() < sigmod()->rules()->maxParty())
     {
@@ -47,7 +47,7 @@ bool Sigbattle::Containment::addMember(TeamMember* member)
     return false;
 }
 
-Sigbattle::TeamMember* Sigbattle::Containment::findMember(const QUuid& id) const
+Sigencore::TeamMember* Sigencore::Containment::findMember(const QUuid& id) const
 {
     foreach (TeamMember* member, m_members)
     {
@@ -57,7 +57,7 @@ Sigbattle::TeamMember* Sigbattle::Containment::findMember(const QUuid& id) const
     return NULL;
 }
 
-Sigscript::SigmodWrapper* Sigbattle::Containment::sigmod() const
+Sigscript::SigmodWrapper* Sigencore::Containment::sigmod() const
 {
     return m_sigmod;
 }
diff --git a/sigencore/Containment.h b/sigencore/Containment.h
index 08c1ab8e..a9256d8e 100644
--- a/sigencore/Containment.h
+++ b/sigencore/Containment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,10 +15,10 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGBATTLE_CONTAINMENT
-#define SIGBATTLE_CONTAINMENT
+#ifndef SIGENCORE_CONTAINMENT
+#define SIGENCORE_CONTAINMENT
 
-// Sigbattle includes
+// Sigencore includes
 #include "Global.h"
 
 // Sigscript includes
@@ -34,11 +34,11 @@ namespace Sigscript
 class SigmodWrapper;
 }
 
-namespace Sigbattle
+namespace Sigencore
 {
 class TeamMember;
 
-class SIGBATTLE_EXPORT Containment : public Sigscript::Config
+class SIGENCORE_EXPORT Containment : public Sigscript::Config
 {
     Q_OBJECT
     
@@ -61,6 +61,6 @@ class SIGBATTLE_EXPORT Containment : public Sigscript::Config
     protected slots:
 };
 }
-Q_DECLARE_METATYPE(Sigbattle::Containment*)
+Q_DECLARE_METATYPE(Sigencore::Containment*)
 
 #endif
diff --git a/sigencore/Global.h b/sigencore/Global.h
new file mode 100644
index 00000000..efa47da6
--- /dev/null
+++ b/sigencore/Global.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2009 Ben Boeckel <MathStuf@gmail.com>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SIGENCORE_GLOBAL
+#define SIGENCORE_GLOBAL
+
+// KDE includes
+#include <kdemacros.h>
+
+#ifndef SIGENCORE_EXPORT
+#   ifdef MAKE_SIGENCORE_LIB
+#       define SIGENCORE_EXPORT KDE_EXPORT
+#   else
+#       define SIGENCORE_EXPORT KDE_IMPORT
+#   endif
+#   define SIGENCORE_IMPORT KDE_IMPORT
+#endif
+
+#ifndef SIGENCORE_EXPORT_DEPRECATED
+#   define SIGENCORE_EXPORT_DEPRECATED KDE_DEPRECATED SIGENCORE_EXPORT
+#endif
+
+#endif
diff --git a/sigencore/Player.cpp b/sigencore/Player.cpp
index 748aaf30..d4e2d686 100644
--- a/sigencore/Player.cpp
+++ b/sigencore/Player.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,14 +22,14 @@
 #include "../sigscript/RulesWrapper.h"
 #include "../sigscript/SigmodWrapper.h"
 
-Sigbattle::Player::Player(Sigscript::SigmodWrapper* sigmod, Sigscript::Config* parent) :
+Sigencore::Player::Player(Sigscript::SigmodWrapper* sigmod, Sigscript::Config* parent) :
         Team(sigmod, parent),
         m_arena(NULL),
         m_money(0)
 {
 }
 
-void Sigbattle::Player::enterArena(Arena* arena)
+void Sigencore::Player::enterArena(Arena* arena)
 {
     m_arena = arena;
     for (int i = 0; (m_active.size() < sigmod()->rules()->maxFight()) && (i < m_members.size()); ++i)
@@ -41,12 +41,12 @@ void Sigbattle::Player::enterArena(Arena* arena)
         member->makeActive(arena);
 }
 
-QList<Sigbattle::TeamMember*> Sigbattle::Player::active()
+QList<Sigencore::TeamMember*> Sigencore::Player::active()
 {
     return m_active;
 }
 
-void Sigbattle::Player::switchOut(TeamMember* oldActive, TeamMember* newActive)
+void Sigencore::Player::switchOut(TeamMember* oldActive, TeamMember* newActive)
 {
     oldActive->leaveArena();
     newActive->makeActive(m_arena);
@@ -54,12 +54,12 @@ void Sigbattle::Player::switchOut(TeamMember* oldActive, TeamMember* newActive)
     m_active.append(newActive);
 }
 
-int Sigbattle::Player::money() const
+int Sigencore::Player::money() const
 {
     return m_money;
 }
 
-void Sigbattle::Player::exitArena()
+void Sigencore::Player::exitArena()
 {
     foreach (TeamMember* member, m_active)
         member->leaveArena();
@@ -67,14 +67,14 @@ void Sigbattle::Player::exitArena()
     m_arena = NULL;
 }
 
-void Sigbattle::Player::giveMoney(const int amount)
+void Sigencore::Player::giveMoney(const int amount)
 {
     m_money += amount;
     if (sigmod()->rules()->maxMoney() < m_money)
         m_money = sigmod()->rules()->maxMoney();
 }
 
-void Sigbattle::Player::takeMoney(const int amount)
+void Sigencore::Player::takeMoney(const int amount)
 {
     m_money -= amount;
     if (m_money < 0)
diff --git a/sigencore/Player.h b/sigencore/Player.h
index b04c606e..a3c59fc8 100644
--- a/sigencore/Player.h
+++ b/sigencore/Player.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2007-2009 Ben Boeckel <MathStuf@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,10 +15,10 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGBATTLE_PLAYER
-#define SIGBATTLE_PLAYER
+#ifndef SIGENCORE_PLAYER
+#define SIGENCORE_PLAYER
 
-// Sigbattle includes
+// Sigencore includes
 #include "Global.h"
 #include "Team.h"
 #include "TeamMember.h"
@@ -32,11 +32,11 @@ namespace Sigmod
 class Sigmod;
 }
 
-namespace Sigbattle
+namespace Sigencore
 {
 class Team;
 
-class SIGBATTLE_EXPORT Player : public Team
+class SIGENCORE_EXPORT Player : public Team
 {
     Q_OBJECT
     
@@ -65,6 +65,6 @@ class SIGBATTLE_EXPORT Player : public Team
     protected slots:
 };
 }
-Q_DECLARE_METATYPE(Sigbattle::Player*)
+Q_DECLARE_METATYPE(Sigencore::Player*)
 
 #endif
diff --git a/sigencore/Team.cpp b/sigencore/Team.cpp
index bfc89c92..c09cf6f0 100644
--- a/sigencore/Team.cpp
+++ b/sigencore/Team.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2007-2009 Ben Boeckel <MathStuf@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 // Header include
 #include "Team.h"
 
-Sigbattle::Team::Team(Sigscript::SigmodWrapper* sigmod, Sigscript::Config* parent) :
+Sigencore::Team::Team(Sigscript::SigmodWrapper* sigmod, Sigscript::Config* parent) :
         Containment(sigmod, parent)
 {
     // TODO: construct
@@ -67,7 +67,7 @@ Sigbattle::Team::Team(Sigscript::SigmodWrapper* sigmod, Sigscript::Config* paren
 //         active = a;
 // }
 
-bool Sigbattle::Team::isMutable() const
+bool Sigencore::Team::isMutable() const
 {
     return true;
 }
diff --git a/sigencore/Team.h b/sigencore/Team.h
index 98467dcc..0dcf5680 100644
--- a/sigencore/Team.h
+++ b/sigencore/Team.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2007-2009 Ben Boeckel <MathStuf@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,18 +15,18 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGBATTLE_TEAM
-#define SIGBATTLE_TEAM
+#ifndef SIGENCORE_TEAM
+#define SIGENCORE_TEAM
 
-// Sigbattle includes
+// Sigencore includes
 #include "Containment.h"
 
-namespace Sigbattle
+namespace Sigencore
 {
 // Forward declarations
 class Arena;
 
-class SIGBATTLE_EXPORT Team : public Containment
+class SIGENCORE_EXPORT Team : public Containment
 {
     Q_OBJECT
     
@@ -42,6 +42,6 @@ class SIGBATTLE_EXPORT Team : public Containment
     protected slots:
 };
 }
-Q_DECLARE_METATYPE(Sigbattle::Team*)
+Q_DECLARE_METATYPE(Sigencore::Team*)
 
 #endif
diff --git a/sigencore/TeamMember.cpp b/sigencore/TeamMember.cpp
index 55ba656a..98812b47 100644
--- a/sigencore/TeamMember.cpp
+++ b/sigencore/TeamMember.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2007-2009 Ben Boeckel <MathStuf@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 // Header include
 #include "TeamMember.h"
 
-// Sigbattle includes
+// Sigencore includes
 #include "Arena.h"
 #include "Containment.h"
 #include "Player.h"
@@ -49,7 +49,7 @@
 // C includes
 #include <cmath>
 
-int Sigbattle::actionPriority(TeamMember* teamMember, const TeamMember::Action& action)
+int Sigencore::actionPriority(TeamMember* teamMember, const TeamMember::Action& action)
 {
     int priority = INT_MAX;
     switch (action.first)
@@ -88,7 +88,7 @@ int Sigbattle::actionPriority(TeamMember* teamMember, const TeamMember::Action&
     return priority;
 }
 
-Sigbattle::TeamMember::TeamMember(const int speciesId, const QString& name, const int level, Containment* containment, const bool suppressItems) :
+Sigencore::TeamMember::TeamMember(const int speciesId, const QString& name, const int level, Containment* containment, const bool suppressItems) :
         Sigscript::Config(containment),
         m_containment(containment),
         m_id(QUuid::createUuid())
@@ -127,7 +127,7 @@ Sigbattle::TeamMember::TeamMember(const int speciesId, const QString& name, cons
     m_currentHp = statValue(Sigmod::ST_HP);
 }
 
-Sigbattle::TeamMember::TeamMember(Sigscript::MapTrainerTeamMemberWrapper* teamMember, Containment* containment) :
+Sigencore::TeamMember::TeamMember(Sigscript::MapTrainerTeamMemberWrapper* teamMember, Containment* containment) :
         Sigscript::Config(containment),
         m_containment(containment),
         m_id(QUuid::createUuid())
@@ -156,62 +156,62 @@ Sigbattle::TeamMember::TeamMember(Sigscript::MapTrainerTeamMemberWrapper* teamMe
     m_currentHp = statValue(Sigmod::ST_HP);
 }
 
-Sigbattle::Containment* Sigbattle::TeamMember::containment() const
+Sigencore::Containment* Sigencore::TeamMember::containment() const
 {
     return m_containment;
 }
 
-QUuid Sigbattle::TeamMember::id() const
+QUuid Sigencore::TeamMember::id() const
 {
     return m_id;
 }
 
-QString Sigbattle::TeamMember::name() const
+QString Sigencore::TeamMember::name() const
 {
     if (hasValueOfType<QString>("name"))
         return valueOfType<QString>("name");
     return m_name;
 }
 
-long long Sigbattle::TeamMember::currentHp() const
+long long Sigencore::TeamMember::currentHp() const
 {
     return m_currentHp;
 }
 
-Sigscript::SpeciesWrapper* Sigbattle::TeamMember::species() const
+Sigscript::SpeciesWrapper* Sigencore::TeamMember::species() const
 {
     if (hasValueOfType<Sigscript::SpeciesWrapper*>("species"))
         return valueOfType<Sigscript::SpeciesWrapper*>("species");
     return m_species;
 }
 
-int Sigbattle::TeamMember::level() const
+int Sigencore::TeamMember::level() const
 {
     return m_level;
 }
 
-Sigbattle::TeamMember::Gender Sigbattle::TeamMember::gender() const
+Sigencore::TeamMember::Gender Sigencore::TeamMember::gender() const
 {
     if (hasValueOfType<Gender>("gender"))
         return valueOfType<Gender>("gender");
     return m_gender;
 }
 
-long long Sigbattle::TeamMember::levelExperience() const
+long long Sigencore::TeamMember::levelExperience() const
 {
     if (hasValueOfType<long long>("levelExperience"))
         return valueOfType<long long>("levelExperience");
     return m_levelExp;
 }
 
-int Sigbattle::TeamMember::baseStat(const Sigmod::Stat stat) const
+int Sigencore::TeamMember::baseStat(const Sigmod::Stat stat) const
 {
     if (hasValueOfType<bool>("overrideBaseStats") && valueOfType<bool>("overrideBaseStats"))
         return species()->baseStat(stat);
     return m_species->baseStat(stat);
 }
 
-long long Sigbattle::TeamMember::statExperience(const Sigmod::Stat stat) const
+long long Sigencore::TeamMember::statExperience(const Sigmod::Stat stat) const
 {
     const QString valueName = QString("statExperience-%1").arg((sigmod()->rules()->specialSplit() ? Sigmod::StatGSCStr : Sigmod::StatRBYStr)[stat]);
     if (hasValueOfType<long long>(valueName))
@@ -219,7 +219,7 @@ long long Sigbattle::TeamMember::statExperience(const Sigmod::Stat stat) const
     return m_statExp[stat];
 }
 
-int Sigbattle::TeamMember::dv(const Sigmod::Stat stat) const
+int Sigencore::TeamMember::dv(const Sigmod::Stat stat) const
 {
     const QString valueName = QString("dv-%1").arg((sigmod()->rules()->specialSplit() ? Sigmod::StatGSCStr : Sigmod::StatRBYStr)[stat]);
     if (hasValueOfType<int>(valueName))
@@ -231,7 +231,7 @@ int Sigbattle::TeamMember::dv(const Sigmod::Stat stat) const
     return m_dv[stat];
 }
 
-long long Sigbattle::TeamMember::statValue(const Sigmod::Stat stat, const long long exp) const
+long long Sigencore::TeamMember::statValue(const Sigmod::Stat stat, const long long exp) const
 {
     long long statValue;
     if (exp < 0)
@@ -265,7 +265,7 @@ long long Sigbattle::TeamMember::statValue(const Sigmod::Stat stat, const long l
     return statValue;
 }
 
-long long Sigbattle::TeamMember::calcExp(int level) const
+long long Sigencore::TeamMember::calcExp(int level) const
 {
     if (level < 0)
         level = m_level;
@@ -314,7 +314,7 @@ long long Sigbattle::TeamMember::calcExp(int level) const
     return -1;
 }
 
-bool Sigbattle::TeamMember::canLearnMove(Sigscript::MoveWrapper* move) const
+bool Sigencore::TeamMember::canLearnMove(Sigscript::MoveWrapper* move) const
 {
     for (int i = 0; i < m_species->moveCount(); ++i)
     {
@@ -324,12 +324,12 @@ bool Sigbattle::TeamMember::canLearnMove(Sigscript::MoveWrapper* move) const
     return false;
 }
 
-long long Sigbattle::TeamMember::timer() const
+long long Sigencore::TeamMember::timer() const
 {
     return m_timer;
 }
 
-void Sigbattle::TeamMember::boostLevels(const int levels)
+void Sigencore::TeamMember::boostLevels(const int levels)
 {
     if ((m_level + levels) < sigmod()->rules()->maxLevel())
     {
@@ -338,7 +338,7 @@ void Sigbattle::TeamMember::boostLevels(const int levels)
     }
 }
 
-void Sigbattle::TeamMember::evolveInto(Sigscript::SpeciesWrapper* newSpecies)
+void Sigencore::TeamMember::evolveInto(Sigscript::SpeciesWrapper* newSpecies)
 {
     emit(evolveStart());
     int oldStats[Sigmod::ST_SpecialDefense - Sigmod::ST_HP + 1] = {};
@@ -385,7 +385,7 @@ void Sigbattle::TeamMember::evolveInto(Sigscript::SpeciesWrapper* newSpecies)
     emit(evolveEnd());
 }
 
-void Sigbattle::TeamMember::setName(const QString& name)
+void Sigencore::TeamMember::setName(const QString& name)
 {
     if (m_name != name)
     {
@@ -395,7 +395,7 @@ void Sigbattle::TeamMember::setName(const QString& name)
     }
 }
 
-void Sigbattle::TeamMember::cureStatus(Sigscript::StatusWrapper* status)
+void Sigencore::TeamMember::cureStatus(Sigscript::StatusWrapper* status)
 {
     if (m_status.contains(status))
     {
@@ -406,7 +406,7 @@ void Sigbattle::TeamMember::cureStatus(Sigscript::StatusWrapper* status)
     }
 }
 
-void Sigbattle::TeamMember::giveStatus(Sigscript::StatusWrapper* status)
+void Sigencore::TeamMember::giveStatus(Sigscript::StatusWrapper* status)
 {
     if (!m_status.contains(status))
     {
@@ -424,7 +424,7 @@ void Sigbattle::TeamMember::giveStatus(Sigscript::StatusWrapper* status)
     }
 }
 
-void Sigbattle::TeamMember::giveLevelExp(const int exp)
+void Sigencore::TeamMember::giveLevelExp(const int exp)
 {
     if (m_level == sigmod()->rules()->maxLevel())
         return;
@@ -442,7 +442,7 @@ void Sigbattle::TeamMember::giveLevelExp(const int exp)
     }
 }
 
-void Sigbattle::TeamMember::giveStatExp(const Sigmod::Stat stat, const int exp)
+void Sigencore::TeamMember::giveStatExp(const Sigmod::Stat stat, const int exp)
 {
     const int oldStat = statValue(stat);
     int expToGive = exp;
@@ -471,7 +471,7 @@ void Sigbattle::TeamMember::giveStatExp(const Sigmod::Stat stat, const int exp)
         emit(statChanged(stat, newStat));
 }
 
-void Sigbattle::TeamMember::takeItem(Sigscript::ItemWrapper* item)
+void Sigencore::TeamMember::takeItem(Sigscript::ItemWrapper* item)
 {
     if (m_items.contains(item))
     {
@@ -480,7 +480,7 @@ void Sigbattle::TeamMember::takeItem(Sigscript::ItemWrapper* item)
     }
 }
 
-void Sigbattle::TeamMember::giveItem(Sigscript::ItemWrapper* item)
+void Sigencore::TeamMember::giveItem(Sigscript::ItemWrapper* item)
 {
     if ((m_items.size() < sigmod()->rules()->maxHeldItems()) && checkWeight(item))
     {
@@ -489,7 +489,7 @@ void Sigbattle::TeamMember::giveItem(Sigscript::ItemWrapper* item)
     }
 }
 
-void Sigbattle::TeamMember::forgetMove(Sigscript::MoveWrapper* move)
+void Sigencore::TeamMember::forgetMove(Sigscript::MoveWrapper* move)
 {
     if (m_moves.contains(move))
     {
@@ -498,7 +498,7 @@ void Sigbattle::TeamMember::forgetMove(Sigscript::MoveWrapper* move)
     }
 }
 
-void Sigbattle::TeamMember::teachMove(Sigscript::MoveWrapper* move)
+void Sigencore::TeamMember::teachMove(Sigscript::MoveWrapper* move)
 {
     if (canLearnMove(move))
     {
@@ -512,14 +512,14 @@ void Sigbattle::TeamMember::teachMove(Sigscript::MoveWrapper* move)
     emit(unlearnableMove(move));
 }
 
-Sigbattle::TeamMember::Action Sigbattle::TeamMember::requestAction()
+Sigencore::TeamMember::Action Sigencore::TeamMember::requestAction()
 {
     Player* player = qobject_cast<Player*>(m_containment);
     m_lastAction = player ? player->requestAction(this) :  Action(Invalid, ActionData());
     return m_lastAction;
 }
 
-Sigbattle::TeamMember::Action Sigbattle::TeamMember::latestAction() const
+Sigencore::TeamMember::Action Sigencore::TeamMember::latestAction() const
 {
     return m_lastAction;
     Player* player = qobject_cast<Player*>(m_containment);
@@ -528,7 +528,7 @@ Sigbattle::TeamMember::Action Sigbattle::TeamMember::latestAction() const
     return Action(Invalid, ActionData());
 }
 
-void Sigbattle::TeamMember::makeActive(Arena* arena)
+void Sigencore::TeamMember::makeActive(Arena* arena)
 {
     m_timer = 0;
     QList<Sigscript::StatusWrapper*> statuses = m_status.uniqueKeys();
@@ -563,7 +563,7 @@ void Sigbattle::TeamMember::makeActive(Arena* arena)
     }
 }
 
-void Sigbattle::TeamMember::leaveArena()
+void Sigencore::TeamMember::leaveArena()
 {
     Kross::ActionCollection* collection = Kross::Manager::self().actionCollection()->collection("status");
     foreach (Kross::Action* action, m_statusBattleScripts)
@@ -573,28 +573,28 @@ void Sigbattle::TeamMember::leaveArena()
         collection->removeAction(action);
 }
 
-void Sigbattle::TeamMember::advanceTimer(const long long jump)
+void Sigencore::TeamMember::advanceTimer(const long long jump)
 {
     m_timer += jump;
 }
 
-void Sigbattle::TeamMember::writeBack()
+void Sigencore::TeamMember::writeBack()
 {
     // TODO: write back all (applicable) differences between config and local storage
 }
 
-Sigscript::SigmodWrapper* Sigbattle::TeamMember::sigmod() const
+Sigscript::SigmodWrapper* Sigencore::TeamMember::sigmod() const
 {
     return m_containment->sigmod();
 }
 
-void Sigbattle::TeamMember::setSpecies(Sigscript::SpeciesWrapper* species)
+void Sigencore::TeamMember::setSpecies(Sigscript::SpeciesWrapper* species)
 {
     m_species = species;
     emit(speciesChanged(m_species));
 }
 
-void Sigbattle::TeamMember::setLevel(const int level)
+void Sigencore::TeamMember::setLevel(const int level)
 {
     emit(levelAboutToGrow());
     m_level = level;
@@ -602,7 +602,7 @@ void Sigbattle::TeamMember::setLevel(const int level)
     m_levelExp = calcExp();
 }
 
-void Sigbattle::TeamMember::levelGrown()
+void Sigencore::TeamMember::levelGrown()
 {
     for (int i = 0; i < m_species->moveCount(); ++i)
     {
@@ -612,7 +612,7 @@ void Sigbattle::TeamMember::levelGrown()
     }
 }
 
-bool Sigbattle::TeamMember::checkWeight(const Sigscript::ItemWrapper* item)
+bool Sigencore::TeamMember::checkWeight(const Sigscript::ItemWrapper* item)
 {
     int totalWeight = item->weight();
     foreach (Sigscript::ItemWrapper* item, m_items)
@@ -620,12 +620,12 @@ bool Sigbattle::TeamMember::checkWeight(const Sigscript::ItemWrapper* item)
     return (totalWeight <= species()->maxHoldWeight());
 }
 
-void Sigbattle::TeamMember::makeConnections()
+void Sigencore::TeamMember::makeConnections()
 {
     // TODO: make connections that are necessary (watching Config changes mainly)
 }
 
-void Sigbattle::TeamMember::initAbility(Sigscript::AbilityWrapper* ability)
+void Sigencore::TeamMember::initAbility(Sigscript::AbilityWrapper* ability)
 {
     const Sigcore::Script script = ability->battleScript();
     if (!script.script().isEmpty())
@@ -639,7 +639,7 @@ void Sigbattle::TeamMember::initAbility(Sigscript::AbilityWrapper* ability)
     }
 }
 
-void Sigbattle::TeamMember::initItems()
+void Sigencore::TeamMember::initItems()
 {
     Sigcore::Hat<Sigscript::ItemWrapper*> hat = m_species->itemHat();
     for (int i = 0; i < sigmod()->rules()->maxHeldItems(); ++i)
@@ -653,7 +653,7 @@ void Sigbattle::TeamMember::initItems()
     }
 }
 
-void Sigbattle::TeamMember::initAbilities(const QList<Sigscript::AbilityWrapper*>& initial)
+void Sigencore::TeamMember::initAbilities(const QList<Sigscript::AbilityWrapper*>& initial)
 {
     foreach (Sigscript::AbilityWrapper* ability, initial)
         initAbility(ability);
@@ -666,7 +666,7 @@ void Sigbattle::TeamMember::initAbilities(const QList<Sigscript::AbilityWrapper*
     }
 }
 
-void Sigbattle::TeamMember::initMoves(const QList<Sigscript::MoveWrapper*>& initial)
+void Sigencore::TeamMember::initMoves(const QList<Sigscript::MoveWrapper*>& initial)
 {
     m_moves = initial;
     for (int i = 0; (i < m_species->moveCount()) && (m_moves.size() < sigmod()->rules()->maxMoves()); ++i)
@@ -677,7 +677,7 @@ void Sigbattle::TeamMember::initMoves(const QList<Sigscript::MoveWrapper*>& init
     }
 }
 
-void Sigbattle::TeamMember::initNatures(const QList<Sigscript::NatureWrapper*>& initial)
+void Sigencore::TeamMember::initNatures(const QList<Sigscript::NatureWrapper*>& initial)
 {
     m_natures = initial;
     Sigcore::Hat<Sigscript::NatureWrapper*> hat = sigmod()->natureHat();
@@ -689,7 +689,7 @@ void Sigbattle::TeamMember::initNatures(const QList<Sigscript::NatureWrapper*>&
     }
 }
 
-void Sigbattle::TeamMember::initStats()
+void Sigencore::TeamMember::initStats()
 {
     if (sigmod()->rules()->specialDVSplit())
     {
diff --git a/sigencore/TeamMember.h b/sigencore/TeamMember.h
index 72b82dd6..8324b113 100644
--- a/sigencore/TeamMember.h
+++ b/sigencore/TeamMember.h
@@ -15,10 +15,10 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGBATTLE_TEAMMEMBER
-#define SIGBATTLE_TEAMMEMBER
+#ifndef SIGENCORE_TEAMMEMBER
+#define SIGENCORE_TEAMMEMBER
 
-// Sigbattle includes
+// Sigencore includes
 #include "Global.h"
 
 // Sigscript includes
@@ -54,12 +54,12 @@ namespace Kross
 class Action;
 }
 
-namespace Sigbattle
+namespace Sigencore
 {
 class Arena;
 class Containment;
 
-class SIGBATTLE_EXPORT TeamMember : public Sigscript::Config
+class SIGENCORE_EXPORT TeamMember : public Sigscript::Config
 {
     Q_OBJECT
     
@@ -206,15 +206,15 @@ class SIGBATTLE_EXPORT TeamMember : public Sigscript::Config
         void levelGrown();
 };
 
-SIGBATTLE_EXPORT int actionPriority(TeamMember* teamMember, const TeamMember::Action& action);
+SIGENCORE_EXPORT int actionPriority(TeamMember* teamMember, const TeamMember::Action& action);
 
 }
-Q_DECLARE_METATYPE(Sigbattle::TeamMember*)
-Q_DECLARE_METATYPE(Sigbattle::TeamMember::Gender)
-Q_DECLARE_METATYPE(Sigbattle::TeamMember::ActionType)
-Q_DECLARE_METATYPE(Sigbattle::TeamMember::Targets)
-Q_DECLARE_METATYPE(Sigbattle::TeamMember::ActionData)
-Q_DECLARE_METATYPE(Sigbattle::TeamMember::Action)
-Q_DECLARE_METATYPE(Sigbattle::TeamMember::RequestedAction)
+Q_DECLARE_METATYPE(Sigencore::TeamMember*)
+Q_DECLARE_METATYPE(Sigencore::TeamMember::Gender)
+Q_DECLARE_METATYPE(Sigencore::TeamMember::ActionType)
+Q_DECLARE_METATYPE(Sigencore::TeamMember::Targets)
+Q_DECLARE_METATYPE(Sigencore::TeamMember::ActionData)
+Q_DECLARE_METATYPE(Sigencore::TeamMember::Action)
+Q_DECLARE_METATYPE(Sigencore::TeamMember::RequestedAction)
 
 #endif