diff options
133 files changed, 601 insertions, 447 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c52b55b1..e0820a13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,20 +33,27 @@ LINK_DIRECTORIES( ${LIBRARY_OUTPUT_PATH} ) +ADD_SUBDIRECTORY(sigcore) ADD_SUBDIRECTORY(sigmod) ADD_SUBDIRECTORY(sigscript) ADD_SUBDIRECTORY(signet) ADD_SUBDIRECTORY(sigbattle) ADD_SUBDIRECTORY(sigmodr) +ADD_DEPENDENCIES(sigmod + sigcore +) ADD_DEPENDENCIES(sigscript + sigcore sigmod ) ADD_DEPENDENCIES(sigbattle + sigcore sigscript signet ) ADD_DEPENDENCIES(sigmodr + sigcore sigmod ) @@ -1,4 +1,11 @@ ----------------- +Rev: 281 +Date: 17 October 2008 +User: MathStuf +----------------- +[FIX] Moved Hat, Fraction, Matrix, and Script to sigcore + +----------------- Rev: 280 Date: 17 October 2008 User: MathStuf 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()); diff --git a/sigcore/CMakeLists.txt b/sigcore/CMakeLists.txt new file mode 100644 index 00000000..6cee90ee --- /dev/null +++ b/sigcore/CMakeLists.txt @@ -0,0 +1,51 @@ +PROJECT(sigcore) + +IF (NOT SIGEN_VERSION) + MESSAGE(FATAL_ERROR "Sigen version is not defined") +ENDIF (NOT SIGEN_VERSION) + +SET(sigcore_HEADERS + Fraction.h + Global.h + Hat.h + Matrix.h + Script.h +) +SET(sigcore_SRCS + Fraction.cpp + Script.cpp +) + +KDE4_ADD_LIBRARY(sigcore + SHARED + ${sigcore_SRCS} +) +SET_TARGET_PROPERTIES(sigcore + PROPERTIES + VERSION ${SIGEN_VERSION} + SOVERSION ${SIGEN_SOVERSION} + LINK_INTERFACE_LIBRARIES "" +) +TARGET_LINK_LIBRARIES(sigcore + ${QT_QTCORE_LIBRARY} +) + +INCLUDE(../doxygen.cmake) + +INSTALL( + TARGETS + sigcore + DESTINATION + ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} + COMPONENT + runtime +) + +INSTALL( + FILES + ${sigcore_HEADERS} + DESTINATION + ${CMAKE_INSTALL_PREFIX}/include/${CMAKE_PROJECT_NAME}/${PROJECT_NAME} + COMPONENT + development +) diff --git a/sigmod/Fraction.cpp b/sigcore/Fraction.cpp index c27c2e6e..f5e5e3a3 100644 --- a/sigmod/Fraction.cpp +++ b/sigcore/Fraction.cpp @@ -16,50 +16,50 @@ */ /** - * \file sigmod/Fraction.cpp + * \file sigcore/Fraction.cpp */ // Header include #include "Fraction.h" -Sigmod::Fraction::Fraction(const int numerator, const int denominator) +Sigcore::Fraction::Fraction(const int numerator, const int denominator) { set(numerator, denominator); } -Sigmod::Fraction::Fraction(const Fraction& fraction) +Sigcore::Fraction::Fraction(const Fraction& fraction) { set(fraction.numerator(), fraction.denominator()); } -void Sigmod::Fraction::set(const int numerator, const int denominator) +void Sigcore::Fraction::set(const int numerator, const int denominator) { m_numerator = numerator; m_denominator = denominator; normalize(); } -void Sigmod::Fraction::setNumerator(const int numerator) +void Sigcore::Fraction::setNumerator(const int numerator) { set(numerator, m_denominator); } -void Sigmod::Fraction::setDenominator(const int denominator) +void Sigcore::Fraction::setDenominator(const int denominator) { set(m_numerator, denominator); } -int Sigmod::Fraction::numerator() const +int Sigcore::Fraction::numerator() const { return m_numerator; } -int Sigmod::Fraction::denominator() const +int Sigcore::Fraction::denominator() const { return m_denominator; } -void Sigmod::Fraction::reduce() +void Sigcore::Fraction::reduce() { if (!m_numerator || !m_denominator) return; @@ -73,17 +73,17 @@ void Sigmod::Fraction::reduce() m_denominator /= i; } -bool Sigmod::Fraction::poll() const +bool Sigcore::Fraction::poll() const { return (qrand() % m_denominator) < m_numerator; } -bool Sigmod::Fraction::poll(const int numerator, const int denominator) +bool Sigcore::Fraction::poll(const int numerator, const int denominator) { return (qrand() % denominator) < numerator; } -Sigmod::Fraction& Sigmod::Fraction::operator=(const Fraction& rhs) +Sigcore::Fraction& Sigcore::Fraction::operator=(const Fraction& rhs) { if (this == &rhs) return *this; @@ -92,82 +92,82 @@ Sigmod::Fraction& Sigmod::Fraction::operator=(const Fraction& rhs) return *this; } -Sigmod::Fraction::operator double() const +Sigcore::Fraction::operator double() const { return (double(m_numerator) / m_denominator); } -Sigmod::Fraction Sigmod::Fraction::operator+(const Fraction& rhs) const +Sigcore::Fraction Sigcore::Fraction::operator+(const Fraction& rhs) const { return Fraction((m_numerator * rhs.m_denominator) + (m_denominator * rhs.m_numerator), m_denominator * rhs.m_denominator); } -Sigmod::Fraction Sigmod::Fraction::operator-(const Fraction& rhs) const +Sigcore::Fraction Sigcore::Fraction::operator-(const Fraction& rhs) const { return Fraction((m_numerator * rhs.m_denominator) - (m_denominator * rhs.m_numerator), m_denominator * rhs.m_denominator); } -Sigmod::Fraction Sigmod::Fraction::operator*(const Fraction& rhs) const +Sigcore::Fraction Sigcore::Fraction::operator*(const Fraction& rhs) const { return Fraction(m_numerator * rhs.m_numerator, m_denominator * rhs.m_denominator); } -Sigmod::Fraction Sigmod::Fraction::operator/(const Fraction& rhs) const +Sigcore::Fraction Sigcore::Fraction::operator/(const Fraction& rhs) const { return Fraction(m_numerator * rhs.m_denominator, m_denominator * rhs.m_numerator); } -Sigmod::Fraction& Sigmod::Fraction::operator+=(const Fraction& rhs) +Sigcore::Fraction& Sigcore::Fraction::operator+=(const Fraction& rhs) { return *this = *this + rhs; } -Sigmod::Fraction& Sigmod::Fraction::operator-=(const Fraction& rhs) +Sigcore::Fraction& Sigcore::Fraction::operator-=(const Fraction& rhs) { return *this = *this - rhs; } -Sigmod::Fraction& Sigmod::Fraction::operator*=(const Fraction& rhs) +Sigcore::Fraction& Sigcore::Fraction::operator*=(const Fraction& rhs) { return *this = *this * rhs; } -Sigmod::Fraction& Sigmod::Fraction::operator/=(const Fraction& rhs) +Sigcore::Fraction& Sigcore::Fraction::operator/=(const Fraction& rhs) { return *this = *this / rhs; } -bool Sigmod::Fraction::operator==(const Fraction& rhs) const +bool Sigcore::Fraction::operator==(const Fraction& rhs) const { return ((m_numerator * rhs.m_denominator) == (m_denominator * rhs.m_numerator)); } -bool Sigmod::Fraction::operator!=(const Fraction& rhs) const +bool Sigcore::Fraction::operator!=(const Fraction& rhs) const { return !(*this == rhs); } -bool Sigmod::Fraction::operator<(const Fraction& rhs) const +bool Sigcore::Fraction::operator<(const Fraction& rhs) const { return ((m_numerator * rhs.m_denominator) < (m_denominator * rhs.m_numerator)); } -bool Sigmod::Fraction::operator<=(const Fraction& rhs) const +bool Sigcore::Fraction::operator<=(const Fraction& rhs) const { return ((m_numerator * rhs.m_denominator) <= (m_denominator * rhs.m_numerator)); } -bool Sigmod::Fraction::operator>(const Fraction& rhs) const +bool Sigcore::Fraction::operator>(const Fraction& rhs) const { return !(*this <= rhs); } -bool Sigmod::Fraction::operator>=(const Fraction& rhs) const +bool Sigcore::Fraction::operator>=(const Fraction& rhs) const { return !(*this < rhs); } -void Sigmod::Fraction::normalize() +void Sigcore::Fraction::normalize() { if (m_denominator < 0) { diff --git a/sigmod/Fraction.h b/sigcore/Fraction.h index 7dd861ea..1b171303 100644 --- a/sigmod/Fraction.h +++ b/sigcore/Fraction.h @@ -16,27 +16,27 @@ */ /** - * \file sigmod/Fraction.h + * \file sigcore/Fraction.h */ -#ifndef SIGMOD_FRACTION -#define SIGMOD_FRACTION +#ifndef SIGCORE_FRACTION +#define SIGCORE_FRACTION -// Sigmod includes +// Sigcore includes #include "Global.h" // Qt includes #include <QtCore/QMetaType> -namespace Sigmod +namespace Sigcore { /** - * \class Sigmod::Fraction Fraction.h sigmod/Fraction.h + * \class Sigcore::Fraction Fraction.h sigcore/Fraction.h * \brief Class that represents a fractional quantity. * * This class should be used in place of \p double because of accuracy. */ -class SIGMOD_EXPORT Fraction +class SIGCORE_EXPORT Fraction { public: /** @@ -126,6 +126,6 @@ class SIGMOD_EXPORT Fraction int m_denominator; }; } -Q_DECLARE_METATYPE(Sigmod::Fraction) +Q_DECLARE_METATYPE(Sigcore::Fraction) #endif diff --git a/sigcore/Global.h b/sigcore/Global.h new file mode 100644 index 00000000..db7ee0e0 --- /dev/null +++ b/sigcore/Global.h @@ -0,0 +1,44 @@ +/* + * Copyright 2008 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/>. + */ + +/** + * \file sigcore/Global.h + */ + +#ifndef SIGCORE_GLOBAL +#define SIGCORE_GLOBAL + +// Qt includes +#include <QtCore/QMetaType> +#include <QtCore/QStringList> + +// KDE includes +#include <kdemacros.h> + +#ifndef SIGCORE_EXPORT +# ifdef MAKE_SIGCORE_LIB +# define SIGCORE_EXPORT KDE_EXPORT /// Export the symbol if building the library. +# else +# define SIGCORE_EXPORT KDE_IMPORT /// Import the symbol if including the library. +# endif +#endif + +#ifndef SIGCORE_EXPORT_DEPRECATED +# define SIGCORE_EXPORT_DEPRECATED KDE_DEPRECATED SIGCORE_EXPORT /// Mark as deprecated +#endif + +#endif diff --git a/sigmod/Hat.h b/sigcore/Hat.h index 1b8facdf..999dbbe9 100644 --- a/sigmod/Hat.h +++ b/sigcore/Hat.h @@ -16,13 +16,13 @@ */ /** - * \file sigmod/Hat.h + * \file sigcore/Hat.h */ -#ifndef SIGMOD_HAT -#define SIGMOD_HAT +#ifndef SIGCORE_HAT +#define SIGCORE_HAT -// Sigmod includes +// Sigcore includes #include "Fraction.h" #include "Global.h" @@ -30,15 +30,15 @@ #include <QtCore/QtGlobal> #include <QtCore/QMap> -namespace Sigmod +namespace Sigcore { /** - * \class Sigmod::Hat Hat.h sigmod/Hat.h + * \class Sigcore::Hat Hat.h sigcore/Hat.h * \brief Class to help choose items from a weighted set of items. * * Given a set of weighted items to choose from, Hat will pick out a random item from the set. */ -template<class T> class Hat +template<class T> class SIGCORE_EXPORT Hat { public: /** diff --git a/sigmod/Matrix.h b/sigcore/Matrix.h index 1338001d..e8f1f816 100644 --- a/sigmod/Matrix.h +++ b/sigcore/Matrix.h @@ -16,11 +16,11 @@ */ /** - * \file sigmod/Matrix.h + * \file sigcore/Matrix.h */ -#ifndef SIGMOD_MATRIX -#define SIGMOD_MATRIX +#ifndef SIGCORE_MATRIX +#define SIGCORE_MATRIX // Sigmod includes #include "Global.h" @@ -29,13 +29,13 @@ #include <QtCore/QPoint> #include <QtCore/QVector> -namespace Sigmod +namespace Sigcore { /** - * \class Sigmod::Matrix Matrix.h sigmod/Matrix.h + * \class Sigcore::Matrix Matrix.h sigcore/Matrix.h * \brief Class for a two dimensional vector. */ -template<class T> class SIGMOD_EXPORT Matrix +template<class T> class SIGCORE_EXPORT Matrix { public: /** diff --git a/sigmod/Script.cpp b/sigcore/Script.cpp index 55dc02b0..47ae55d2 100644 --- a/sigmod/Script.cpp +++ b/sigcore/Script.cpp @@ -16,39 +16,39 @@ */ /** - * \file sigmod/Script.cpp + * \file sigcore/Script.cpp */ // Header include #include "Script.h" -Sigmod::Script::Script(const QString& interpreter, const QString& script) : +Sigcore::Script::Script(const QString& interpreter, const QString& script) : m_interpreter(interpreter), m_script(script) { } -void Sigmod::Script::setInterpreter(const QString& interpreter) +void Sigcore::Script::setInterpreter(const QString& interpreter) { m_interpreter = interpreter; } -void Sigmod::Script::setScript(const QString& script) +void Sigcore::Script::setScript(const QString& script) { m_script = script; } -QString Sigmod::Script::interpreter() const +QString Sigcore::Script::interpreter() const { return m_interpreter; } -QString Sigmod::Script::script() const +QString Sigcore::Script::script() const { return m_script; } -Sigmod::Script& Sigmod::Script::operator=(const Script& rhs) +Sigcore::Script& Sigcore::Script::operator=(const Script& rhs) { if (this == &rhs) return *this; @@ -57,12 +57,12 @@ Sigmod::Script& Sigmod::Script::operator=(const Script& rhs) return *this; } -bool Sigmod::Script::operator==(const Script& rhs) const +bool Sigcore::Script::operator==(const Script& rhs) const { return ((m_interpreter == rhs.m_interpreter) && (m_script == rhs.m_script)); } -bool Sigmod::Script::operator!=(const Script& rhs) const +bool Sigcore::Script::operator!=(const Script& rhs) const { return !(*this == rhs); } diff --git a/sigmod/Script.h b/sigcore/Script.h index 13c09aac..0cc51586 100644 --- a/sigmod/Script.h +++ b/sigcore/Script.h @@ -16,11 +16,11 @@ */ /** - * \file sigmod/Script.h + * \file sigcore/Script.h */ -#ifndef SIGMOD_SCRIPT -#define SIGMOD_SCRIPT +#ifndef SIGCORE_SCRIPT +#define SIGCORE_SCRIPT // Sigmod includes #include "Global.h" @@ -28,13 +28,13 @@ // Qt includes #include <QtCore/QString> -namespace Sigmod +namespace Sigcore { /** - * \class Sigmod::Script Script.h sigmod/Script.h + * \class Sigcore::Script Script.h sigcore/Script.h * \brief Class that describes a script for the game engine. */ -class SIGMOD_EXPORT Script +class SIGCORE_EXPORT Script { public: /** @@ -89,6 +89,6 @@ class SIGMOD_EXPORT Script QString m_script; }; } -Q_DECLARE_METATYPE(Sigmod::Script) +Q_DECLARE_METATYPE(Sigcore::Script) #endif diff --git a/sigmod/Ability.cpp b/sigmod/Ability.cpp index 1296418f..5b4108c0 100644 --- a/sigmod/Ability.cpp +++ b/sigmod/Ability.cpp @@ -102,17 +102,17 @@ void Sigmod::Ability::setDescription(const QString& description) CHECK(description); } -void Sigmod::Ability::setBattleScript(const Script& battleScript) +void Sigmod::Ability::setBattleScript(const Sigcore::Script& battleScript) { CHECK(battleScript); } -void Sigmod::Ability::setWorldScript(const Script& worldScript) +void Sigmod::Ability::setWorldScript(const Sigcore::Script& worldScript) { CHECK(worldScript); } -void Sigmod::Ability::setPriorityScript(const Script& priorityScript) +void Sigmod::Ability::setPriorityScript(const Sigcore::Script& priorityScript) { CHECK(priorityScript); } @@ -132,17 +132,17 @@ QString Sigmod::Ability::description() const return m_description; } -Sigmod::Script Sigmod::Ability::battleScript() const +Sigcore::Script Sigmod::Ability::battleScript() const { return m_battleScript; } -Sigmod::Script Sigmod::Ability::worldScript() const +Sigcore::Script Sigmod::Ability::worldScript() const { return m_worldScript; } -Sigmod::Script Sigmod::Ability::priorityScript() const +Sigcore::Script Sigmod::Ability::priorityScript() const { return m_priorityScript; } diff --git a/sigmod/Ability.h b/sigmod/Ability.h index 8eae68af..e9c84d7c 100644 --- a/sigmod/Ability.h +++ b/sigmod/Ability.h @@ -22,9 +22,11 @@ #ifndef SIGMOD_ABILITY #define SIGMOD_ABILITY +// Sigcore includes +#include "../sigcore/Script.h" + // Sigmod includes #include "Object.h" -#include "Script.h" namespace Sigmod { @@ -126,7 +128,7 @@ class SIGMOD_EXPORT Ability : public Object * * \param battleScript The script for the ability when in battle. */ - void setBattleScript(const Script& battleScript); + void setBattleScript(const Sigcore::Script& battleScript); /** * Set the script for the ability when on the world map. This script defines the behavior of the ability when on the world map. * The following objects are available: @@ -138,7 +140,7 @@ class SIGMOD_EXPORT Ability : public Object * * \param worldScript The script for the ability when on the world map. */ - void setWorldScript(const Script& worldScript); + void setWorldScript(const Sigcore::Script& worldScript); /** * Set the script that determines the priority of the ability. This script allows the ability to change its priority based on what * is happening in the \link Sigbattle::Arena arena \endlink. The following objects are available: @@ -153,7 +155,7 @@ class SIGMOD_EXPORT Ability : public Object * * \param priorityScript The script that determines the priority of the ability. */ - void setPriorityScript(const Script& priorityScript); + void setPriorityScript(const Sigcore::Script& priorityScript); /** * \sa setName @@ -178,28 +180,28 @@ class SIGMOD_EXPORT Ability : public Object * * \return The script that controls the ability in battle. */ - Script battleScript() const; + Sigcore::Script battleScript() const; /** * \sa setWorldScript * * \return The script that controls the ability on the world map. */ - Script worldScript() const; + Sigcore::Script worldScript() const; /** * \sa setPriorityScript * * \return The script that changes the priority when necessary. */ - Script priorityScript() const; + Sigcore::Script priorityScript() const; Ability& operator=(const Ability& rhs); private: QString m_name; int m_priority; QString m_description; - Script m_battleScript; - Script m_worldScript; - Script m_priorityScript; + Sigcore::Script m_battleScript; + Sigcore::Script m_worldScript; + Sigcore::Script m_priorityScript; }; } diff --git a/sigmod/Badge.cpp b/sigmod/Badge.cpp index 8a050520..d70833ca 100644 --- a/sigmod/Badge.cpp +++ b/sigmod/Badge.cpp @@ -126,7 +126,7 @@ void Sigmod::Badge::setObey(const int obey) CHECK(obey); } -void Sigmod::Badge::setStat(const Stat stat, const Fraction& multiplier) +void Sigmod::Badge::setStat(const Stat stat, const Sigcore::Fraction& multiplier) { if (multiplier < 1) { @@ -146,7 +146,7 @@ void Sigmod::Badge::setStat(const Stat stat, const Fraction& multiplier) CHECK_ARRAY(stat[stat - ST_Attack], multiplier); } -void Sigmod::Badge::setStat(const Fraction& multiplier) +void Sigmod::Badge::setStat(const Sigcore::Fraction& multiplier) { if (multiplier < 1) emit(error(bounds("stat multiplier"))); @@ -172,7 +172,7 @@ int Sigmod::Badge::obey() const return m_obey; } -Sigmod::Fraction Sigmod::Badge::stat(const Stat stat) const +Sigcore::Fraction Sigmod::Badge::stat(const Stat stat) const { switch (stat) { @@ -182,7 +182,7 @@ Sigmod::Fraction Sigmod::Badge::stat(const Stat stat) const return m_stat[stat - ST_Attack]; default: emit(warning(bounds("stat"))); - return Fraction(); + return Sigcore::Fraction(); } } diff --git a/sigmod/Badge.h b/sigmod/Badge.h index e6a54ff0..509da0dd 100644 --- a/sigmod/Badge.h +++ b/sigmod/Badge.h @@ -22,8 +22,10 @@ #ifndef SIGMOD_BADGE #define SIGMOD_BADGE +// Sigcore includes +#include "../sigcore/Fraction.h" + // Sigmod includes -#include "Fraction.h" #include "Object.h" namespace Sigmod @@ -122,7 +124,7 @@ class SIGMOD_EXPORT Badge : public Object * \param stat The stat to set the multiplier for. * \param multiplier The multiplier for the stat once the badge is obtained. */ - void setStat(const Stat stat, const Fraction& multiplier); + void setStat(const Stat stat, const Sigcore::Fraction& multiplier); /** * \sa setName @@ -155,17 +157,17 @@ class SIGMOD_EXPORT Badge : public Object * * \return The multiplier for the \p stat. */ - Fraction stat(const Stat stat) const; + Sigcore::Fraction stat(const Stat stat) const; Badge& operator=(const Badge& rhs); private: - void setStat(const Fraction& multiplier); + void setStat(const Sigcore::Fraction& multiplier); QString m_name; int m_face; int m_badge; int m_obey; - QVarLengthArray<Fraction, ST_SpecialDefense - ST_Attack + 1> m_stat; + QVarLengthArray<Sigcore::Fraction, ST_SpecialDefense - ST_Attack + 1> m_stat; }; } diff --git a/sigmod/CMakeLists.txt b/sigmod/CMakeLists.txt index 7663c0c9..1f60289d 100644 --- a/sigmod/CMakeLists.txt +++ b/sigmod/CMakeLists.txt @@ -11,10 +11,8 @@ SET(sigmod_HEADERS CoinList.h CoinListObject.h EggGroup.h - Fraction.h Global.h GlobalScript.h - Hat.h Item.h ItemType.h Macros.h @@ -25,13 +23,11 @@ SET(sigmod_HEADERS MapWarp.h MapWildListEncounter.h MapWildList.h - Matrix.h Move.h Nature.h Object.h Rules.h Sigmod.h - Script.h Skin.h Sound.h Species.h @@ -54,7 +50,6 @@ SET(sigmod_SRCS CoinList.cpp CoinListObject.cpp EggGroup.cpp - Fraction.cpp GlobalScript.cpp Item.cpp ItemType.cpp @@ -69,7 +64,6 @@ SET(sigmod_SRCS Nature.cpp Object.cpp Rules.cpp - Script.cpp Sigmod.cpp Skin.cpp Sound.cpp @@ -100,6 +94,7 @@ SET_TARGET_PROPERTIES(sigmod TARGET_LINK_LIBRARIES(sigmod ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} + sigcore ) INCLUDE(../doxygen.cmake) diff --git a/sigmod/CoinList.cpp b/sigmod/CoinList.cpp index f37c0627..a36ebeb6 100644 --- a/sigmod/CoinList.cpp +++ b/sigmod/CoinList.cpp @@ -122,7 +122,7 @@ void Sigmod::CoinList::setName(const QString& name) CHECK(name); } -void Sigmod::CoinList::setScript(const Script& script) +void Sigmod::CoinList::setScript(const Sigcore::Script& script) { CHECK(script); } @@ -132,7 +132,7 @@ QString Sigmod::CoinList::name() const return m_name; } -Sigmod::Script Sigmod::CoinList::script() const +Sigcore::Script Sigmod::CoinList::script() const { return m_script; } diff --git a/sigmod/CoinList.h b/sigmod/CoinList.h index 0f02fc0d..cd0482b9 100644 --- a/sigmod/CoinList.h +++ b/sigmod/CoinList.h @@ -18,9 +18,11 @@ #ifndef SIGMOD_COINLIST #define SIGMOD_COINLIST +// Sigcore includes +#include "../sigcore/Script.h" + // Sigmod includes #include "Object.h" -#include "Script.h" // Qt includes #include <QtCore/QList> @@ -48,10 +50,10 @@ class SIGMOD_EXPORT CoinList : public Object QDomElement save() const; void setName(const QString& name); - void setScript(const Script& script); + void setScript(const Sigcore::Script& script); QString name() const; - Script script() const; + Sigcore::Script script() const; const CoinListObject* object(const int index) const; CoinListObject* object(const int index); @@ -73,7 +75,7 @@ class SIGMOD_EXPORT CoinList : public Object void clear(); QString m_name; - Script m_script; + Sigcore::Script m_script; QList<CoinListObject*> m_objects; }; } diff --git a/sigmod/GlobalScript.cpp b/sigmod/GlobalScript.cpp index 2b80322b..c8cc4da9 100644 --- a/sigmod/GlobalScript.cpp +++ b/sigmod/GlobalScript.cpp @@ -80,7 +80,7 @@ void Sigmod::GlobalScript::setName(const QString& name) CHECK(name); } -void Sigmod::GlobalScript::setScript(const Script& script) +void Sigmod::GlobalScript::setScript(const Sigcore::Script& script) { CHECK(script); } @@ -90,7 +90,7 @@ QString Sigmod::GlobalScript::name() const return m_name; } -Sigmod::Script Sigmod::GlobalScript::script() const +Sigcore::Script Sigmod::GlobalScript::script() const { return m_script; } diff --git a/sigmod/GlobalScript.h b/sigmod/GlobalScript.h index 26fa995c..31ab0627 100644 --- a/sigmod/GlobalScript.h +++ b/sigmod/GlobalScript.h @@ -18,9 +18,11 @@ #ifndef SIGMOD_GLOBALSCRIPT #define SIGMOD_GLOBALSCRIPT +// Sigcore includes +#include "../sigcore/Script.h" + // Sigmod includes #include "Object.h" -#include "Script.h" namespace Sigmod { @@ -44,15 +46,15 @@ class SIGMOD_EXPORT GlobalScript : public Object QDomElement save() const; void setName(const QString& name); - void setScript(const Script& script); + void setScript(const Sigcore::Script& script); QString name() const; - Script script() const; + Sigcore::Script script() const; GlobalScript& operator=(const GlobalScript& rhs); private: QString m_name; - Script m_script; + Sigcore::Script m_script; }; } diff --git a/sigmod/Item.cpp b/sigmod/Item.cpp index d0eb9a91..5cb9d29e 100644 --- a/sigmod/Item.cpp +++ b/sigmod/Item.cpp @@ -155,7 +155,7 @@ void Sigmod::Item::setDescription(const QString& description) CHECK(description); } -void Sigmod::Item::setScript(const Script& script) +void Sigmod::Item::setScript(const Sigcore::Script& script) { CHECK(script); } @@ -195,7 +195,7 @@ QString Sigmod::Item::description() const return m_description; } -Sigmod::Script Sigmod::Item::script() const +Sigcore::Script Sigmod::Item::script() const { return m_script; } diff --git a/sigmod/Item.h b/sigmod/Item.h index 4b4cc74a..c505a373 100644 --- a/sigmod/Item.h +++ b/sigmod/Item.h @@ -18,9 +18,11 @@ #ifndef SIGMOD_ITEM #define SIGMOD_ITEM +// Sigcore includes +#include "../sigcore/Script.h" + // Sigmod includes #include "Object.h" -#include "Script.h" namespace Sigmod { @@ -50,7 +52,7 @@ class SIGMOD_EXPORT Item : public Object void setSellPrice(const int sellPrice); void setWeight(const int weight); void setDescription(const QString& description); - void setScript(const Script& script); + void setScript(const Sigcore::Script& script); QString name() const; bool sellable() const; @@ -59,7 +61,7 @@ class SIGMOD_EXPORT Item : public Object int sellPrice() const; int weight() const; QString description() const; - Script script() const; + Sigcore::Script script() const; Item& operator=(const Item& rhs); private: @@ -70,7 +72,7 @@ class SIGMOD_EXPORT Item : public Object int m_sellPrice; int m_weight; QString m_description; - Script m_script; + Sigcore::Script m_script; }; } diff --git a/sigmod/Map.cpp b/sigmod/Map.cpp index 021de6ac..1aaa5e36 100644 --- a/sigmod/Map.cpp +++ b/sigmod/Map.cpp @@ -202,12 +202,12 @@ void Sigmod::Map::deleteRow(const int row) m_map.deleteRow(row); } -const Sigmod::Matrix<int>* Sigmod::Map::map() const +const Sigcore::Matrix<int>* Sigmod::Map::map() const { return &m_map; } -Sigmod::Matrix<int>* Sigmod::Map::map() +Sigcore::Matrix<int>* Sigmod::Map::map() { return &m_map; } diff --git a/sigmod/Map.h b/sigmod/Map.h index 4657e9dc..490287c6 100644 --- a/sigmod/Map.h +++ b/sigmod/Map.h @@ -18,8 +18,10 @@ #ifndef SIGMOD_MAP #define SIGMOD_MAP +// Sigcore includes +#include "../sigcore/Matrix.h" + // Sigmod includes -#include "Matrix.h" #include "Object.h" // Qt includes @@ -75,8 +77,8 @@ class SIGMOD_EXPORT Map : public Object void deleteColumn(const int column); void deleteRow(const int row); - const Matrix<int>* map() const; - Matrix<int>* map(); + const Sigcore::Matrix<int>* map() const; + Sigcore::Matrix<int>* map(); int tile(const int row, const int column) const; int width() const; int height() const; @@ -148,7 +150,7 @@ class SIGMOD_EXPORT Map : public Object QString m_name; int m_flyWarp; Type m_type; - Matrix<int> m_map; + Sigcore::Matrix<int> m_map; QList<MapEffect*> m_effects; QList<MapTrainer*> m_trainers; QList<MapWarp*> m_warps; diff --git a/sigmod/MapEffect.cpp b/sigmod/MapEffect.cpp index 3c232118..6d5c2734 100644 --- a/sigmod/MapEffect.cpp +++ b/sigmod/MapEffect.cpp @@ -109,7 +109,7 @@ void Sigmod::MapEffect::setIsGhost(const bool isGhost) CHECK(isGhost); } -void Sigmod::MapEffect::setScript(const Script& script) +void Sigmod::MapEffect::setScript(const Sigcore::Script& script) { CHECK(script); } @@ -134,7 +134,7 @@ bool Sigmod::MapEffect::isGhost() const return m_isGhost; } -Sigmod::Script Sigmod::MapEffect::script() const +Sigcore::Script Sigmod::MapEffect::script() const { return m_script; } diff --git a/sigmod/MapEffect.h b/sigmod/MapEffect.h index 39726d19..f8f064bc 100644 --- a/sigmod/MapEffect.h +++ b/sigmod/MapEffect.h @@ -18,9 +18,11 @@ #ifndef SIGMOD_MAPEFFECT #define SIGMOD_MAPEFFECT +// Sigcore includes +#include "../sigcore/Script.h" + // Sigmod includes #include "Object.h" -#include "Script.h" // Qt includes #include <QtCore/QPoint> @@ -49,13 +51,13 @@ class SIGMOD_EXPORT MapEffect : public Object void setCoordinate(const QPoint& coordinate); void setSkin(const int skin); void setIsGhost(const bool isGhost); - void setScript(const Script& script); + void setScript(const Sigcore::Script& script); QString name() const; QPoint coordinate() const; int skin() const; bool isGhost() const; - Script script() const; + Sigcore::Script script() const; MapEffect& operator=(const MapEffect& rhs); private: @@ -63,7 +65,7 @@ class SIGMOD_EXPORT MapEffect : public Object QPoint m_coordinate; int m_skin; bool m_isGhost; - Script m_script; + Sigcore::Script m_script; }; } diff --git a/sigmod/MapTrainer.cpp b/sigmod/MapTrainer.cpp index 9e3f3e2d..2c9307c9 100644 --- a/sigmod/MapTrainer.cpp +++ b/sigmod/MapTrainer.cpp @@ -134,7 +134,7 @@ void Sigmod::MapTrainer::setNumberFight(const int numberFight) CHECK(numberFight); } -void Sigmod::MapTrainer::setScript(const Script& script) +void Sigmod::MapTrainer::setScript(const Sigcore::Script& script) { CHECK(script); } @@ -167,7 +167,7 @@ int Sigmod::MapTrainer::numberFight() const return m_numberFight; } -Sigmod::Script Sigmod::MapTrainer::script() const +Sigcore::Script Sigmod::MapTrainer::script() const { return m_script; } diff --git a/sigmod/MapTrainer.h b/sigmod/MapTrainer.h index 7c45b39a..f01afdbe 100644 --- a/sigmod/MapTrainer.h +++ b/sigmod/MapTrainer.h @@ -18,9 +18,11 @@ #ifndef SIGMOD_MAPTRAINER #define SIGMOD_MAPTRAINER +// Sigcore includes +#include "../sigcore/Script.h" + // Sigmod includes #include "Object.h" -#include "Script.h" // Qt includes #include <QtCore/QList> @@ -52,14 +54,14 @@ class SIGMOD_EXPORT MapTrainer : public Object void setTrainerClass(const int trainerClass); void setCoordinate(const QPoint& coordinate); void setNumberFight(const int numberFight); - void setScript(const Script& script); + void setScript(const Sigcore::Script& script); void setLeadTeamMember(const int leadTeamMember); QString name() const; int trainerClass() const; QPoint coordinate() const; int numberFight() const; - Script script() const; + Sigcore::Script script() const; int leadTeamMember() const; const MapTrainerTeamMember* teamMember(const int index) const; @@ -85,7 +87,7 @@ class SIGMOD_EXPORT MapTrainer : public Object int m_trainerClass; QPoint m_coordinate; int m_numberFight; - Script m_script; + Sigcore::Script m_script; int m_leadTeamMember; QList<MapTrainerTeamMember*> m_teamMembers; }; diff --git a/sigmod/MapWarp.cpp b/sigmod/MapWarp.cpp index 9cd61065..bd4934b6 100644 --- a/sigmod/MapWarp.cpp +++ b/sigmod/MapWarp.cpp @@ -124,7 +124,7 @@ void Sigmod::MapWarp::setToWarp(const int toWarp) CHECK(toWarp); } -void Sigmod::MapWarp::setScript(const Script& script) +void Sigmod::MapWarp::setScript(const Sigcore::Script& script) { CHECK(script); } @@ -154,7 +154,7 @@ int Sigmod::MapWarp::toWarp() const return m_toWarp; } -Sigmod::Script Sigmod::MapWarp::script() const +Sigcore::Script Sigmod::MapWarp::script() const { return m_script; } diff --git a/sigmod/MapWarp.h b/sigmod/MapWarp.h index d0ffb778..f99afdf3 100644 --- a/sigmod/MapWarp.h +++ b/sigmod/MapWarp.h @@ -18,9 +18,11 @@ #ifndef SIGMOD_MAPWARP #define SIGMOD_MAPWARP +// Sigcore includes +#include "../sigcore/Script.h" + // Sigmod includes #include "Object.h" -#include "Script.h" // Qt includes #include <QtCore/QPoint> @@ -60,14 +62,14 @@ class SIGMOD_EXPORT MapWarp : public Object void setType(const Type type); void setToMap(const int toMap); void setToWarp(const int toWarp); - void setScript(const Script& script); + void setScript(const Sigcore::Script& script); QString name() const; QPoint coordinate() const; Type type() const; int toMap() const; int toWarp() const; - Script script() const; + Sigcore::Script script() const; MapWarp& operator=(const MapWarp& rhs); private: @@ -76,7 +78,7 @@ class SIGMOD_EXPORT MapWarp : public Object Type m_type; int m_toMap; int m_toWarp; - Script m_script; + Sigcore::Script m_script; }; } Q_DECLARE_METATYPE(Sigmod::MapWarp::Type) diff --git a/sigmod/Move.cpp b/sigmod/Move.cpp index 75e8efbd..6f309eb4 100644 --- a/sigmod/Move.cpp +++ b/sigmod/Move.cpp @@ -114,7 +114,7 @@ void Sigmod::Move::setName(const QString& name) CHECK(name); } -void Sigmod::Move::setAccuracy(const Fraction& accuracy) +void Sigmod::Move::setAccuracy(const Sigcore::Fraction& accuracy) { if (!accuracy || (1 < accuracy)) emit(error(bounds("accuracy"))); @@ -158,17 +158,17 @@ void Sigmod::Move::setDescription(const QString& description) CHECK(description); } -void Sigmod::Move::setBattleScript(const Script& battleScript) +void Sigmod::Move::setBattleScript(const Sigcore::Script& battleScript) { CHECK(battleScript); } -void Sigmod::Move::setWorldScript(const Script& worldScript) +void Sigmod::Move::setWorldScript(const Sigcore::Script& worldScript) { CHECK(worldScript); } -void Sigmod::Move::setPriorityScript(const Script& priorityScript) +void Sigmod::Move::setPriorityScript(const Sigcore::Script& priorityScript) { CHECK(priorityScript); } @@ -178,7 +178,7 @@ QString Sigmod::Move::name() const return m_name; } -Sigmod::Fraction Sigmod::Move::accuracy() const +Sigcore::Fraction Sigmod::Move::accuracy() const { return m_accuracy; } @@ -213,17 +213,17 @@ QString Sigmod::Move::description() const return m_description; } -Sigmod::Script Sigmod::Move::battleScript() const +Sigcore::Script Sigmod::Move::battleScript() const { return m_battleScript; } -Sigmod::Script Sigmod::Move::worldScript() const +Sigcore::Script Sigmod::Move::worldScript() const { return m_worldScript; } -Sigmod::Script Sigmod::Move::priorityScript() const +Sigcore::Script Sigmod::Move::priorityScript() const { return m_priorityScript; } diff --git a/sigmod/Move.h b/sigmod/Move.h index 2c8082b0..f4a6d2da 100644 --- a/sigmod/Move.h +++ b/sigmod/Move.h @@ -18,10 +18,12 @@ #ifndef SIGMOD_MOVE #define SIGMOD_MOVE +// Sigcore includes +#include "../sigcore/Fraction.h" +#include "../sigcore/Script.h" + // Sigmod includes -#include "Fraction.h" #include "Object.h" -#include "Script.h" namespace Sigmod { @@ -45,42 +47,42 @@ class SIGMOD_EXPORT Move : public Object QDomElement save() const; void setName(const QString& name); - void setAccuracy(const Fraction& accuracy); + void setAccuracy(const Sigcore::Fraction& accuracy); void setPower(const int power); void setType(const int type); void setSpecial(const bool special); void setPowerPoints(const int powerPoints); void setPriority(const int priority); void setDescription(const QString& description); - void setBattleScript(const Script& battleScript); - void setWorldScript(const Script& worldScript); - void setPriorityScript(const Script& priorityScript); + void setBattleScript(const Sigcore::Script& battleScript); + void setWorldScript(const Sigcore::Script& worldScript); + void setPriorityScript(const Sigcore::Script& priorityScript); QString name() const; - Fraction accuracy() const; + Sigcore::Fraction accuracy() const; int power() const; int type() const; bool special() const; int powerPoints() const; int priority() const; QString description() const; - Script battleScript() const; - Script worldScript() const; - Script priorityScript() const; + Sigcore::Script battleScript() const; + Sigcore::Script worldScript() const; + Sigcore::Script priorityScript() const; Move& operator=(const Move& rhs); private: QString m_name; - Fraction m_accuracy; + Sigcore::Fraction m_accuracy; int m_power; int m_type; bool m_special; int m_powerPoints; int m_priority; QString m_description; - Script m_battleScript; - Script m_worldScript; - Script m_priorityScript; + Sigcore::Script m_battleScript; + Sigcore::Script m_worldScript; + Sigcore::Script m_priorityScript; }; } diff --git a/sigmod/Nature.cpp b/sigmod/Nature.cpp index add4a764..5df36bc3 100644 --- a/sigmod/Nature.cpp +++ b/sigmod/Nature.cpp @@ -86,7 +86,7 @@ void Sigmod::Nature::setName(const QString& name) CHECK(name); } -void Sigmod::Nature::setStat(const Stat stat, const Fraction& multiplier) +void Sigmod::Nature::setStat(const Stat stat, const Sigcore::Fraction& multiplier) { switch (stat) { @@ -114,7 +114,7 @@ QString Sigmod::Nature::name() const return m_name; } -Sigmod::Fraction Sigmod::Nature::stat(const Stat stat) const +Sigcore::Fraction Sigmod::Nature::stat(const Stat stat) const { switch (stat) { @@ -124,7 +124,7 @@ Sigmod::Fraction Sigmod::Nature::stat(const Stat stat) const return m_stat[stat - ST_Attack]; default: emit(warning(bounds("stat"))); - return Fraction(); + return Sigcore::Fraction(); } } diff --git a/sigmod/Nature.h b/sigmod/Nature.h index 68f15a91..7c658832 100644 --- a/sigmod/Nature.h +++ b/sigmod/Nature.h @@ -18,8 +18,10 @@ #ifndef SIGMOD_NATURE #define SIGMOD_NATURE +// Sigcore includes +#include "../sigcore/Fraction.h" + // Sigmod includes -#include "Fraction.h" #include "Object.h" namespace Sigmod @@ -43,19 +45,19 @@ class SIGMOD_EXPORT Nature : public Object QDomElement save() const; void setName(const QString& name); - void setStat(const Stat stat, const Fraction& multiplier); + void setStat(const Stat stat, const Sigcore::Fraction& multiplier); void setWeight(const int weight); QString name() const; - Fraction stat(const Stat stat) const; + Sigcore::Fraction stat(const Stat stat) const; int weight() const; Nature& operator=(const Nature& rhs); private: - void setStat(const Fraction& multiplier); + void setStat(const Sigcore::Fraction& multiplier); QString m_name; - QVarLengthArray<Fraction, ST_SpecialDefense - ST_Attack + 1> m_stat; + QVarLengthArray<Sigcore::Fraction, ST_SpecialDefense - ST_Attack + 1> m_stat; int m_weight; }; } diff --git a/sigmod/Object.h b/sigmod/Object.h index 63409e58..0f8825e0 100644 --- a/sigmod/Object.h +++ b/sigmod/Object.h @@ -22,11 +22,13 @@ #ifndef SIGMOD_OBJECT #define SIGMOD_OBJECT +// Sigcore includes +#include "../sigcore/Fraction.h" +#include "../sigcore/Matrix.h" +#include "../sigcore/Script.h" + // Sigmod includes -#include "Fraction.h" #include "Global.h" -#include "Matrix.h" -#include "Script.h" // Qt includes #include <QtCore/QBuffer> @@ -159,12 +161,12 @@ class SIGMOD_EXPORT Object : public QObject template<typename T> static void loadValue(const QDomElement& xml, T* value); template<typename T, int S> static void loadArray(const QDomElement& xml, QVarLengthArray<T, S>* value); template<typename T> static void loadList(const QDomElement& xml, QList<T>* value); - template<typename T> static void loadMatrix(const QDomElement& xml, Matrix<T>* value); + template<typename T> static void loadMatrix(const QDomElement& xml, Sigcore::Matrix<T>* value); template<typename T> static QDomElement saveValue(const QString& name, const T& value); template<typename T, int S> static QDomElement saveArray(const QString& name, const QVarLengthArray<T, S>& value); template<typename T> static QDomElement saveList(const QString& name, const QList<T>& value); - template<typename T> static QDomElement saveMatrix(const QString& name, const Matrix<T>& value); + template<typename T> static QDomElement saveMatrix(const QString& name, const Sigcore::Matrix<T>& value); virtual void clear(); private: @@ -191,7 +193,7 @@ template<> inline void Object::loadValue<int>(const QDomElement& xml, int* value *value = xml.firstChild().toText().data().toInt(); } -template<> inline void Object::loadValue<Fraction>(const QDomElement& xml, Fraction* value) +template<> inline void Object::loadValue<Sigcore::Fraction>(const QDomElement& xml, Sigcore::Fraction* value) { value->set(xml.attribute("numerator", "1").toInt(), xml.attribute("denominator", "1").toInt()); value->reduce(); @@ -208,7 +210,7 @@ template<> inline void Object::loadValue<QByteArray>(const QDomElement& xml, QBy *value = QByteArray::fromBase64(xml.firstChild().toText().data().toUtf8()); } -template<> inline void Object::loadValue<Script>(const QDomElement& xml, Script* value) +template<> inline void Object::loadValue<Sigcore::Script>(const QDomElement& xml, Sigcore::Script* value) { value->setInterpreter(xml.attribute("interpreter", "")); value->setScript(xml.firstChild().toText().data()); @@ -239,7 +241,7 @@ template<typename T> inline void Object::loadList(const QDomElement& xml, QList< } } -template<typename T> inline void Object::loadMatrix(const QDomElement& xml, Matrix<T>* value) +template<typename T> inline void Object::loadMatrix(const QDomElement& xml, Sigcore::Matrix<T>* value) { int height = xml.attribute("height", "1").toInt(); int width = xml.attribute("width", "1").toInt(); @@ -283,7 +285,7 @@ template<> inline QDomElement Object::saveValue<QString>(const QString& name, co return element; } -template<> inline QDomElement Object::saveValue<Fraction>(const QString& name, const Fraction& value) +template<> inline QDomElement Object::saveValue<Sigcore::Fraction>(const QString& name, const Sigcore::Fraction& value) { QDomElement element = QDomDocument().createElement(name); element.setAttribute("numerator", value.numerator()); @@ -306,7 +308,7 @@ template<> inline QDomElement Object::saveValue<QByteArray>(const QString& name, return element; } -template<> inline QDomElement Object::saveValue<Script>(const QString& name, const Script& value) +template<> inline QDomElement Object::saveValue<Sigcore::Script>(const QString& name, const Sigcore::Script& value) { QDomElement element = QDomDocument().createElement(name); element.setAttribute("interpreter", value.interpreter()); @@ -334,7 +336,7 @@ template<typename T> inline QDomElement Object::saveList(const QString& name, co return element; } -template<typename T> inline QDomElement Object::saveMatrix(const QString& name, const Matrix<T>& value) +template<typename T> inline QDomElement Object::saveMatrix(const QString& name, const Sigcore::Matrix<T>& value) { QDomElement element = QDomDocument().createElement(name); element.setAttribute("height", value.height()); diff --git a/sigmod/Sigmod.cpp b/sigmod/Sigmod.cpp index 5d143173..11915177 100644 --- a/sigmod/Sigmod.cpp +++ b/sigmod/Sigmod.cpp @@ -389,7 +389,7 @@ void Sigmod::Sigmod::setStartWarp(const int startWarp) CHECK(startWarp); } -void Sigmod::Sigmod::setTypechart(const int attack, const int defense, const Fraction& multiplier) +void Sigmod::Sigmod::setTypechart(const int attack, const int defense, const Sigcore::Fraction& multiplier) { CHECK_ARRAY(typechart(attack, defense), multiplier); } @@ -434,17 +434,17 @@ int Sigmod::Sigmod::startWarp() const return m_startWarp; } -const Sigmod::Matrix<Sigmod::Fraction>* Sigmod::Sigmod::typechart() const +const Sigcore::Matrix<Sigcore::Fraction>* Sigmod::Sigmod::typechart() const { return &m_typechart; } -Sigmod::Matrix<Sigmod::Fraction>* Sigmod::Sigmod::typechart() +Sigcore::Matrix<Sigcore::Fraction>* Sigmod::Sigmod::typechart() { return &m_typechart; } -Sigmod::Fraction Sigmod::Sigmod::typechart(const int attack, const int defense) const +Sigcore::Fraction Sigmod::Sigmod::typechart(const int attack, const int defense) const { return m_typechart(attack, defense); } @@ -2074,7 +2074,7 @@ Sigmod::Type* Sigmod::Sigmod::newType(const Type& type) Sigmod::Type* Sigmod::Sigmod::newType(Type* type) { m_types.append(type); - m_typechart.resize(typeCount(), typeCount(), Fraction(1, 1)); + m_typechart.resize(typeCount(), typeCount(), Sigcore::Fraction(1, 1)); return type; } @@ -2083,7 +2083,7 @@ void Sigmod::Sigmod::deleteType(const int index) Q_ASSERT(index < typeCount()); delete m_types[index]; m_types.removeAt(index); - m_typechart.resize(typeCount(), typeCount(), Fraction(1, 1)); + m_typechart.resize(typeCount(), typeCount(), Sigcore::Fraction(1, 1)); } void Sigmod::Sigmod::deleteTypeById(const int id) diff --git a/sigmod/Sigmod.h b/sigmod/Sigmod.h index 544d1957..dee71c73 100644 --- a/sigmod/Sigmod.h +++ b/sigmod/Sigmod.h @@ -22,9 +22,11 @@ #ifndef SIGMOD_SIGMOD #define SIGMOD_SIGMOD +// Sigcore includes +#include "../sigcore/Fraction.h" +#include "../sigcore/Matrix.h" + // Sigmod includes -#include "Fraction.h" -#include "Matrix.h" #include "Object.h" // Qt includes @@ -116,7 +118,7 @@ class SIGMOD_EXPORT Sigmod : public Object void setSinglePlayer(const bool singlePlayer); void setStartMap(const int startMap); void setStartWarp(const int startWarp); - void setTypechart(const int attack, const int defense, const Fraction& multiplier); + void setTypechart(const int attack, const int defense, const Sigcore::Fraction& multiplier); void setRules(const Rules& rules); void setRules(const QDomElement& xml); @@ -126,9 +128,9 @@ class SIGMOD_EXPORT Sigmod : public Object bool singlePlayer() const; int startMap() const; int startWarp() const; - const Matrix<Fraction>* typechart() const; - Matrix<Fraction>* typechart(); - Fraction typechart(const int attack, const int defense) const; + const Sigcore::Matrix<Sigcore::Fraction>* typechart() const; + Sigcore::Matrix<Sigcore::Fraction>* typechart(); + Sigcore::Fraction typechart(const int attack, const int defense) const; const Rules* rules() const; Rules* rules(); @@ -472,7 +474,7 @@ class SIGMOD_EXPORT Sigmod : public Object bool m_singlePlayer; int m_startMap; int m_startWarp; - Matrix<Fraction> m_typechart; + Sigcore::Matrix<Sigcore::Fraction> m_typechart; Rules* m_rules; QList<Ability*> m_abilities; QList<Author*> m_authors; diff --git a/sigmod/Skin.cpp b/sigmod/Skin.cpp index a2b46263..2721a59a 100644 --- a/sigmod/Skin.cpp +++ b/sigmod/Skin.cpp @@ -18,10 +18,12 @@ // Header include #include "Skin.h" +// Sigcore includes +#include "../sigcore/Script.h" + // Sigmod includes #include "Macros.h" #include "Sigmod.h" -#include "Script.h" Sigmod::Skin::Skin(const Skin& skin) : Object(skin.parent(), skin.id()) @@ -77,7 +79,7 @@ void Sigmod::Skin::setName(const QString& name) CHECK(name); } -void Sigmod::Skin::setScript(const Script& script) +void Sigmod::Skin::setScript(const Sigcore::Script& script) { CHECK(script); } @@ -87,7 +89,7 @@ QString Sigmod::Skin::name() const return m_name; } -Sigmod::Script Sigmod::Skin::script() const +Sigcore::Script Sigmod::Skin::script() const { return m_script; } diff --git a/sigmod/Skin.h b/sigmod/Skin.h index a27a9b83..e7d96a1a 100644 --- a/sigmod/Skin.h +++ b/sigmod/Skin.h @@ -18,9 +18,11 @@ #ifndef SIGMOD_SKIN #define SIGMOD_SKIN +// Sigcore includes +#include "../sigcore/Script.h" + // Sigmod includes #include "Object.h" -#include "Script.h" namespace Sigmod { @@ -43,15 +45,15 @@ class SIGMOD_EXPORT Skin : public Object QDomElement save() const; void setName(const QString& name); - void setScript(const Script& script); + void setScript(const Sigcore::Script& script); QString name() const; - Script script() const; + Sigcore::Script script() const; Skin& operator=(const Skin& rhs); private: QString m_name; - Script m_script; + Sigcore::Script m_script; }; } diff --git a/sigmod/Species.cpp b/sigmod/Species.cpp index 4e217317..0340abd0 100644 --- a/sigmod/Species.cpp +++ b/sigmod/Species.cpp @@ -286,7 +286,7 @@ void Sigmod::Species::setMaxHoldWeight(const int maxHoldWeight) CHECK(maxHoldWeight); } -void Sigmod::Species::setRunChance(const Fraction& runChance) +void Sigmod::Species::setRunChance(const Sigcore::Fraction& runChance) { if (1 < runChance) emit(error(bounds("runChance"))); @@ -294,7 +294,7 @@ void Sigmod::Species::setRunChance(const Fraction& runChance) CHECK(runChance); } -void Sigmod::Species::setFleeChance(const Fraction& fleeChance) +void Sigmod::Species::setFleeChance(const Sigcore::Fraction& fleeChance) { if (1 < fleeChance) emit(error(bounds("fleeChance"))); @@ -302,7 +302,7 @@ void Sigmod::Species::setFleeChance(const Fraction& fleeChance) CHECK(fleeChance); } -void Sigmod::Species::setItemChance(const Fraction& itemChance) +void Sigmod::Species::setItemChance(const Sigcore::Fraction& itemChance) { if (1 < itemChance) emit(error(bounds("itemChance"))); @@ -386,7 +386,7 @@ void Sigmod::Species::setSkin(const int skin) CHECK(skin); } -void Sigmod::Species::setGenderFactor(const Fraction& genderFactor) +void Sigmod::Species::setGenderFactor(const Sigcore::Fraction& genderFactor) { CHECK(genderFactor); } @@ -436,7 +436,7 @@ void Sigmod::Species::setEggGroup(const int eggGroup, const bool state) } } -void Sigmod::Species::setEvolution(const Script& evolution) +void Sigmod::Species::setEvolution(const Sigcore::Script& evolution) { CHECK(evolution); } @@ -494,17 +494,17 @@ int Sigmod::Species::maxHoldWeight() const return m_maxHoldWeight; } -Sigmod::Fraction Sigmod::Species::runChance() const +Sigcore::Fraction Sigmod::Species::runChance() const { return m_runChance; } -Sigmod::Fraction Sigmod::Species::fleeChance() const +Sigcore::Fraction Sigmod::Species::fleeChance() const { return m_fleeChance; } -Sigmod::Fraction Sigmod::Species::itemChance() const +Sigcore::Fraction Sigmod::Species::itemChance() const { return m_itemChance; } @@ -554,7 +554,7 @@ int Sigmod::Species::skin() const return m_skin; } -Sigmod::Fraction Sigmod::Species::genderFactor() const +Sigcore::Fraction Sigmod::Species::genderFactor() const { return m_genderFactor; } @@ -589,7 +589,7 @@ QList<int> Sigmod::Species::eggGroups() const return m_eggGroup; } -Sigmod::Script Sigmod::Species::evolution() const +Sigcore::Script Sigmod::Species::evolution() const { return m_evolution; } diff --git a/sigmod/Species.h b/sigmod/Species.h index 5435ba0a..6ed8cdc4 100644 --- a/sigmod/Species.h +++ b/sigmod/Species.h @@ -18,10 +18,12 @@ #ifndef SIGMOD_SPECIES #define SIGMOD_SPECIES +// Sigcore includes +#include "../sigcore/Fraction.h" +#include "../sigcore/Script.h" + // Sigmod includes -#include "Fraction.h" #include "Object.h" -#include "Script.h" // Qt includes #include <QtCore/QList> @@ -69,9 +71,9 @@ class SIGMOD_EXPORT Species : public Object void setExperienceValue(const int experienceValue); void setCatchValue(const int catchValue); void setMaxHoldWeight(const int maxHoldWeight); - void setRunChance(const Fraction& runChance); - void setFleeChance(const Fraction& fleeChance); - void setItemChance(const Fraction& itemChance); + void setRunChance(const Sigcore::Fraction& runChance); + void setFleeChance(const Sigcore::Fraction& fleeChance); + void setItemChance(const Sigcore::Fraction& itemChance); void setEncyclopediaNumber(const int encyclopediaNumber); void setWeight(const int weight); void setHeight(const int height); @@ -80,13 +82,13 @@ class SIGMOD_EXPORT Species : public Object void setBackMaleSprite(const int backMaleSprite); void setFrontFemaleSprite(const int frontFemaleSprite); void setBackFemaleSprite(const int backFemaleSprite); - void setGenderFactor(const Fraction& genderFactor); + void setGenderFactor(const Sigcore::Fraction& genderFactor); void setSkin(const int skin); void setEggSpecies(const int eggSpecies); void setEggSteps(const int eggSteps); void setType(const int type, const bool state); void setEggGroup(const int eggGroup, const bool state); - void setEvolution(const Script& evolution); + void setEvolution(const Sigcore::Script& evolution); QString name() const; int baseStat(const Stat stat) const; @@ -95,9 +97,9 @@ class SIGMOD_EXPORT Species : public Object int experienceValue() const; int catchValue() const; int maxHoldWeight() const; - Fraction runChance() const; - Fraction fleeChance() const; - Fraction itemChance() const; + Sigcore::Fraction runChance() const; + Sigcore::Fraction fleeChance() const; + Sigcore::Fraction itemChance() const; int encyclopediaNumber() const; int weight() const; int height() const; @@ -107,14 +109,14 @@ class SIGMOD_EXPORT Species : public Object int frontFemaleSprite() const; int backFemaleSprite() const; int skin() const; - Fraction genderFactor() const; + Sigcore::Fraction genderFactor() const; int eggSpecies() const; int eggSteps() const; bool type(const int type) const; QList<int> types() const; bool eggGroup(const int eggGroup) const; QList<int> eggGroups() const; - Script evolution() const; + Sigcore::Script evolution() const; const SpeciesAbility* ability(const int index) const; SpeciesAbility* ability(const int index); @@ -174,9 +176,9 @@ class SIGMOD_EXPORT Species : public Object int m_experienceValue; int m_catchValue; int m_maxHoldWeight; - Fraction m_runChance; - Fraction m_fleeChance; - Fraction m_itemChance; + Sigcore::Fraction m_runChance; + Sigcore::Fraction m_fleeChance; + Sigcore::Fraction m_itemChance; int m_encyclopediaNumber; int m_weight; int m_height; @@ -186,12 +188,12 @@ class SIGMOD_EXPORT Species : public Object int m_backFemaleSprite; int m_skin; QString m_encyclopediaEntry; - Fraction m_genderFactor; + Sigcore::Fraction m_genderFactor; int m_eggSpecies; int m_eggSteps; QList<int> m_type; QList<int> m_eggGroup; - Script m_evolution; + Sigcore::Script m_evolution; QList<SpeciesAbility*> m_abilities; QList<SpeciesItem*> m_items; QList<SpeciesMove*> m_moves; diff --git a/sigmod/Status.cpp b/sigmod/Status.cpp index fccb85d0..cbe98ba0 100644 --- a/sigmod/Status.cpp +++ b/sigmod/Status.cpp @@ -21,7 +21,6 @@ // Sigmod includes #include "Macros.h" #include "Sigmod.h" -#include "Script.h" Sigmod::Status::Status(const Status& status) : Object(status.parent(), status.id()) @@ -84,12 +83,12 @@ void Sigmod::Status::setName(const QString& name) CHECK(name); } -void Sigmod::Status::setBattleScript(const Script& battleScript) +void Sigmod::Status::setBattleScript(const Sigcore::Script& battleScript) { CHECK(battleScript); } -void Sigmod::Status::setWorldScript(const Script& worldScript) +void Sigmod::Status::setWorldScript(const Sigcore::Script& worldScript) { CHECK(worldScript); } @@ -99,12 +98,12 @@ QString Sigmod::Status::name() const return m_name; } -Sigmod::Script Sigmod::Status::battleScript() const +Sigcore::Script Sigmod::Status::battleScript() const { return m_battleScript; } -Sigmod::Script Sigmod::Status::worldScript() const +Sigcore::Script Sigmod::Status::worldScript() const { return m_worldScript; } diff --git a/sigmod/Status.h b/sigmod/Status.h index 47a611fa..fcfaf8f4 100644 --- a/sigmod/Status.h +++ b/sigmod/Status.h @@ -18,9 +18,11 @@ #ifndef SIGMOD_STATUS #define SIGMOD_STATUS +// Sigcore includes +#include "../sigcore/Script.h" + // Sigmod includes #include "Object.h" -#include "Script.h" namespace Sigmod { @@ -44,18 +46,18 @@ class SIGMOD_EXPORT Status : public Object QDomElement save() const; void setName(const QString& name); - void setBattleScript(const Script& battleScript); - void setWorldScript(const Script& worldScript); + void setBattleScript(const Sigcore::Script& battleScript); + void setWorldScript(const Sigcore::Script& worldScript); QString name() const; - Script battleScript() const; - Script worldScript() const; + Sigcore::Script battleScript() const; + Sigcore::Script worldScript() const; Status& operator=(const Status& rhs); private: QString m_name; - Script m_battleScript; - Script m_worldScript; + Sigcore::Script m_battleScript; + Sigcore::Script m_worldScript; }; } diff --git a/sigmod/Tile.cpp b/sigmod/Tile.cpp index b5c9d6e0..56215332 100644 --- a/sigmod/Tile.cpp +++ b/sigmod/Tile.cpp @@ -101,7 +101,7 @@ void Sigmod::Tile::setFrom(const Direction direction, const bool state) CHECK_ARRAY(from[direction], state); } -void Sigmod::Tile::setScript(const Script& script) +void Sigmod::Tile::setScript(const Sigcore::Script& script) { CHECK(script); } @@ -121,7 +121,7 @@ bool Sigmod::Tile::from(const Direction direction) const return m_from[direction]; } -Sigmod::Script Sigmod::Tile::script() const +Sigcore::Script Sigmod::Tile::script() const { return m_script; } diff --git a/sigmod/Tile.h b/sigmod/Tile.h index e64b037a..47ccb161 100644 --- a/sigmod/Tile.h +++ b/sigmod/Tile.h @@ -18,9 +18,11 @@ #ifndef SIGMOD_TILE #define SIGMOD_TILE +// Sigcore includes +#include "../sigcore/Script.h" + // Sigmod includes #include "Object.h" -#include "Script.h" namespace Sigmod { @@ -45,19 +47,19 @@ class SIGMOD_EXPORT Tile : public Object void setName(const QString& name); void setSprite(const int sprite); void setFrom(const Direction direction, const bool state); - void setScript(const Script& script); + void setScript(const Sigcore::Script& script); QString name() const; int sprite() const; bool from(const Direction direction) const; - Script script() const; + Sigcore::Script script() const; Tile& operator=(const Tile& rhs); private: QString m_name; int m_sprite; QVarLengthArray<bool, D_Right - D_Up + 1> m_from; - Script m_script; + Sigcore::Script m_script; }; } diff --git a/sigmod/Type.cpp b/sigmod/Type.cpp index 9be9c0ac..1219d801 100644 --- a/sigmod/Type.cpp +++ b/sigmod/Type.cpp @@ -76,7 +76,7 @@ void Sigmod::Type::setName(const QString& name) CHECK(name); } -void Sigmod::Type::setStab(const Fraction& stab) +void Sigmod::Type::setStab(const Sigcore::Fraction& stab) { if (stab < 1) emit(error(bounds("stab"))); @@ -89,7 +89,7 @@ QString Sigmod::Type::name() const return m_name; } -Sigmod::Fraction Sigmod::Type::stab() const +Sigcore::Fraction Sigmod::Type::stab() const { return m_stab; } diff --git a/sigmod/Type.h b/sigmod/Type.h index 7cd2e813..b0b1f13f 100644 --- a/sigmod/Type.h +++ b/sigmod/Type.h @@ -18,8 +18,10 @@ #ifndef SIGMOD_TYPE #define SIGMOD_TYPE +// Sigcore includes +#include "../sigcore/Fraction.h" + // Sigmod includes -#include "Fraction.h" #include "Object.h" namespace Sigmod @@ -43,15 +45,15 @@ class SIGMOD_EXPORT Type : public Object QDomElement save() const; void setName(const QString& name); - void setStab(const Fraction& stab); + void setStab(const Sigcore::Fraction& stab); QString name() const; - Fraction stab() const; + Sigcore::Fraction stab() const; Type& operator=(const Type& rhs); private: QString m_name; - Fraction m_stab; + Sigcore::Fraction m_stab; }; } diff --git a/sigmod/Weather.cpp b/sigmod/Weather.cpp index 5f8ac537..532643a4 100644 --- a/sigmod/Weather.cpp +++ b/sigmod/Weather.cpp @@ -18,10 +18,12 @@ // Header include #include "Weather.h" +// Sigcore includes +#include "../sigcore/Script.h" + // Sigmod includes #include "Macros.h" #include "Sigmod.h" -#include "Script.h" Sigmod::Weather::Weather(const Weather& weather) : Object(weather.parent(), weather.id()) @@ -81,7 +83,7 @@ void Sigmod::Weather::setName(const QString& name) CHECK(name); } -void Sigmod::Weather::setScript(const Script& script) +void Sigmod::Weather::setScript(const Sigcore::Script& script) { CHECK(script); } @@ -91,7 +93,7 @@ QString Sigmod::Weather::name() const return m_name; } -Sigmod::Script Sigmod::Weather::script() const +Sigcore::Script Sigmod::Weather::script() const { return m_script; } diff --git a/sigmod/Weather.h b/sigmod/Weather.h index 3ae60f69..897d772b 100644 --- a/sigmod/Weather.h +++ b/sigmod/Weather.h @@ -18,9 +18,11 @@ #ifndef SIGMOD_WEATHER #define SIGMOD_WEATHER +// Sigcore includes +#include "../sigcore/Script.h" + // Sigmod includes #include "Object.h" -#include "Script.h" namespace Sigmod { @@ -44,15 +46,15 @@ class SIGMOD_EXPORT Weather : public Object QDomElement save() const; void setName(const QString& name); - void setScript(const Script& script); + void setScript(const Sigcore::Script& script); QString name() const; - Script script() const; + Sigcore::Script script() const; Weather& operator=(const Weather& rhs); private: QString m_name; - Script m_script; + Sigcore::Script m_script; }; } diff --git a/sigmodr/AbilityUI.cpp b/sigmodr/AbilityUI.cpp index 3b027f4a..aa3c924d 100644 --- a/sigmodr/AbilityUI.cpp +++ b/sigmodr/AbilityUI.cpp @@ -72,17 +72,17 @@ void Sigmodr::AbilityUI::on_varDescription_textChanged(const QString& descriptio qobject_cast<Sigmod::Ability*>(modified())->setDescription(description); } -void Sigmodr::AbilityUI::on_varBattleScript_valueChanged(const Sigmod::Script& battleScript) +void Sigmodr::AbilityUI::on_varBattleScript_valueChanged(const Sigcore::Script& battleScript) { qobject_cast<Sigmod::Ability*>(modified())->setBattleScript(battleScript); } -void Sigmodr::AbilityUI::on_varWorldScript_valueChanged(const Sigmod::Script& worldScript) +void Sigmodr::AbilityUI::on_varWorldScript_valueChanged(const Sigcore::Script& worldScript) { qobject_cast<Sigmod::Ability*>(modified())->setWorldScript(worldScript); } -void Sigmodr::AbilityUI::on_varPriorityScript_valueChanged(const Sigmod::Script& priorityScript) +void Sigmodr::AbilityUI::on_varPriorityScript_valueChanged(const Sigcore::Script& priorityScript) { qobject_cast<Sigmod::Ability*>(modified())->setPriorityScript(priorityScript); } diff --git a/sigmodr/AbilityUI.h b/sigmodr/AbilityUI.h index bcbb0220..2c2f3512 100644 --- a/sigmodr/AbilityUI.h +++ b/sigmodr/AbilityUI.h @@ -46,9 +46,9 @@ class AbilityUI : public ObjectUI, private Ui::formAbility void on_varName_textChanged(const QString& name); void on_varPriority_valueChanged(const int priority); void on_varDescription_textChanged(const QString& description); - void on_varBattleScript_valueChanged(const Sigmod::Script& battleScript); - void on_varWorldScript_valueChanged(const Sigmod::Script& worldScript); - void on_varPriorityScript_valueChanged(const Sigmod::Script& priorityScript); + void on_varBattleScript_valueChanged(const Sigcore::Script& battleScript); + void on_varWorldScript_valueChanged(const Sigcore::Script& worldScript); + void on_varPriorityScript_valueChanged(const Sigcore::Script& priorityScript); private slots: void setGui(); }; diff --git a/sigmodr/BadgeUI.cpp b/sigmodr/BadgeUI.cpp index 99032be9..4d1e9eb5 100644 --- a/sigmodr/BadgeUI.cpp +++ b/sigmodr/BadgeUI.cpp @@ -131,7 +131,7 @@ void Sigmodr::BadgeUI::on_varBadge_currentIndexChanged(const int badge) qobject_cast<Sigmod::Badge*>(modified())->setBadge(varFace->itemData(badge).toInt()); } -void Sigmodr::BadgeUI::on_varStatMultiplier_valueChanged(const Sigmod::Fraction& multiplier) +void Sigmodr::BadgeUI::on_varStatMultiplier_valueChanged(const Sigcore::Fraction& multiplier) { qobject_cast<Sigmod::Badge*>(modified())->setStat(varStat->itemData(varStat->currentIndex()).value<Sigmod::Stat>(), multiplier); } diff --git a/sigmodr/BadgeUI.h b/sigmodr/BadgeUI.h index 50a3f05b..29cc1414 100644 --- a/sigmodr/BadgeUI.h +++ b/sigmodr/BadgeUI.h @@ -47,7 +47,7 @@ class BadgeUI : public ObjectUI, private Ui::formBadge void on_varObey_valueChanged(const int obey); void on_varFace_currentIndexChanged(const int face); void on_varBadge_currentIndexChanged(const int badge); - void on_varStatMultiplier_valueChanged(const Sigmod::Fraction& multiplier); + void on_varStatMultiplier_valueChanged(const Sigcore::Fraction& multiplier); private slots: void initGui(); void refreshGui(); diff --git a/sigmodr/CMakeLists.txt b/sigmodr/CMakeLists.txt index 82311e93..02448df1 100644 --- a/sigmodr/CMakeLists.txt +++ b/sigmodr/CMakeLists.txt @@ -331,6 +331,7 @@ TARGET_LINK_LIBRARIES(sigmodr ${KDE4_KFILE_LIBRARY} ${KDE4_KTEXTEDITOR_LIBRARY} ${KDE4_KNEWSTUFF2_LIBRARY} + sigcore sigmod ) diff --git a/sigmodr/CoinListUI.cpp b/sigmodr/CoinListUI.cpp index 61fb31df..23170c70 100644 --- a/sigmodr/CoinListUI.cpp +++ b/sigmodr/CoinListUI.cpp @@ -59,7 +59,7 @@ void Sigmodr::CoinListUI::on_varName_textChanged(const QString& name) varName->setCursorPosition(cursor); } -void Sigmodr::CoinListUI::on_varScript_valueChanged(const Sigmod::Script& script) +void Sigmodr::CoinListUI::on_varScript_valueChanged(const Sigcore::Script& script) { qobject_cast<Sigmod::CoinList*>(modified())->setScript(script); } diff --git a/sigmodr/CoinListUI.h b/sigmodr/CoinListUI.h index 67b81a54..44cffec6 100644 --- a/sigmodr/CoinListUI.h +++ b/sigmodr/CoinListUI.h @@ -44,7 +44,7 @@ class CoinListUI : public ObjectUI, private Ui::formCoinList void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varScript_valueChanged(const Sigmod::Script& script); + void on_varScript_valueChanged(const Sigcore::Script& script); private slots: void setGui(); }; diff --git a/sigmodr/FractionWidget.cpp b/sigmodr/FractionWidget.cpp index 1048af8c..77dc26e9 100644 --- a/sigmodr/FractionWidget.cpp +++ b/sigmodr/FractionWidget.cpp @@ -18,14 +18,14 @@ // Header include #include "FractionWidget.h" -Sigmodr::FractionWidget::FractionWidget(QWidget* parent, const Sigmod::Fraction& value) : +Sigmodr::FractionWidget::FractionWidget(QWidget* parent, const Sigcore::Fraction& value) : QWidget(parent), m_behavior(Any), m_value(value) { setupUi(this); - connect(this, SIGNAL(valueChanged(Sigmod::Fraction)), SLOT(updateValue())); - connect(this, SIGNAL(valueChanged(Sigmod::Fraction)), SLOT(resetRanges())); + connect(this, SIGNAL(valueChanged(Sigcore::Fraction)), SLOT(updateValue())); + connect(this, SIGNAL(valueChanged(Sigcore::Fraction)), SLOT(resetRanges())); connect(this, SIGNAL(behaviorChanged(const Behavior)), SLOT(resetRanges())); resetRanges(); } @@ -35,7 +35,7 @@ Sigmodr::FractionWidget::Behavior Sigmodr::FractionWidget::behavior() const return m_behavior; } -Sigmod::Fraction Sigmodr::FractionWidget::value() const +Sigcore::Fraction Sigmodr::FractionWidget::value() const { return m_value; } @@ -46,7 +46,7 @@ void Sigmodr::FractionWidget::setBehavior(const Behavior behavior) emit(behaviorChanged(m_behavior)); } -void Sigmodr::FractionWidget::setValue(const Sigmod::Fraction& value) +void Sigmodr::FractionWidget::setValue(const Sigcore::Fraction& value) { if (!varValue->text().isEmpty() && (m_value == value)) return; diff --git a/sigmodr/FractionWidget.h b/sigmodr/FractionWidget.h index 2f956114..21531f1d 100644 --- a/sigmodr/FractionWidget.h +++ b/sigmodr/FractionWidget.h @@ -18,8 +18,8 @@ #ifndef SIGMODR_FRACTIONWIDGET #define SIGMODR_FRACTIONWIDGET -// Sigmod includes -#include "../sigmod/Fraction.h" +// Sigcore includes +#include "../sigcore/Fraction.h" // Qt includes #include <QtGui/QWidget> @@ -45,17 +45,17 @@ class FractionWidget : public QWidget, private Ui::formFraction Improper = 4 }; - explicit FractionWidget(QWidget* parent, const Sigmod::Fraction& value = Sigmod::Fraction(1, 1)); + explicit FractionWidget(QWidget* parent, const Sigcore::Fraction& value = Sigcore::Fraction(1, 1)); Behavior behavior() const; - Sigmod::Fraction value() const; + Sigcore::Fraction value() const; public slots: void setBehavior(const Behavior behavior); - void setValue(const Sigmod::Fraction& value); + void setValue(const Sigcore::Fraction& value); void updateValue(); signals: - void valueChanged(const Sigmod::Fraction&); + void valueChanged(const Sigcore::Fraction&); void behaviorChanged(const Behavior); protected slots: void on_varNumerator_valueChanged(const int numerator); @@ -64,7 +64,7 @@ class FractionWidget : public QWidget, private Ui::formFraction void resetRanges(); private: Behavior m_behavior; - Sigmod::Fraction m_value; + Sigcore::Fraction m_value; }; } diff --git a/sigmodr/GlobalScriptUI.cpp b/sigmodr/GlobalScriptUI.cpp index ed598f0a..09e831e1 100644 --- a/sigmodr/GlobalScriptUI.cpp +++ b/sigmodr/GlobalScriptUI.cpp @@ -58,7 +58,7 @@ void Sigmodr::GlobalScriptUI::on_varName_textChanged(const QString& name) varName->setCursorPosition(cursor); } -void Sigmodr::GlobalScriptUI::on_varScript_valueChanged(const Sigmod::Script& script) +void Sigmodr::GlobalScriptUI::on_varScript_valueChanged(const Sigcore::Script& script) { qobject_cast<Sigmod::GlobalScript*>(modified())->setScript(script); } diff --git a/sigmodr/GlobalScriptUI.h b/sigmodr/GlobalScriptUI.h index 9c3410aa..1187ac8f 100644 --- a/sigmodr/GlobalScriptUI.h +++ b/sigmodr/GlobalScriptUI.h @@ -44,7 +44,7 @@ class GlobalScriptUI : public ObjectUI, private Ui::formGlobalScript void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varScript_valueChanged(const Sigmod::Script& script); + void on_varScript_valueChanged(const Sigcore::Script& script); private slots: void setGui(); }; diff --git a/sigmodr/ItemUI.cpp b/sigmodr/ItemUI.cpp index 5af369df..03788a16 100644 --- a/sigmodr/ItemUI.cpp +++ b/sigmodr/ItemUI.cpp @@ -119,7 +119,7 @@ void Sigmodr::ItemUI::on_varDescription_textChanged(const QString& description) qobject_cast<Sigmod::Item*>(modified())->setDescription(description); } -void Sigmodr::ItemUI::on_varScript_valueChanged(const Sigmod::Script& script) +void Sigmodr::ItemUI::on_varScript_valueChanged(const Sigcore::Script& script) { qobject_cast<Sigmod::Item*>(modified())->setScript(script); } diff --git a/sigmodr/ItemUI.h b/sigmodr/ItemUI.h index 846c6cc6..c737bfed 100644 --- a/sigmodr/ItemUI.h +++ b/sigmodr/ItemUI.h @@ -50,7 +50,7 @@ class ItemUI : public ObjectUI, private Ui::formItem void on_varSellPrice_valueChanged(const int sellPrice); void on_varWeight_valueChanged(const int weight); void on_varDescription_textChanged(const QString& description); - void on_varScript_valueChanged(const Sigmod::Script& script); + void on_varScript_valueChanged(const Sigcore::Script& script); private: int m_lastType; private slots: diff --git a/sigmodr/MapEffectUI.cpp b/sigmodr/MapEffectUI.cpp index 4d94c203..87f79509 100644 --- a/sigmodr/MapEffectUI.cpp +++ b/sigmodr/MapEffectUI.cpp @@ -86,7 +86,7 @@ void Sigmodr::MapEffectUI::on_varSkin_currentIndexChanged(const int skin) qobject_cast<Sigmod::MapEffect*>(modified())->setSkin(varSkin->itemData(skin).toInt()); } -void Sigmodr::MapEffectUI::on_varScript_valueChanged(const Sigmod::Script& script) +void Sigmodr::MapEffectUI::on_varScript_valueChanged(const Sigcore::Script& script) { qobject_cast<Sigmod::MapEffect*>(modified())->setScript(script); } diff --git a/sigmodr/MapEffectUI.h b/sigmodr/MapEffectUI.h index ef7ac54f..15005ed9 100644 --- a/sigmodr/MapEffectUI.h +++ b/sigmodr/MapEffectUI.h @@ -46,7 +46,7 @@ class MapEffectUI : public ObjectUI, private Ui::formMapEffect void on_varName_textChanged(const QString& name); void on_varCoordinate_valueChanged(const QPoint& coordinate); void on_varSkin_currentIndexChanged(const int skin); - void on_varScript_valueChanged(const Sigmod::Script& script); + void on_varScript_valueChanged(const Sigcore::Script& script); void on_varIsGhost_clicked(const bool isGhost); private slots: void refreshGui(); diff --git a/sigmodr/MapTrainerUI.cpp b/sigmodr/MapTrainerUI.cpp index 7330a1df..e18e7900 100644 --- a/sigmodr/MapTrainerUI.cpp +++ b/sigmodr/MapTrainerUI.cpp @@ -108,7 +108,7 @@ void Sigmodr::MapTrainerUI::on_varNumberFight_valueChanged(const int numberFight qobject_cast<Sigmod::MapTrainer*>(modified())->setNumberFight(numberFight); } -void Sigmodr::MapTrainerUI::on_varScript_valueChanged(const Sigmod::Script& script) +void Sigmodr::MapTrainerUI::on_varScript_valueChanged(const Sigcore::Script& script) { qobject_cast<Sigmod::MapTrainer*>(modified())->setScript(script); } diff --git a/sigmodr/MapTrainerUI.h b/sigmodr/MapTrainerUI.h index 2fd1185e..30efd35b 100644 --- a/sigmodr/MapTrainerUI.h +++ b/sigmodr/MapTrainerUI.h @@ -47,7 +47,7 @@ class MapTrainerUI : public ObjectUI, private Ui::formMapTrainer void on_varTrainerClass_activated(const int trainerClass); void on_varCoordinate_valueChanged(const QPoint& coordinate); void on_varNumberFight_valueChanged(const int numberFight); - void on_varScript_valueChanged(const Sigmod::Script& script); + void on_varScript_valueChanged(const Sigcore::Script& script); void on_varLeadTeamMember_activated(const int leadTeamMember); private slots: void refreshGui(); diff --git a/sigmodr/MapWarpUI.cpp b/sigmodr/MapWarpUI.cpp index 07049479..304467b2 100644 --- a/sigmodr/MapWarpUI.cpp +++ b/sigmodr/MapWarpUI.cpp @@ -124,7 +124,7 @@ void Sigmodr::MapWarpUI::on_varToWarp_activated(const int toWarp) qobject_cast<Sigmod::MapWarp*>(modified())->setToWarp(toWarp); } -void Sigmodr::MapWarpUI::on_varScript_valueChanged(const Sigmod::Script& script) +void Sigmodr::MapWarpUI::on_varScript_valueChanged(const Sigcore::Script& script) { qobject_cast<Sigmod::MapWarp*>(modified())->setScript(script); } diff --git a/sigmodr/MapWarpUI.h b/sigmodr/MapWarpUI.h index 22679f8e..5a065c69 100644 --- a/sigmodr/MapWarpUI.h +++ b/sigmodr/MapWarpUI.h @@ -48,7 +48,7 @@ class MapWarpUI : public ObjectUI, private Ui::formMapWarp void on_varType_activated(const int type); void on_varToMap_activated(const int toMap); void on_varToWarp_activated(const int toWarp); - void on_varScript_valueChanged(const Sigmod::Script& script); + void on_varScript_valueChanged(const Sigcore::Script& script); private: int m_lastMap; private slots: diff --git a/sigmodr/MoveUI.cpp b/sigmodr/MoveUI.cpp index 9dad045a..17f9c2b2 100644 --- a/sigmodr/MoveUI.cpp +++ b/sigmodr/MoveUI.cpp @@ -86,7 +86,7 @@ void Sigmodr::MoveUI::on_varPriority_valueChanged(const int priority) qobject_cast<Sigmod::Move*>(modified())->setPriority(priority); } -void Sigmodr::MoveUI::on_varAccuracy_valueChanged(const Sigmod::Fraction& accuracy) +void Sigmodr::MoveUI::on_varAccuracy_valueChanged(const Sigcore::Fraction& accuracy) { qobject_cast<Sigmod::Move*>(modified())->setAccuracy(accuracy); } @@ -118,17 +118,17 @@ void Sigmodr::MoveUI::on_varDescription_textChanged(const QString& description) varDescription->setCursorPosition(cursor); } -void Sigmodr::MoveUI::on_varBattleScript_valueChanged(const Sigmod::Script& battleScript) +void Sigmodr::MoveUI::on_varBattleScript_valueChanged(const Sigcore::Script& battleScript) { qobject_cast<Sigmod::Move*>(modified())->setBattleScript(battleScript); } -void Sigmodr::MoveUI::on_varWorldScript_valueChanged(const Sigmod::Script& worldScript) +void Sigmodr::MoveUI::on_varWorldScript_valueChanged(const Sigcore::Script& worldScript) { qobject_cast<Sigmod::Move*>(modified())->setWorldScript(worldScript); } -void Sigmodr::MoveUI::on_varPriorityScript_valueChanged(const Sigmod::Script& priorityScript) +void Sigmodr::MoveUI::on_varPriorityScript_valueChanged(const Sigcore::Script& priorityScript) { qobject_cast<Sigmod::Move*>(modified())->setPriorityScript(priorityScript); } diff --git a/sigmodr/MoveUI.h b/sigmodr/MoveUI.h index 6c1219f9..ea17881a 100644 --- a/sigmodr/MoveUI.h +++ b/sigmodr/MoveUI.h @@ -45,15 +45,15 @@ class MoveUI : public ObjectUI, private Ui::formMove protected slots: void on_varName_textChanged(const QString& name); void on_varPriority_valueChanged(const int priority); - void on_varAccuracy_valueChanged(const Sigmod::Fraction& accuracy); + void on_varAccuracy_valueChanged(const Sigcore::Fraction& accuracy); void on_varPower_valueChanged(const int power); void on_varType_activated(const int type); void on_varPowerPoints_valueChanged(const int powerPoints); void on_varSpecial_toggled(const bool special); void on_varDescription_textChanged(const QString& description); - void on_varBattleScript_valueChanged(const Sigmod::Script& battleScript); - void on_varWorldScript_valueChanged(const Sigmod::Script& worldScript); - void on_varPriorityScript_valueChanged(const Sigmod::Script& priorityScript); + void on_varBattleScript_valueChanged(const Sigcore::Script& battleScript); + void on_varWorldScript_valueChanged(const Sigcore::Script& worldScript); + void on_varPriorityScript_valueChanged(const Sigcore::Script& priorityScript); private slots: void refreshGui(); void setGui(); diff --git a/sigmodr/NatureUI.cpp b/sigmodr/NatureUI.cpp index 213353c3..c8c5ef40 100644 --- a/sigmodr/NatureUI.cpp +++ b/sigmodr/NatureUI.cpp @@ -83,7 +83,7 @@ void Sigmodr::NatureUI::on_varName_textChanged(const QString& name) varName->setCursorPosition(cursor); } -void Sigmodr::NatureUI::on_varStatMultiplier_valueChanged(const Sigmod::Fraction& statMultiplier) +void Sigmodr::NatureUI::on_varStatMultiplier_valueChanged(const Sigcore::Fraction& statMultiplier) { qobject_cast<Sigmod::Nature*>(modified())->setStat(varStat->itemData(varStat->currentIndex()).value<Sigmod::Stat>(), statMultiplier); } diff --git a/sigmodr/NatureUI.h b/sigmodr/NatureUI.h index 01199ad3..f208c259 100644 --- a/sigmodr/NatureUI.h +++ b/sigmodr/NatureUI.h @@ -44,7 +44,7 @@ class NatureUI : public ObjectUI, private Ui::formNature void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varStatMultiplier_valueChanged(const Sigmod::Fraction& statMultiplier); + void on_varStatMultiplier_valueChanged(const Sigcore::Fraction& statMultiplier); void on_varWeight_valueChanged(const int weight); private slots: void initGui(); diff --git a/sigmodr/ScriptWidget.cpp b/sigmodr/ScriptWidget.cpp index 75857d98..6356a772 100644 --- a/sigmodr/ScriptWidget.cpp +++ b/sigmodr/ScriptWidget.cpp @@ -31,7 +31,7 @@ #include <KTextEditor/EditorChooser> #include <KTextEditor/View> -Sigmodr::ScriptWidget::ScriptWidget(QWidget* parent, const Sigmod::Script& value) : +Sigmodr::ScriptWidget::ScriptWidget(QWidget* parent, const Sigcore::Script& value) : QWidget(parent), m_value(value), m_editor(KTextEditor::EditorChooser::editor()), @@ -81,7 +81,7 @@ Sigmodr::ScriptWidget::ScriptWidget(QWidget* parent, const Sigmod::Script& value } layoutScript->addWidget(m_view); connect(m_document, SIGNAL(textChanged(KTextEditor::Document*)), this, SLOT(scriptChanged())); - connect(this, SIGNAL(valueChanged(const Sigmod::Script&)), SLOT(setGui())); + connect(this, SIGNAL(valueChanged(const Sigcore::Script&)), SLOT(setGui())); connect(m_view, SIGNAL(focusIn(KTextEditor::View*)), this, SLOT(focused(KTextEditor::View*))); connect(m_view, SIGNAL(focusOut(KTextEditor::View*)), this, SLOT(unfocused(KTextEditor::View*))); setGui(); @@ -92,7 +92,7 @@ Sigmodr::ScriptWidget::~ScriptWidget() m_editor->writeConfig(NULL); } -Sigmod::Script Sigmodr::ScriptWidget::value() const +Sigcore::Script Sigmodr::ScriptWidget::value() const { return m_value; } @@ -106,7 +106,7 @@ void Sigmodr::ScriptWidget::setGui() m_view->setCursorPosition(cursor); } -void Sigmodr::ScriptWidget::setValue(const Sigmod::Script& value) +void Sigmodr::ScriptWidget::setValue(const Sigcore::Script& value) { if (m_value != value) { diff --git a/sigmodr/ScriptWidget.h b/sigmodr/ScriptWidget.h index ea6ca348..b6c05c59 100644 --- a/sigmodr/ScriptWidget.h +++ b/sigmodr/ScriptWidget.h @@ -18,8 +18,8 @@ #ifndef SIGMODR_SCRIPTWIDGET #define SIGMODR_SCRIPTWIDGET -// Sigmod includes -#include "../sigmod/Script.h" +// Sigcore includes +#include "../sigcore/Script.h" // Qt includes #include <QtGui/QWidget> @@ -42,14 +42,14 @@ class ScriptWidget : public QWidget, private Ui::formScript Q_OBJECT public: - explicit ScriptWidget(QWidget* parent, const Sigmod::Script& value = Sigmod::Script("", "")); + explicit ScriptWidget(QWidget* parent, const Sigcore::Script& value = Sigcore::Script("", "")); ~ScriptWidget(); - Sigmod::Script value() const; + Sigcore::Script value() const; public slots: - void setValue(const Sigmod::Script& value); + void setValue(const Sigcore::Script& value); signals: - void valueChanged(const Sigmod::Script&); + void valueChanged(const Sigcore::Script&); protected slots: void setGui(); @@ -59,7 +59,7 @@ class ScriptWidget : public QWidget, private Ui::formScript void focused(KTextEditor::View* view); void unfocused(KTextEditor::View* view); private: - Sigmod::Script m_value; + Sigcore::Script m_value; KTextEditor::Editor* m_editor; KTextEditor::Document* m_document; KTextEditor::View* m_view; diff --git a/sigmodr/SigmodUI.cpp b/sigmodr/SigmodUI.cpp index 4dbc32a8..8128707a 100644 --- a/sigmodr/SigmodUI.cpp +++ b/sigmodr/SigmodUI.cpp @@ -147,10 +147,10 @@ void Sigmodr::SigmodUI::on_varTypechart_clicked(const QModelIndex& index) m_changingMult = true; varEffectiveness->setEnabled(true); boxEffectiveness->setTitle(QString("%1 vs. %2").arg(varTypechart->model()->headerData(index.row(), Qt::Vertical, Qt::DisplayRole).toString()).arg(varTypechart->model()->headerData(index.column(), Qt::Horizontal, Qt::DisplayRole).toString())); - varEffectiveness->setValue(varTypechart->model()->data(m_index, Qt::EditRole).value<Sigmod::Fraction>()); + varEffectiveness->setValue(varTypechart->model()->data(m_index, Qt::EditRole).value<Sigcore::Fraction>()); } -void Sigmodr::SigmodUI::on_varEffectiveness_valueChanged(const Sigmod::Fraction& multiplier) +void Sigmodr::SigmodUI::on_varEffectiveness_valueChanged(const Sigcore::Fraction& multiplier) { varTypechart->model()->setData(m_index, QVariant::fromValue(multiplier), Qt::EditRole); if (!m_changingMult) diff --git a/sigmodr/SigmodUI.h b/sigmodr/SigmodUI.h index 96ae8904..f76b00b3 100644 --- a/sigmodr/SigmodUI.h +++ b/sigmodr/SigmodUI.h @@ -50,7 +50,7 @@ class SigmodUI : public ObjectUI, private Ui::formSigmod void on_varMap_activated(const int map); void on_varWarp_activated(const int warp); void on_varTypechart_clicked(const QModelIndex& index); - void on_varEffectiveness_valueChanged(const Sigmod::Fraction& multiplier); + void on_varEffectiveness_valueChanged(const Sigcore::Fraction& multiplier); private: bool m_changingMult; int m_lastMap; diff --git a/sigmodr/SkinUI.cpp b/sigmodr/SkinUI.cpp index 7da7cb4b..c108aa17 100644 --- a/sigmodr/SkinUI.cpp +++ b/sigmodr/SkinUI.cpp @@ -58,7 +58,7 @@ void Sigmodr::SkinUI::on_varName_textChanged(const QString& name) varName->setCursorPosition(cursor); } -void Sigmodr::SkinUI::on_varScript_valueChanged(const Sigmod::Script& script) +void Sigmodr::SkinUI::on_varScript_valueChanged(const Sigcore::Script& script) { qobject_cast<Sigmod::Skin*>(modified())->setScript(script); } diff --git a/sigmodr/SkinUI.h b/sigmodr/SkinUI.h index 660ca9ac..3ed4534b 100644 --- a/sigmodr/SkinUI.h +++ b/sigmodr/SkinUI.h @@ -44,7 +44,7 @@ class SkinUI : public ObjectUI, private Ui::formSkin void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varScript_valueChanged(const Sigmod::Script& script); + void on_varScript_valueChanged(const Sigcore::Script& script); private slots: void setGui(); }; diff --git a/sigmodr/SpeciesUI.cpp b/sigmodr/SpeciesUI.cpp index 69e77757..a77ae536 100644 --- a/sigmodr/SpeciesUI.cpp +++ b/sigmodr/SpeciesUI.cpp @@ -259,12 +259,12 @@ void Sigmodr::SpeciesUI::on_varMaxHoldWeight_valueChanged(const int maxHoldWeigh qobject_cast<Sigmod::Species*>(modified())->setMaxHoldWeight(maxHoldWeight); } -void Sigmodr::SpeciesUI::on_varRunChance_valueChanged(const Sigmod::Fraction& runChance) +void Sigmodr::SpeciesUI::on_varRunChance_valueChanged(const Sigcore::Fraction& runChance) { qobject_cast<Sigmod::Species*>(modified())->setRunChance(runChance); } -void Sigmodr::SpeciesUI::on_varItemChance_valueChanged(const Sigmod::Fraction& itemChance) +void Sigmodr::SpeciesUI::on_varItemChance_valueChanged(const Sigcore::Fraction& itemChance) { qobject_cast<Sigmod::Species*>(modified())->setItemChance(itemChance); } @@ -316,10 +316,10 @@ void Sigmodr::SpeciesUI::on_varSkin_currentIndexChanged(const int skin) void Sigmodr::SpeciesUI::on_boxGenderChance_clicked(const bool genderChance) { - qobject_cast<Sigmod::Species*>(modified())->setGenderFactor(Sigmod::Fraction((genderChance ? 1 : 2), 1)); + qobject_cast<Sigmod::Species*>(modified())->setGenderFactor(Sigcore::Fraction((genderChance ? 1 : 2), 1)); } -void Sigmodr::SpeciesUI::on_varGenderChance_valueChanged(const Sigmod::Fraction& genderChance) +void Sigmodr::SpeciesUI::on_varGenderChance_valueChanged(const Sigcore::Fraction& genderChance) { qobject_cast<Sigmod::Species*>(modified())->setGenderFactor(genderChance); } @@ -334,7 +334,7 @@ void Sigmodr::SpeciesUI::on_varEggSteps_valueChanged(const int eggSteps) qobject_cast<Sigmod::Species*>(modified())->setEggSteps(eggSteps); } -void Sigmodr::SpeciesUI::on_varEvolution_valueChanged(const Sigmod::Script& evolution) +void Sigmodr::SpeciesUI::on_varEvolution_valueChanged(const Sigcore::Script& evolution) { qobject_cast<Sigmod::Species*>(modified())->setEvolution(evolution); } diff --git a/sigmodr/SpeciesUI.h b/sigmodr/SpeciesUI.h index 552e1ed4..4f6e0659 100644 --- a/sigmodr/SpeciesUI.h +++ b/sigmodr/SpeciesUI.h @@ -50,8 +50,8 @@ class SpeciesUI : public ObjectUI, private Ui::formSpecies void on_varExperienceValue_valueChanged(const int experienceValue); void on_varCatchValue_valueChanged(const int catchValue); void on_varMaxHoldWeight_valueChanged(const int maxHoldWeight); - void on_varRunChance_valueChanged(const Sigmod::Fraction& runChance); - void on_varItemChance_valueChanged(const Sigmod::Fraction& itemChance); + void on_varRunChance_valueChanged(const Sigcore::Fraction& runChance); + void on_varItemChance_valueChanged(const Sigcore::Fraction& itemChance); void on_varEncyclopediaNumber_valueChanged(const int encyclopediaNumber); void on_varWeight_valueChanged(const int weight); void on_varHeight_valueChanged(const int height); @@ -62,10 +62,10 @@ class SpeciesUI : public ObjectUI, private Ui::formSpecies void on_varFemaleBack_currentIndexChanged(const int femaleBack); void on_varSkin_currentIndexChanged(const int skin); void on_boxGenderChance_clicked(const bool genderUsed); - void on_varGenderChance_valueChanged(const Sigmod::Fraction& genderChance); + void on_varGenderChance_valueChanged(const Sigcore::Fraction& genderChance); void on_varEggSpecies_activated(const int eggSpecies); void on_varEggSteps_valueChanged(const int eggSteps); - void on_varEvolution_valueChanged(const Sigmod::Script& evolution); + void on_varEvolution_valueChanged(const Sigcore::Script& evolution); void on_varTypes_itemClicked(QListWidgetItem* item); void on_varEggGroups_itemClicked(QListWidgetItem* item); private slots: diff --git a/sigmodr/StatusUI.cpp b/sigmodr/StatusUI.cpp index 0af1d04f..002bfb59 100644 --- a/sigmodr/StatusUI.cpp +++ b/sigmodr/StatusUI.cpp @@ -59,12 +59,12 @@ void Sigmodr::StatusUI::on_varName_textChanged(const QString& name) varName->setCursorPosition(cursor); } -void Sigmodr::StatusUI::on_varBattleScript_valueChanged(const Sigmod::Script& battleScript) +void Sigmodr::StatusUI::on_varBattleScript_valueChanged(const Sigcore::Script& battleScript) { qobject_cast<Sigmod::Status*>(modified())->setBattleScript(battleScript); } -void Sigmodr::StatusUI::on_varWorldScript_valueChanged(const Sigmod::Script& worldScript) +void Sigmodr::StatusUI::on_varWorldScript_valueChanged(const Sigcore::Script& worldScript) { qobject_cast<Sigmod::Status*>(modified())->setWorldScript(worldScript); } diff --git a/sigmodr/StatusUI.h b/sigmodr/StatusUI.h index 1254f6fb..0337e23b 100644 --- a/sigmodr/StatusUI.h +++ b/sigmodr/StatusUI.h @@ -44,8 +44,8 @@ class StatusUI : public ObjectUI, private Ui::formStatus void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varBattleScript_valueChanged(const Sigmod::Script& battleScript); - void on_varWorldScript_valueChanged(const Sigmod::Script& worldScript); + void on_varBattleScript_valueChanged(const Sigcore::Script& battleScript); + void on_varWorldScript_valueChanged(const Sigcore::Script& worldScript); private slots: void setGui(); }; diff --git a/sigmodr/TileUI.cpp b/sigmodr/TileUI.cpp index f360f438..efa428e3 100644 --- a/sigmodr/TileUI.cpp +++ b/sigmodr/TileUI.cpp @@ -106,7 +106,7 @@ void Sigmodr::TileUI::on_varAccessibility_itemClicked(QListWidgetItem* item) qobject_cast<Sigmod::Tile*>(modified())->setFrom(item->data(Qt::UserRole).value<Sigmod::Direction>(), item->isSelected()); } -void Sigmodr::TileUI::on_varScript_valueChanged(const Sigmod::Script& script) +void Sigmodr::TileUI::on_varScript_valueChanged(const Sigcore::Script& script) { qobject_cast<Sigmod::Tile*>(modified())->setScript(script); } diff --git a/sigmodr/TileUI.h b/sigmodr/TileUI.h index cc0db6c3..b387f89c 100644 --- a/sigmodr/TileUI.h +++ b/sigmodr/TileUI.h @@ -46,7 +46,7 @@ class TileUI : public ObjectUI, private Ui::formTile void on_varName_textChanged(const QString& name); void on_varSprite_currentIndexChanged(const int sprite); void on_varAccessibility_itemClicked(QListWidgetItem* item); - void on_varScript_valueChanged(const Sigmod::Script& script); + void on_varScript_valueChanged(const Sigcore::Script& script); private slots: void initGui(); void refreshGui(); diff --git a/sigmodr/TilemapModel.cpp b/sigmodr/TilemapModel.cpp index 62424007..82cbf5d9 100644 --- a/sigmodr/TilemapModel.cpp +++ b/sigmodr/TilemapModel.cpp @@ -26,7 +26,7 @@ // Qt includes #include <QtGui/QPixmap> -Sigmodr::TilemapModel::TilemapModel(Sigmod::Matrix<int>* tilemap, const Sigmod::Sigmod* sigmod) : +Sigmodr::TilemapModel::TilemapModel(Sigcore::Matrix<int>* tilemap, const Sigmod::Sigmod* sigmod) : QAbstractTableModel(), m_tilemap(*tilemap), m_sigmod(sigmod) diff --git a/sigmodr/TilemapModel.h b/sigmodr/TilemapModel.h index 651de8b5..88e891ae 100644 --- a/sigmodr/TilemapModel.h +++ b/sigmodr/TilemapModel.h @@ -18,8 +18,8 @@ #ifndef SIGMODR_TILEMAPMODEL #define SIGMODR_TILEMAPMODEL -// Sigmod includes -#include "../sigmod/Matrix.h" +// Sigcore includes +#include "../sigcore/Matrix.h" // Qt includes #include <QtCore/QAbstractTableModel> @@ -38,7 +38,7 @@ class TilemapModel : public QAbstractTableModel Q_OBJECT public: - TilemapModel(Sigmod::Matrix<int>* tilemap, const Sigmod::Sigmod* sigmod); + TilemapModel(Sigcore::Matrix<int>* tilemap, const Sigmod::Sigmod* sigmod); QVariant data(const QModelIndex& index, int role) const; QVariant headerData(int section, Qt::Orientation /*orientation*/, int role = Qt::DisplayRole) const; @@ -55,7 +55,7 @@ class TilemapModel : public QAbstractTableModel bool setData(const QModelIndex& index, const QVariant& value, int role); private: - Sigmod::Matrix<int>& m_tilemap; + Sigcore::Matrix<int>& m_tilemap; const Sigmod::Sigmod* m_sigmod; }; } diff --git a/sigmodr/TypeUI.cpp b/sigmodr/TypeUI.cpp index 202f1aa8..3b8494c0 100644 --- a/sigmodr/TypeUI.cpp +++ b/sigmodr/TypeUI.cpp @@ -58,7 +58,7 @@ void Sigmodr::TypeUI::on_varName_textChanged(const QString& name) varName->setCursorPosition(cursor); } -void Sigmodr::TypeUI::on_varSTAB_valueChanged(const Sigmod::Fraction& stab) +void Sigmodr::TypeUI::on_varSTAB_valueChanged(const Sigcore::Fraction& stab) { qobject_cast<Sigmod::Type*>(modified())->setStab(stab); } diff --git a/sigmodr/TypeUI.h b/sigmodr/TypeUI.h index 924b7c85..fc0b1daf 100644 --- a/sigmodr/TypeUI.h +++ b/sigmodr/TypeUI.h @@ -44,7 +44,7 @@ class TypeUI : public ObjectUI, private Ui::formType void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varSTAB_valueChanged(const Sigmod::Fraction& stab); + void on_varSTAB_valueChanged(const Sigcore::Fraction& stab); private slots: void setGui(); }; diff --git a/sigmodr/TypechartModel.cpp b/sigmodr/TypechartModel.cpp index 29e7cc26..bc71d24e 100644 --- a/sigmodr/TypechartModel.cpp +++ b/sigmodr/TypechartModel.cpp @@ -21,7 +21,7 @@ // KDE includes #include <KColorScheme> -Sigmodr::TypechartModel::TypechartModel(Sigmod::Matrix<Sigmod::Fraction>* typechart, const QStringList& types) : +Sigmodr::TypechartModel::TypechartModel(Sigcore::Matrix<Sigcore::Fraction>* typechart, const QStringList& types) : QAbstractTableModel(), m_typechart(*typechart), m_types(types) @@ -79,9 +79,9 @@ bool Sigmodr::TypechartModel::setData(const QModelIndex& index, const QVariant& return false; if (role == Qt::EditRole) { - if (value.canConvert<Sigmod::Fraction>()) + if (value.canConvert<Sigcore::Fraction>()) { - m_typechart(index.row(), index.column()) = value.value<Sigmod::Fraction>(); + m_typechart(index.row(), index.column()) = value.value<Sigcore::Fraction>(); emit(dataChanged(index, index)); return true; } diff --git a/sigmodr/TypechartModel.h b/sigmodr/TypechartModel.h index 86b62da2..905b2f2c 100644 --- a/sigmodr/TypechartModel.h +++ b/sigmodr/TypechartModel.h @@ -18,9 +18,9 @@ #ifndef SIGMODR_TYPECHARTMODEL #define SIGMODR_TYPECHARTMODEL -// Sigmod includes -#include "../sigmod/Fraction.h" -#include "../sigmod/Matrix.h" +// Sigcore includes +#include "../sigcore/Fraction.h" +#include "../sigcore/Matrix.h" // Qt includes #include <QtCore/QAbstractTableModel> @@ -34,7 +34,7 @@ class TypechartModel : public QAbstractTableModel Q_OBJECT public: - TypechartModel(Sigmod::Matrix<Sigmod::Fraction>* typechart, const QStringList& types); + TypechartModel(Sigcore::Matrix<Sigcore::Fraction>* typechart, const QStringList& types); QVariant data(const QModelIndex& index, int role) const; QVariant headerData(int section, Qt::Orientation /*orientation*/, int role = Qt::DisplayRole) const; @@ -48,7 +48,7 @@ class TypechartModel : public QAbstractTableModel void discarded(); private: - Sigmod::Matrix<Sigmod::Fraction>& m_typechart; + Sigcore::Matrix<Sigcore::Fraction>& m_typechart; const QStringList m_types; }; } diff --git a/sigmodr/WeatherUI.cpp b/sigmodr/WeatherUI.cpp index 84132e10..1af944b6 100644 --- a/sigmodr/WeatherUI.cpp +++ b/sigmodr/WeatherUI.cpp @@ -58,7 +58,7 @@ void Sigmodr::WeatherUI::on_varName_textChanged(const QString& name) varName->setCursorPosition(cursor); } -void Sigmodr::WeatherUI::on_varScript_valueChanged(const Sigmod::Script& script) +void Sigmodr::WeatherUI::on_varScript_valueChanged(const Sigcore::Script& script) { qobject_cast<Sigmod::Weather*>(modified())->setScript(script); } diff --git a/sigmodr/WeatherUI.h b/sigmodr/WeatherUI.h index afdd1e64..63e6fd4f 100644 --- a/sigmodr/WeatherUI.h +++ b/sigmodr/WeatherUI.h @@ -44,7 +44,7 @@ class WeatherUI : public ObjectUI, private Ui::formWeather void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varScript_valueChanged(const Sigmod::Script& script); + void on_varScript_valueChanged(const Sigcore::Script& script); private slots: void setGui(); }; 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); |