[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

5 files changed, 24 insertions, 23 deletions

diff --git a/sigbattle/Arena.cpp b/sigbattle/Arena.cpp
index 212f9eee..ab4ea4d4 100644
--- a/sigbattle/Arena.cpp
+++ b/sigbattle/Arena.cpp
@@ -27,9 +27,9 @@
 #include "../sigscript/SigmodWrapper.h"
 #include "../sigscript/SpeciesWrapper.h"
 
-// Sigmod includes
-// #include "../sigmod/Fraction.h"
-#include "../sigmod/Script.h"
+// Sigcore includes
+// #include "../sigcore/Fraction.h"
+#include "../sigcore/Script.h"
 
 // KDE includes
 #include <kross/core/action.h>
@@ -95,7 +95,7 @@ Sigscript::SigmodWrapper* Sigbattle::Arena::sigmod() const
     return m_sigmod;
 }
 
-void Sigbattle::Arena::registerScript(const Sigmod::Script& script)
+void Sigbattle::Arena::registerScript(const Sigcore::Script& script)
 {
     if (!script.script().isEmpty())
     {
@@ -129,7 +129,7 @@ void Sigbattle::Arena::handleAction(TeamMember* teamMember, TeamMember::Action a
             Sigscript::MoveWrapper* move = sigmod()->move(data.first.toInt());
             if (move)
             {
-                const Sigmod::Script script = move->battleScript();
+                const Sigcore::Script script = move->battleScript();
                 if (!script.script().isEmpty())
                 {
                     Kross::Action* kaction = new Kross::Action(m_actions, QUuid::createUuid().toString());
@@ -149,7 +149,7 @@ void Sigbattle::Arena::handleAction(TeamMember* teamMember, TeamMember::Action a
             Sigscript::ItemWrapper* item = sigmod()->item(data.first.toInt());
             if (item)
             {
-                const Sigmod::Script script = item->script();
+                const Sigcore::Script script = item->script();
                 if (!script.script().isEmpty())
                 {
                     Kross::Action* kaction = new Kross::Action(m_actions, QUuid::createUuid().toString());
diff --git a/sigbattle/Arena.h b/sigbattle/Arena.h
index 54802d26..62298ddc 100644
--- a/sigbattle/Arena.h
+++ b/sigbattle/Arena.h
@@ -36,7 +36,7 @@ namespace Kross
 class Action;
 class ActionCollection;
 }
-namespace Sigmod
+namespace Sigcore
 {
 class Script;
 }
@@ -66,7 +66,7 @@ class SIGBATTLE_EXPORT Arena : public Sigscript::Config
 //         void addClient(Client* client);
 //         void removeClient(Client* client);
         
-        void registerScript(const Sigmod::Script& script);
+        void registerScript(const Sigcore::Script& script);
     signals:
         void battleStart();
         void battleEnd();
diff --git a/sigbattle/CMakeLists.txt b/sigbattle/CMakeLists.txt
index 1b1b40b8..f5034973 100644
--- a/sigbattle/CMakeLists.txt
+++ b/sigbattle/CMakeLists.txt
@@ -44,6 +44,7 @@ TARGET_LINK_LIBRARIES(sigbattle
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}
     ${KDE4_KROSSCORE_LIBRARY}
+    sigcore
     sigmod
     sigscript
 )
diff --git a/sigbattle/TeamMember.cpp b/sigbattle/TeamMember.cpp
index c7ce437a..7bdff1d8 100644
--- a/sigbattle/TeamMember.cpp
+++ b/sigbattle/TeamMember.cpp
@@ -37,8 +37,8 @@
 #include "../sigscript/SpeciesItemWrapper.h"
 #include "../sigscript/SpeciesMoveWrapper.h"
 
-// Sigmod includes
-#include "../sigmod/Hat.h"
+// Sigcore includes
+#include "../sigcore/Hat.h"
 
 // KDE includes
 #include <kross/core/action.h>
@@ -116,7 +116,7 @@ Sigbattle::TeamMember::TeamMember(const int speciesId, const QString& name, cons
         m_statExp[i] = 0;
     if (m_containment->isMutable())
     {
-        const Sigmod::Script script = m_species->evolution();
+        const Sigcore::Script script = m_species->evolution();
         if (!script.script().isEmpty())
         {
             Kross::Action* evolution = new Kross::Action(Kross::Manager::self().actionCollection()->collection("evolutions"), QUuid::createUuid().toString());
@@ -253,7 +253,7 @@ long long Sigbattle::TeamMember::statValue(const Sigmod::Stat stat, const long l
     else
     {
         statValue += 5;
-        Sigmod::Fraction multiplier;
+        Sigcore::Fraction multiplier;
         foreach (Sigscript::NatureWrapper* nature, m_natures)
             multiplier *= nature->stat(stat);
         statValue *= multiplier;
@@ -406,7 +406,7 @@ void Sigbattle::TeamMember::giveStatus(Sigscript::StatusWrapper* status)
 {
     if (!m_status.contains(status))
     {
-        const Sigmod::Script script = status->worldScript();
+        const Sigcore::Script script = status->worldScript();
         if (!script.script().isEmpty())
         {
             Kross::Action* statusAction = new Kross::Action(Kross::Manager::self().actionCollection()->collection("status"), QUuid::createUuid().toString());
@@ -530,7 +530,7 @@ void Sigbattle::TeamMember::makeActive(Arena* arena)
     QList<Sigscript::StatusWrapper*> statuses = m_status.uniqueKeys();
     foreach (Sigscript::StatusWrapper* status, statuses)
     {
-        const Sigmod::Script script = status->battleScript();
+        const Sigcore::Script script = status->battleScript();
         if (!script.script().isEmpty())
         {
             Kross::Action* action = new Kross::Action(Kross::Manager::self().actionCollection()->collection("status"), QUuid::createUuid().toString());
@@ -545,7 +545,7 @@ void Sigbattle::TeamMember::makeActive(Arena* arena)
     QList<Sigscript::AbilityWrapper*> abilities = m_abilities.keys();
     foreach (Sigscript::AbilityWrapper* ability, abilities)
     {
-        const Sigmod::Script script = ability->battleScript();
+        const Sigcore::Script script = ability->battleScript();
         if (!script.script().isEmpty())
         {
             Kross::Action* action = new Kross::Action(Kross::Manager::self().actionCollection()->collection("ability"), QUuid::createUuid().toString());
@@ -623,7 +623,7 @@ void Sigbattle::TeamMember::makeConnections()
 
 void Sigbattle::TeamMember::initAbility(Sigscript::AbilityWrapper* ability)
 {
-    const Sigmod::Script script = ability->battleScript();
+    const Sigcore::Script script = ability->battleScript();
     if (!script.script().isEmpty())
     {
         Kross::Action* action = new Kross::Action(Kross::Manager::self().actionCollection()->collection("ability"), QUuid::createUuid().toString());
@@ -637,7 +637,7 @@ void Sigbattle::TeamMember::initAbility(Sigscript::AbilityWrapper* ability)
 
 void Sigbattle::TeamMember::initItems()
 {
-    Sigmod::Hat<Sigscript::ItemWrapper*> hat = m_species->itemHat();
+    Sigcore::Hat<Sigscript::ItemWrapper*> hat = m_species->itemHat();
     for (int i = 0; i < sigmod()->rules()->maxHeldItems(); ++i)
     {
         if (m_species->itemChance().poll())
@@ -653,7 +653,7 @@ void Sigbattle::TeamMember::initAbilities(const QList<Sigscript::AbilityWrapper*
 {
     foreach (Sigscript::AbilityWrapper* ability, initial)
         initAbility(ability);
-    Sigmod::Hat<Sigscript::AbilityWrapper*> hat = m_species->abilityHat();
+    Sigcore::Hat<Sigscript::AbilityWrapper*> hat = m_species->abilityHat();
     while (m_abilities.size() < sigmod()->rules()->maxAbilities())
     {
         Sigscript::AbilityWrapper* ability = hat.takeAndClear();
@@ -676,7 +676,7 @@ void Sigbattle::TeamMember::initMoves(const QList<Sigscript::MoveWrapper*>& init
 void Sigbattle::TeamMember::initNatures(const QList<Sigscript::NatureWrapper*>& initial)
 {
     m_natures = initial;
-    Sigmod::Hat<Sigscript::NatureWrapper*> hat = sigmod()->natureHat();
+    Sigcore::Hat<Sigscript::NatureWrapper*> hat = sigmod()->natureHat();
     while (m_natures.size() < sigmod()->rules()->maxNatures())
     {
         Sigscript::NatureWrapper* nature = hat.takeAndClear();
diff --git a/sigbattle/TurnArena.cpp b/sigbattle/TurnArena.cpp
index 3542298c..0efe76b6 100644
--- a/sigbattle/TurnArena.cpp
+++ b/sigbattle/TurnArena.cpp
@@ -18,8 +18,8 @@
 // Header include
 #include "TurnArena.h"
 
-// Sigmod includes
-#include "../sigmod/Fraction.h"
+// Sigcore includes
+#include "../sigcore/Fraction.h"
 
 // Sigscript includes
 #include "../sigscript/MoveWrapper.h"
@@ -50,7 +50,7 @@ bool Sigbattle::sortActions(const TeamMember::RequestedAction& reqAction1, const
         if (speed1 < speed2)
             return true;
         else if (speed1 == speed2)
-            return Sigmod::Fraction::poll(1, 2);
+            return Sigcore::Fraction::poll(1, 2);
     }
     return false;
 }
@@ -88,7 +88,7 @@ void Sigbattle::TurnArena::processRound()
         if (action.first == TeamMember::Attack)
         {
             Sigscript::MoveWrapper* move = sigmod()->move(action.second.first.toInt());
-            const Sigmod::Script script = move->priorityScript();
+            const Sigcore::Script script = move->priorityScript();
             if (!script.script().isEmpty())
             {
                 Kross::Action* kaction = new Kross::Action(m_actions, QUuid::createUuid().toString());