diff options
| -rw-r--r-- | sigencore/Arena.cpp | 28 | ||||
| -rw-r--r-- | sigencore/Arena.h | 8 | ||||
| -rw-r--r-- | sigencore/Client.cpp | 4 | ||||
| -rw-r--r-- | sigencore/Client.h | 6 | ||||
| -rw-r--r-- | sigencore/Containment.cpp | 10 | ||||
| -rw-r--r-- | sigencore/Containment.h | 8 | ||||
| -rw-r--r-- | sigencore/Creature.cpp | 62 | ||||
| -rw-r--r-- | sigencore/Creature.h | 8 | ||||
| -rw-r--r-- | sigencore/Player.cpp | 18 | ||||
| -rw-r--r-- | sigencore/Player.h | 2 | ||||
| -rw-r--r-- | sigencore/RunScript.cpp | 6 | ||||
| -rw-r--r-- | sigencore/RunScript.h | 4 | ||||
| -rw-r--r-- | sigencore/Team.cpp | 8 | ||||
| -rw-r--r-- | sigencore/Team.h | 4 | ||||
| -rw-r--r-- | sigencore/TeamMember.cpp | 34 |
15 files changed, 105 insertions, 105 deletions
diff --git a/sigencore/Arena.cpp b/sigencore/Arena.cpp index 1a9507bf..01577dfb 100644 --- a/sigencore/Arena.cpp +++ b/sigencore/Arena.cpp @@ -25,10 +25,10 @@ #include "Team.h" // Sigscript includes +#include <sigscript/GameWrapper.h> #include <sigscript/ItemWrapper.h> #include <sigscript/MoveWrapper.h> #include <sigscript/RulesWrapper.h> -#include <sigscript/SigmodWrapper.h> #include <sigscript/SpeciesWrapper.h> #include <sigscript/WeatherWrapper.h> @@ -59,9 +59,9 @@ Sigencore::TeamMember::Action Sigencore::decision(Player* player, TeamMember* te return player->requestAction(teamMember); } -Sigencore::Arena::Arena(Sigscript::SigmodWrapper* sigmod, const bool isWild, Sigscript::Config* parent) : +Sigencore::Arena::Arena(Sigscript::GameWrapper* game, const bool isWild, Sigscript::Config* parent) : Sigscript::Config(parent), - m_sigmod(sigmod), + m_game(game), m_isWild(isWild), m_state(Setup), m_id(QUuid::createUuid()) @@ -187,7 +187,7 @@ void Sigencore::Arena::setWeather(TeamMember* teamMember, Sigscript::WeatherWrap ObjectMap objects; objects["arena"] = this; objects["weather"] = weather; - objects["sigmod"] = m_sigmod; + objects["game"] = m_game; objects["owner"] = teamMember; objects["client"] = player(teamMember); Kross::Action* action = runScript(QString("arena-weather-%1").arg(QUuid::createUuid().toString()), weather->script(), objects, m_actions); @@ -208,9 +208,9 @@ bool Sigencore::Arena::unsetWeather(Sigscript::WeatherWrapper* weather) return false; } -Sigscript::SigmodWrapper* Sigencore::Arena::sigmod() const +Sigscript::GameWrapper* Sigencore::Arena::game() const { - return m_sigmod; + return m_game; } bool Sigencore::Arena::addClient(Client* client, const int team) @@ -218,7 +218,7 @@ bool Sigencore::Arena::addClient(Client* client, const int team) if (0 <= team) { Player* player = qobject_cast<Player*>(client); - if ((m_state != Setup) || !player || !isTeamAllowed(player->team()) || (active(Fighters).size() < m_sigmod->rules()->maxPlayers())) + if ((m_state != Setup) || !player || !isTeamAllowed(player->team()) || (active(Fighters).size() < m_game->rules()->maxPlayers())) return false; } if (!client->enterArena(this)) @@ -283,7 +283,7 @@ void Sigencore::Arena::handleAction(TeamMember* teamMember, TeamMember::Action a break; case TeamMember::Attack: { - Sigscript::MoveWrapper* move = sigmod()->move(data.first.toInt()); + Sigscript::MoveWrapper* move = game()->move(data.first.toInt()); if (move) { const Sigcore::Script script = move->battleScript(); @@ -293,7 +293,7 @@ void Sigencore::Arena::handleAction(TeamMember* teamMember, TeamMember::Action a objects["arena"] = this; objects["owner"] = teamMember; objects["client"] = player(teamMember); - objects["sigmod"] = m_sigmod; + objects["game"] = m_game; for (int i = 0; i < data.second.size(); ++i) objects[QString("target%1").arg(i)] = findMember(data.second[i]); runScript(QUuid::createUuid().toString(), script, objects, m_actions)->trigger(); @@ -303,7 +303,7 @@ void Sigencore::Arena::handleAction(TeamMember* teamMember, TeamMember::Action a } case TeamMember::Item: { - Sigscript::ItemWrapper* item = m_sigmod->item(data.first.toInt()); + Sigscript::ItemWrapper* item = m_game->item(data.first.toInt()); if (item) { const Sigcore::Script script = item->script(); @@ -312,7 +312,7 @@ void Sigencore::Arena::handleAction(TeamMember* teamMember, TeamMember::Action a ObjectMap objects; objects["arena"] = this; objects["client"] = player(teamMember); - objects["sigmod"] = m_sigmod; + objects["game"] = m_game; for (int i = 0; i < data.second.size(); ++i) objects[QString("target%1").arg(i)] = findMember(data.second[i]); runScript(QUuid::createUuid().toString(), script, objects, m_actions)->trigger(); @@ -368,10 +368,10 @@ void Sigencore::Arena::handleAction(TeamMember* teamMember, TeamMember::Action a objects["arena"] = this; objects["owner"] = teamMember; objects["client"] = player(teamMember); - objects["sigmod"] = m_sigmod; + objects["game"] = m_game; for (int i = 0; i < data.second.size(); ++i) objects[QString("target%1").arg(i)] = findMember(data.second[i]); - globalScript(m_sigmod, QString("battleaction-handler-%1").arg(action.first), QUuid::createUuid().toString(), objects, m_actions)->trigger(); + globalScript(m_game, QString("battleaction-handler-%1").arg(action.first), QUuid::createUuid().toString(), objects, m_actions)->trigger(); break; } } @@ -426,7 +426,7 @@ void Sigencore::Arena::checkForLosers() { const int money = loser->money(); Sigcore::Fraction lossFactor(1, 2); - m_sigmod->valueOfType("lossFactor", &lossFactor); + m_game->valueOfType("lossFactor", &lossFactor); pot[m_teams[loser]] += money * lossFactor; m_spoils[loser].second = money * lossFactor; } diff --git a/sigencore/Arena.h b/sigencore/Arena.h index 15fd64a9..8b9b3317 100644 --- a/sigencore/Arena.h +++ b/sigencore/Arena.h @@ -44,7 +44,7 @@ class Script; } namespace Sigscript { -class SigmodWrapper; +class GameWrapper; class WeatherWrapper; } @@ -92,7 +92,7 @@ class SIGENCORE_EXPORT Arena : public Sigscript::Config Q_SCRIPTABLE virtual TeamMember::Action requestAction(TeamMember* teamMember) const = 0; Q_SCRIPTABLE virtual bool isTeamAllowed(Team* team) = 0; - Q_SCRIPTABLE Sigscript::SigmodWrapper* sigmod() const; + Q_SCRIPTABLE Sigscript::GameWrapper* game() const; public slots: bool addClient(Client* client, const int team); void removeClient(Client* client); @@ -110,7 +110,7 @@ class SIGENCORE_EXPORT Arena : public Sigscript::Config void clientAdded(Client* client, const int team); void clientRemoved(Client* client, const int team); protected: - Arena(Sigscript::SigmodWrapper* sigmod, const bool isWild, Sigscript::Config* parent); + Arena(Sigscript::GameWrapper* game, const bool isWild, Sigscript::Config* parent); virtual ~Arena(); virtual void handleAction(TeamMember* teamMember, TeamMember::Action action); @@ -122,7 +122,7 @@ class SIGENCORE_EXPORT Arena : public Sigscript::Config TeamMember* findMember(const QUuid& id); - Sigscript::SigmodWrapper* m_sigmod; + Sigscript::GameWrapper* m_game; const bool m_isWild; QMap<Client*, int> m_teams; Kross::ActionCollection* m_actions; diff --git a/sigencore/Client.cpp b/sigencore/Client.cpp index 0c59970b..f877db11 100644 --- a/sigencore/Client.cpp +++ b/sigencore/Client.cpp @@ -18,9 +18,9 @@ // Header include #include "Client.h" -Sigencore::Client::Client(Sigscript::SigmodWrapper* sigmod, Sigscript::Config* parent) : +Sigencore::Client::Client(Sigscript::GameWrapper* game, Sigscript::Config* parent) : Sigscript::Config(parent), - m_sigmod(sigmod) + m_game(game) { } diff --git a/sigencore/Client.h b/sigencore/Client.h index 9ec0fc30..5074ec01 100644 --- a/sigencore/Client.h +++ b/sigencore/Client.h @@ -27,7 +27,7 @@ // Forward declarations namespace Sigscript { -class SigmodWrapper; +class GameWrapper; } namespace Sigencore @@ -56,10 +56,10 @@ class SIGENCORE_EXPORT Client : public Sigscript::Config // // void timeout(); protected: - Client(Sigscript::SigmodWrapper* sigmod, Sigscript::Config* parent); + Client(Sigscript::GameWrapper* game, Sigscript::Config* parent); virtual ~Client(); - Sigscript::SigmodWrapper* m_sigmod; + Sigscript::GameWrapper* m_game; Arena* m_arena; protected slots: private: diff --git a/sigencore/Containment.cpp b/sigencore/Containment.cpp index ce04caee..116f73f0 100644 --- a/sigencore/Containment.cpp +++ b/sigencore/Containment.cpp @@ -22,12 +22,12 @@ #include "Creature.h" // Sigscript includes +#include <sigscript/GameWrapper.h> #include <sigscript/RulesWrapper.h> -#include <sigscript/SigmodWrapper.h> -Sigencore::Containment::Containment(Sigscript::SigmodWrapper* sigmod, Sigscript::Config* parent) : +Sigencore::Containment::Containment(Sigscript::GameWrapper* game, Sigscript::Config* parent) : Sigscript::Config(parent), - m_sigmod(sigmod) + m_game(game) { } @@ -81,7 +81,7 @@ bool Sigencore::Containment::reorder(const int from, const int to) return false; } -Sigscript::SigmodWrapper* Sigencore::Containment::sigmod() const +Sigscript::GameWrapper* Sigencore::Containment::game() const { - return m_sigmod; + return m_game; } diff --git a/sigencore/Containment.h b/sigencore/Containment.h index cba7a0af..edd166f6 100644 --- a/sigencore/Containment.h +++ b/sigencore/Containment.h @@ -32,7 +32,7 @@ class QUuid; namespace Sigscript { -class SigmodWrapper; +class GameWrapper; } namespace Sigencore @@ -44,7 +44,7 @@ class SIGENCORE_EXPORT Containment : public Sigscript::Config Q_OBJECT public: - Containment(Sigscript::SigmodWrapper* sigmod, Sigscript::Config* parent); + Containment(Sigscript::GameWrapper* game, Sigscript::Config* parent); virtual ~Containment(); QList<Creature*> members() const; @@ -54,12 +54,12 @@ class SIGENCORE_EXPORT Containment : public Sigscript::Config Creature* findMember(const QUuid& id) const; virtual bool reorder(const int from, const int to); - Sigscript::SigmodWrapper* sigmod() const; + Sigscript::GameWrapper* game() const; signals: void memberAdded(Creature* member, const int position); void memberMoved(Creature* member, const int from, const int to); protected: - Sigscript::SigmodWrapper* m_sigmod; + Sigscript::GameWrapper* m_game; QList<Creature*> m_members; }; } diff --git a/sigencore/Creature.cpp b/sigencore/Creature.cpp index 305e18a3..d276f797 100644 --- a/sigencore/Creature.cpp +++ b/sigencore/Creature.cpp @@ -22,11 +22,11 @@ #include "Containment.h" // Sigscript includes +#include <sigscript/GameWrapper.h> #include <sigscript/ItemWrapper.h> #include <sigscript/MoveWrapper.h> #include <sigscript/NatureWrapper.h> #include <sigscript/RulesWrapper.h> -#include <sigscript/SigmodWrapper.h> #include <sigscript/SpeciesWrapper.h> #include <sigscript/SpeciesMoveWrapper.h> @@ -43,7 +43,7 @@ QMap<Sigencore::Creature::StyleLevel, long long> Sigencore::Creature::m_expCache Sigencore::Creature::Creature(Sigscript::SpeciesWrapper* species, const int level, Containment* containment, const bool suppressInitialization) : Sigscript::Config(containment), - m_sigmod(containment->sigmod()), + m_game(containment->game()), m_containment(containment), m_species(species), m_gender(Undecided), @@ -72,9 +72,9 @@ QUuid Sigencore::Creature::id() const return m_id; } -Sigscript::SigmodWrapper* Sigencore::Creature::sigmod() const +Sigscript::GameWrapper* Sigencore::Creature::game() const { - return m_sigmod; + return m_game; } bool Sigencore::Creature::setContainment(Containment* containment) @@ -110,7 +110,7 @@ QString Sigencore::Creature::name() const bool Sigencore::Creature::setGender(const Gender gender) { - if (!m_sigmod->rules()->genderAllowed()) + if (!m_game->rules()->genderAllowed()) return false; const Sigcore::Fraction genderFactor = m_species->genderFactor(); switch (gender) @@ -142,7 +142,7 @@ Sigencore::Creature::Gender Sigencore::Creature::gender() const bool Sigencore::Creature::setLevel(const int level) { - if ((level <= 0) || (m_sigmod->rules()->maxLevel() < level)) + if ((level <= 0) || (m_game->rules()->maxLevel() < level)) return false; m_level = level; m_levelExp = calcLevelExperience(m_species->growth(), m_level); @@ -174,7 +174,7 @@ bool Sigencore::Creature::setLevelExperience(const long long levelExp) if (levelExp < 0) return false; const int level = calcLevel(m_species->growth(), levelExp); - if ((level <= 0) || (m_sigmod->rules()->maxLevel() < level)) + if ((level <= 0) || (m_game->rules()->maxLevel() < level)) return false; m_levelExp = levelExp; if (level != m_level) @@ -277,7 +277,7 @@ int Sigencore::Creature::currentHp() const bool Sigencore::Creature::setDv(const Sigmod::Stat stat, const int dv) { - if ((stat == Sigmod::ST_SpecialDefense) && !(m_sigmod->rules()->specialSplit() && m_sigmod->rules()->specialDVSplit())) + if ((stat == Sigmod::ST_SpecialDefense) && !(m_game->rules()->specialSplit() && m_game->rules()->specialDVSplit())) return false; m_dv[stat] = dv; emit(dvChanged(stat, dv)); @@ -291,30 +291,30 @@ int Sigencore::Creature::dv(const Sigmod::Stat stat) const Sigmod::Stat actualStat = stat; if (stat == Sigmod::ST_SpecialDefense) { - if (m_sigmod->rules()->specialSplit() && m_sigmod->rules()->specialDVSplit()) + if (m_game->rules()->specialSplit() && m_game->rules()->specialDVSplit()) actualStat = Sigmod::ST_Special; else return false; } int dv; - if (valueOfType(QString("stat-dv-%1").arg((m_sigmod->rules()->specialSplit() ? Sigmod::StatGSCStr : Sigmod::StatRBYStr)[actualStat]), &dv) && (dv < (m_sigmod->rules()->specialDVSplit() ? 32 : 16))) + if (valueOfType(QString("stat-dv-%1").arg((m_game->rules()->specialSplit() ? Sigmod::StatGSCStr : Sigmod::StatRBYStr)[actualStat]), &dv) && (dv < (m_game->rules()->specialDVSplit() ? 32 : 16))) return dv; return m_dv[actualStat]; } bool Sigencore::Creature::setStatExperience(const Sigmod::Stat stat, const long long statExp) { - if ((stat == Sigmod::ST_Accuracy) || (stat == Sigmod::ST_Evasion) || ((stat == Sigmod::ST_SpecialDefense) && !m_sigmod->rules()->specialSplit())) + if ((stat == Sigmod::ST_Accuracy) || (stat == Sigmod::ST_Evasion) || ((stat == Sigmod::ST_SpecialDefense) && !m_game->rules()->specialSplit())) return false; - if (m_sigmod->rules()->effortValuesAllowed()) + if (m_game->rules()->effortValuesAllowed()) { int evSum = statExp; - for (int i = Sigmod::ST_HP; i <= (m_sigmod->rules()->specialSplit() ? Sigmod::ST_Special : Sigmod::ST_SpecialDefense); ++i) + for (int i = Sigmod::ST_HP; i <= (m_game->rules()->specialSplit() ? Sigmod::ST_Special : Sigmod::ST_SpecialDefense); ++i) { if (i != stat) evSum += m_statExp[i]; } - if ((m_sigmod->rules()->maxEVPerStat() < statExp) || (m_sigmod->rules()->maxTotalEV() < evSum)) + if ((m_game->rules()->maxEVPerStat() < statExp) || (m_game->rules()->maxTotalEV() < evSum)) return false; } m_statExp[stat] = statExp; @@ -330,7 +330,7 @@ bool Sigencore::Creature::giveStatExperience(const Sigmod::Stat stat, const long long long Sigencore::Creature::statExperience(const Sigmod::Stat stat) const { long long exp = m_statExp[stat]; - valueOfType(QString("stat-experience-%1").arg((m_sigmod->rules()->specialSplit() ? Sigmod::StatGSCStr : Sigmod::StatRBYStr)[stat]), &exp); + valueOfType(QString("stat-experience-%1").arg((m_game->rules()->specialSplit() ? Sigmod::StatGSCStr : Sigmod::StatRBYStr)[stat]), &exp); return exp; } @@ -342,21 +342,21 @@ int Sigencore::Creature::statValue(const Sigmod::Stat stat) const foreach (Sigscript::NatureWrapper* nature, m_natures) multiplier *= nature->stat(stat); } - return calcStat(m_sigmod, stat, m_level, m_species->baseStat(stat), dv(stat), statExperience(stat), multiplier); + return calcStat(m_game, stat, m_level, m_species->baseStat(stat), dv(stat), statExperience(stat), multiplier); } -int Sigencore::Creature::calcStat(Sigscript::SigmodWrapper* sigmod, const Sigmod::Stat stat, const int level, const int baseStat, const int dv, const int statExp, const Sigcore::Fraction& multiplier) +int Sigencore::Creature::calcStat(Sigscript::GameWrapper* game, const Sigmod::Stat stat, const int level, const int baseStat, const int dv, const int statExp, const Sigcore::Fraction& multiplier) { int statValue = statExp; - if (!sigmod->rules()->effortValuesAllowed() && statValue) + if (!game->rules()->effortValuesAllowed() && statValue) statValue = sqrt(statValue - 1) + 1; statValue >>= 2; statValue += baseStat << 1; - if (sigmod->rules()->specialDVSplit()) + if (game->rules()->specialDVSplit()) statValue += dv << 1; else statValue += dv; - statValue *= double(level) / sigmod->rules()->maxLevel(); + statValue *= double(level) / game->rules()->maxLevel(); if (stat == Sigmod::ST_HP) statValue += 10 + level; else @@ -371,7 +371,7 @@ void Sigencore::Creature::recalcStats() recalcStat(Sigmod::ST_Attack); recalcStat(Sigmod::ST_Defense); recalcStat(Sigmod::ST_Speed); - if (m_sigmod->rules()->specialSplit()) + if (m_game->rules()->specialSplit()) { recalcStat(Sigmod::ST_SpecialAttack); recalcStat(Sigmod::ST_SpecialDefense); @@ -388,7 +388,7 @@ void Sigencore::Creature::recalcStat(const Sigmod::Stat stat) bool Sigencore::Creature::addAbility(Sigscript::AbilityWrapper* ability) { - if ((m_abilities.size() < m_sigmod->rules()->maxAbilities()) && !m_abilities.contains(ability)) + if ((m_abilities.size() < m_game->rules()->maxAbilities()) && !m_abilities.contains(ability)) { m_abilities.append(ability); emit(abilityAdded(ability)); @@ -438,7 +438,7 @@ bool Sigencore::Creature::addItems(Sigscript::ItemWrapper* item, const int count else if (0 < count) { const int diffWeight = m_species->weight() - (itemWeight() + addWeight); - const int diffCount = m_sigmod->rules()->maxHeldItems() - (itemCount() + count); + const int diffCount = m_game->rules()->maxHeldItems() - (itemCount() + count); if ((0 < diffWeight) && (0 < diffCount)) end = count; else if (!allOrNothing) @@ -495,7 +495,7 @@ bool Sigencore::Creature::addMove(Sigscript::MoveWrapper* move) if (m_species->move(i)->move() == move) canLearn = true; } - if (canLearn && (m_moves.size() < m_sigmod->rules()->maxMoves()) && !m_moves.contains(move)) + if (canLearn && (m_moves.size() < m_game->rules()->maxMoves()) && !m_moves.contains(move)) { m_moves.append(move); emit(moveAdded(move)); @@ -527,7 +527,7 @@ bool Sigencore::Creature::hasMove(Sigscript::MoveWrapper* move) const bool Sigencore::Creature::addNature(Sigscript::NatureWrapper* nature) { - if ((m_natures.size() < m_sigmod->rules()->maxNatures()) && !m_natures.contains(nature)) + if ((m_natures.size() < m_game->rules()->maxNatures()) && !m_natures.contains(nature)) { m_natures.append(nature); emit(natureAdded(nature)); @@ -596,7 +596,7 @@ void Sigencore::Creature::completeData() m_name = m_species->name(); if (m_gender == Undecided) { - if (!m_sigmod->rules()->genderAllowed() || (m_species->genderFactor() < 0)) + if (!m_game->rules()->genderAllowed() || (m_species->genderFactor() < 0)) m_gender = Genderless; else m_gender = (m_species->genderFactor().poll() ? Female : Male); @@ -612,7 +612,7 @@ void Sigencore::Creature::completeData() void Sigencore::Creature::completeStats() { - if (m_sigmod->rules()->specialSplit() && m_sigmod->rules()->specialDVSplit()) + if (m_game->rules()->specialSplit() && m_game->rules()->specialDVSplit()) { for (int i = Sigmod::ST_HP; i <= Sigmod::ST_SpecialDefense; ++i) m_dv[i] = qrand() & 31; @@ -628,7 +628,7 @@ void Sigencore::Creature::completeStats() void Sigencore::Creature::completeAbilities() { Sigcore::Hat<Sigscript::AbilityWrapper*> abilityHat = m_species->abilityHat(); - while ((m_abilities.size() < sigmod()->rules()->maxAbilities()) && abilityHat.count()) + while ((m_abilities.size() < game()->rules()->maxAbilities()) && abilityHat.count()) addAbility(abilityHat.takeAndClear()); } @@ -636,7 +636,7 @@ void Sigencore::Creature::completeItems() { Sigcore::Hat<Sigscript::ItemWrapper*> itemHat = m_species->itemHat(); int i = 0; - while ((i < m_sigmod->rules()->maxHeldItems()) && itemHat.count()) + while ((i < m_game->rules()->maxHeldItems()) && itemHat.count()) { if (m_species->itemChance().poll()) { @@ -666,8 +666,8 @@ void Sigencore::Creature::completeMoves() void Sigencore::Creature::completeNatures() { - Sigcore::Hat<Sigscript::NatureWrapper*> natureHat = sigmod()->natureHat(); - while ((m_natures.size() < m_sigmod->rules()->maxNatures()) && natureHat.count()) + Sigcore::Hat<Sigscript::NatureWrapper*> natureHat = game()->natureHat(); + while ((m_natures.size() < m_game->rules()->maxNatures()) && natureHat.count()) addNature(natureHat.takeAndClear()); } diff --git a/sigencore/Creature.h b/sigencore/Creature.h index 3c5c0eb9..ce1a2a27 100644 --- a/sigencore/Creature.h +++ b/sigencore/Creature.h @@ -44,10 +44,10 @@ class Fraction; namespace Sigscript { class AbilityWrapper; +class GameWrapper; class ItemWrapper; class MoveWrapper; class NatureWrapper; -class SigmodWrapper; class SpeciesWrapper; class StatusWrapper; } @@ -74,7 +74,7 @@ class SIGENCORE_EXPORT Creature : public Sigscript::Config Q_SCRIPTABLE QUuid id() const; - Q_SCRIPTABLE Sigscript::SigmodWrapper* sigmod() const; + Q_SCRIPTABLE Sigscript::GameWrapper* game() const; virtual bool setContainment(Containment* containment); Q_SCRIPTABLE Containment* containment() const; @@ -93,7 +93,7 @@ class SIGENCORE_EXPORT Creature : public Sigscript::Config Q_SCRIPTABLE int dv(const Sigmod::Stat stat) const; Q_SCRIPTABLE long long statExperience(const Sigmod::Stat stat) const; Q_SCRIPTABLE virtual int statValue(const Sigmod::Stat stat) const; - static int calcStat(Sigscript::SigmodWrapper* sigmod, const Sigmod::Stat stat, const int level, const int baseStat, const int dv, const int statExp, const Sigcore::Fraction& multiplier = Sigcore::Fraction(1, 1)); + static int calcStat(Sigscript::GameWrapper* game, const Sigmod::Stat stat, const int level, const int baseStat, const int dv, const int statExp, const Sigcore::Fraction& multiplier = Sigcore::Fraction(1, 1)); Q_SCRIPTABLE QList<Sigscript::AbilityWrapper*> abilities() const; Q_SCRIPTABLE bool hasAbility(Sigscript::AbilityWrapper* ability) const; @@ -179,7 +179,7 @@ class SIGENCORE_EXPORT Creature : public Sigscript::Config virtual void completeMoves(); virtual void completeNatures(); - Sigscript::SigmodWrapper* m_sigmod; + Sigscript::GameWrapper* m_game; Containment* m_containment; Sigscript::SpeciesWrapper* m_species; diff --git a/sigencore/Player.cpp b/sigencore/Player.cpp index 6474bc28..2b72657f 100644 --- a/sigencore/Player.cpp +++ b/sigencore/Player.cpp @@ -22,16 +22,16 @@ #include "Team.h" // Sigscript includes +#include <sigscript/GameWrapper.h> #include <sigscript/ItemWrapper.h> #include <sigscript/ItemTypeWrapper.h> #include <sigscript/RulesWrapper.h> -#include <sigscript/SigmodWrapper.h> -Sigencore::Player::Player(Sigscript::SigmodWrapper* sigmod, Sigscript::Config* parent) : - Client(sigmod, parent), +Sigencore::Player::Player(Sigscript::GameWrapper* game, Sigscript::Config* parent) : + Client(game, parent), m_world(NULL), m_arena(NULL), - m_team(new Team(sigmod, this)), + m_team(new Team(game, this)), m_money(0) { } @@ -63,7 +63,7 @@ Sigencore::Arena* Sigencore::Player::arena() const bool Sigencore::Player::enterArena(Arena* arena) { m_active.clear(); - for (int i = 0; (m_active.size() < m_sigmod->rules()->maxFight()) && (i < m_team->numMembers()); ++i) + for (int i = 0; (m_active.size() < m_game->rules()->maxFight()) && (i < m_team->numMembers()); ++i) { TeamMember* member = m_team->teamMembers()[i]; if (member->currentHp()) @@ -110,7 +110,7 @@ int Sigencore::Player::itemWeight(const int item, const bool distinct) const { if (item < 0) return itemWeightTotal(distinct); - Sigscript::ItemWrapper* itemd = m_sigmod->item(item); + Sigscript::ItemWrapper* itemd = m_game->item(item); int weight = 0; if (itemd && m_items.contains(itemd)) weight += itemd->weight() * (distinct ? m_items[itemd] : 1); @@ -144,7 +144,7 @@ int Sigencore::Player::itemCount(const int item, const bool distinct) const { if (item < 0) return itemCountTotal(distinct); - Sigscript::ItemWrapper* itemd = m_sigmod->item(item); + Sigscript::ItemWrapper* itemd = m_game->item(item); int count = 0; if (itemd && m_items.contains(itemd)) count += (distinct ? m_items[itemd] : 1); @@ -207,7 +207,7 @@ int Sigencore::Player::giveItems(Sigscript::ItemWrapper* item, const int count, int maxWeight = INT_MAX; int maxWeightType = item->type()->maxWeight(); maxWeightType = (maxWeightType == -1) ? INT_MAX : maxWeightType; - int maxWeightTotal = m_sigmod->rules()->maxTotalWeight(); + int maxWeightTotal = m_game->rules()->maxTotalWeight(); maxWeightTotal = (maxWeightTotal == -1) ? INT_MAX : maxWeightTotal; valueOfType(QString("weight-item-maximum-%1").arg(name), &maxWeight); valueOfType(QString("weight-item-type-maximum-%1").arg(typeName), &maxWeightType); @@ -246,7 +246,7 @@ int Sigencore::Player::giveItems(Sigscript::ItemWrapper* item, const int count, bool Sigencore::Player::giveMoney(const int amount, const bool allOrNothing) { int playerMin = 0; - int playerMax = m_sigmod->rules()->maxMoney(); + int playerMax = m_game->rules()->maxMoney(); valueOfType("money-minimum", &playerMin); valueOfType("money-maximum", &playerMax); const int newUnbounded = m_money + amount; diff --git a/sigencore/Player.h b/sigencore/Player.h index 30fa8254..9e8de7ab 100644 --- a/sigencore/Player.h +++ b/sigencore/Player.h @@ -43,7 +43,7 @@ class SIGENCORE_EXPORT Player : public Client Q_OBJECT public: - Player(Sigscript::SigmodWrapper* sigmod, Sigscript::Config* parent); + Player(Sigscript::GameWrapper* game, Sigscript::Config* parent); virtual ~Player(); Q_SCRIPTABLE Overworld* world() const; diff --git a/sigencore/RunScript.cpp b/sigencore/RunScript.cpp index 55b0270f..13ba699d 100644 --- a/sigencore/RunScript.cpp +++ b/sigencore/RunScript.cpp @@ -19,8 +19,8 @@ #include "RunScript.h" // Sigscript includes +#include <sigscript/GameWrapper.h> #include <sigscript/GlobalScriptWrapper.h> -#include <sigscript/SigmodWrapper.h> // Sigcore includes #include <sigcore/Script.h> @@ -40,9 +40,9 @@ Kross::Action* Sigencore::runScript(const QString& name, const Sigcore::Script& return action; } -Kross::Action* Sigencore::globalScript(Sigscript::SigmodWrapper* sigmod, const QString& name, const QString& scriptName, const ObjectMap& objects, Kross::ActionCollection* collection) +Kross::Action* Sigencore::globalScript(Sigscript::GameWrapper* game, const QString& name, const QString& scriptName, const ObjectMap& objects, Kross::ActionCollection* collection) { - Sigscript::GlobalScriptWrapper* script = sigmod->globalScript(name); + Sigscript::GlobalScriptWrapper* script = game->globalScript(name); if (script) return runScript(scriptName, script->script(), objects, collection); return NULL; diff --git a/sigencore/RunScript.h b/sigencore/RunScript.h index 386702fb..6f8a967f 100644 --- a/sigencore/RunScript.h +++ b/sigencore/RunScript.h @@ -38,7 +38,7 @@ class Script; } namespace Sigscript { -class SigmodWrapper; +class GameWrapper; } namespace Sigencore @@ -46,7 +46,7 @@ namespace Sigencore typedef QMap<QString, QObject*> ObjectMap; SIGENCORE_EXPORT Kross::Action* runScript(const QString& name, const Sigcore::Script& script, const ObjectMap& objects, Kross::ActionCollection* collection); -SIGENCORE_EXPORT Kross::Action* globalScript(Sigscript::SigmodWrapper* sigmod, const QString& name, const QString& scriptName, const ObjectMap& objects, Kross::ActionCollection* collection); +SIGENCORE_EXPORT Kross::Action* globalScript(Sigscript::GameWrapper* game, const QString& name, const QString& scriptName, const ObjectMap& objects, Kross::ActionCollection* collection); } diff --git a/sigencore/Team.cpp b/sigencore/Team.cpp index 3ec2f882..313539da 100644 --- a/sigencore/Team.cpp +++ b/sigencore/Team.cpp @@ -23,11 +23,11 @@ #include "TeamMember.h" // Sigscript includes +#include <sigscript/GameWrapper.h> #include <sigscript/RulesWrapper.h> -#include <sigscript/SigmodWrapper.h> -Sigencore::Team::Team(Sigscript::SigmodWrapper* sigmod, Player* player) : - Containment(sigmod, player), +Sigencore::Team::Team(Sigscript::GameWrapper* game, Player* player) : + Containment(game, player), m_arena(NULL), m_player(player) { @@ -49,7 +49,7 @@ int Sigencore::Team::numTeamMembers() const bool Sigencore::Team::addTeamMember(TeamMember* teamMember) { - if (m_teamMembers.size() < m_sigmod->rules()->maxParty()) + if (m_teamMembers.size() < m_game->rules()->maxParty()) { teamMember->setTeam(this); m_teamMembers.append(teamMember); diff --git a/sigencore/Team.h b/sigencore/Team.h index 158fedaf..7228d629 100644 --- a/sigencore/Team.h +++ b/sigencore/Team.h @@ -26,7 +26,7 @@ // Forward declarations namespace Sigscript { -class SigmodWrapper; +class GameWrapper; } namespace Sigencore @@ -40,7 +40,7 @@ class SIGENCORE_EXPORT Team : public Containment Q_OBJECT public: - Team(Sigscript::SigmodWrapper* sigmod, Player* player = NULL); + Team(Sigscript::GameWrapper* game, Player* player = NULL); virtual ~Team(); QList<TeamMember*> teamMembers() const; diff --git a/sigencore/TeamMember.cpp b/sigencore/TeamMember.cpp index d136f876..ba0c9cce 100644 --- a/sigencore/TeamMember.cpp +++ b/sigencore/TeamMember.cpp @@ -28,11 +28,11 @@ // Sigscript includes #include <sigscript/AbilityWrapper.h> +#include <sigscript/GameWrapper.h> #include <sigscript/ItemWrapper.h> #include <sigscript/MoveWrapper.h> #include <sigscript/NatureWrapper.h> #include <sigscript/RulesWrapper.h> -#include <sigscript/SigmodWrapper.h> #include <sigscript/SpeciesWrapper.h> #include <sigscript/SpeciesMoveWrapper.h> #include <sigscript/StatusWrapper.h> @@ -60,7 +60,7 @@ int Sigencore::actionPriority(TeamMember* teamMember, const TeamMember::Action& { const QString move = action.second.first.toString(); const QString tag = QString("move-priority-%1").arg(move); - priority = teamMember->sigmod()->move(move)->priority(); + priority = teamMember->game()->move(move)->priority(); if (teamMember->valueOfType(tag, &priority)) teamMember->removeValue(tag); break; @@ -82,8 +82,8 @@ int Sigencore::actionPriority(TeamMember* teamMember, const TeamMember::Action& bool ok; ObjectMap objects; objects["owner"] = teamMember; - objects["sigmod"] = teamMember->sigmod(); - Kross::Action* kaction = globalScript(teamMember->sigmod(), QString("battleaction-priority-%1").arg(action.first), QUuid::createUuid().toString(), objects, Kross::Manager::self().actionCollection()); + objects["game"] = teamMember->game(); + Kross::Action* kaction = globalScript(teamMember->game(), QString("battleaction-priority-%1").arg(action.first), QUuid::createUuid().toString(), objects, Kross::Manager::self().actionCollection()); priority = kaction->callFunction("priority").toInt(&ok); if (!ok) priority = 0; @@ -139,7 +139,7 @@ bool Sigencore::TeamMember::setStatStage(const Sigmod::Stat stat, const int stag { if (stat == Sigmod::ST_HP) return false; - if (m_sigmod->rules()->maxStages() < qAbs(stage)) + if (m_game->rules()->maxStages() < qAbs(stage)) return false; m_stages[stat - Sigmod::ST_Attack] = stage; emit(statStageChanged(stat, stage)); @@ -158,7 +158,7 @@ int Sigencore::TeamMember::statStage(const Sigmod::Stat stat) const int stages; if (stat == Sigmod::ST_HP) return 0; - if (valueOfType(QString("stat-stages-%1").arg((m_sigmod->rules()->specialSplit() ? Sigmod::StatGSCStr : Sigmod::StatRBYStr)[stat]), &stages) && (qAbs(stages) <= m_sigmod->rules()->maxStages())) + if (valueOfType(QString("stat-stages-%1").arg((m_game->rules()->specialSplit() ? Sigmod::StatGSCStr : Sigmod::StatRBYStr)[stat]), &stages) && (qAbs(stages) <= m_game->rules()->maxStages())) return stages; return m_stages[stat - Sigmod::ST_Attack]; } @@ -176,7 +176,7 @@ int Sigencore::TeamMember::statValue(const Sigmod::Stat stat) const bool Sigencore::TeamMember::addAbility(Sigscript::AbilityWrapper* ability) { - if ((m_abilities.size() < m_sigmod->rules()->maxAbilities()) && !m_abilities.contains(ability)) + if ((m_abilities.size() < m_game->rules()->maxAbilities()) && !m_abilities.contains(ability)) { Team* team = qobject_cast<Team*>(m_containment); if (team) @@ -185,7 +185,7 @@ bool Sigencore::TeamMember::addAbility(Sigscript::AbilityWrapper* ability) worldObjects["ability"] = ability; worldObjects["owner"] = this; worldObjects["client"] = team->player(); - worldObjects["sigmod"] = m_sigmod; + worldObjects["game"] = m_game; worldObjects["world"] = team->player()->world(); Kross::Action* worldAction = runScript(QUuid::createUuid(), ability->worldScript(), worldObjects, m_abilityWorldScripts); m_abilityWorldScriptsMap[ability] = worldAction; @@ -196,7 +196,7 @@ bool Sigencore::TeamMember::addAbility(Sigscript::AbilityWrapper* ability) arenaObjects["ability"] = ability; arenaObjects["owner"] = this; arenaObjects["client"] = team->player(); - arenaObjects["sigmod"] = m_sigmod; + arenaObjects["game"] = m_game; arenaObjects["arena"] = m_arena; Kross::Action* battleAction = runScript(QUuid::createUuid(), ability->battleScript(), arenaObjects, m_abilityBattleScripts); m_abilityWorldScriptsMap[ability] = battleAction; @@ -238,7 +238,7 @@ bool Sigencore::TeamMember::addMove(Sigscript::MoveWrapper* move) if (m_species->move(i)->move() == move) canLearn = true; } - if (canLearn && (m_moves.size() < m_sigmod->rules()->maxMoves()) && !m_moves.contains(move)) + if (canLearn && (m_moves.size() < m_game->rules()->maxMoves()) && !m_moves.contains(move)) { Team* team = qobject_cast<Team*>(m_containment); if (team) @@ -247,7 +247,7 @@ bool Sigencore::TeamMember::addMove(Sigscript::MoveWrapper* move) worldObjects["move"] = move; worldObjects["owner"] = this; worldObjects["client"] = team->player(); - worldObjects["sigmod"] = m_sigmod; + worldObjects["game"] = m_game; worldObjects["world"] = team->player()->world(); Kross::Action* worldAction = runScript(QUuid::createUuid(), move->worldScript(), worldObjects, m_moveWorldScripts); m_moveWorldScriptsMap[move] = worldAction; @@ -277,7 +277,7 @@ bool Sigencore::TeamMember::removeMove(Sigscript::MoveWrapper* move) bool Sigencore::TeamMember::addNature(Sigscript::NatureWrapper* nature) { - if ((m_natures.size() < m_sigmod->rules()->maxNatures()) && !m_natures.contains(nature)) + if ((m_natures.size() < m_game->rules()->maxNatures()) && !m_natures.contains(nature)) { m_natures.append(nature); emit(natureAdded(nature)); @@ -308,7 +308,7 @@ bool Sigencore::TeamMember::addStatus(Sigscript::StatusWrapper* status) worldObjects["status"] = status; worldObjects["owner"] = this; worldObjects["client"] = team->player(); - worldObjects["sigmod"] = m_sigmod; + worldObjects["game"] = m_game; worldObjects["world"] = team->player()->world(); Kross::Action* worldAction = runScript(QUuid::createUuid(), status->worldScript(), worldObjects, m_statusWorldScripts); m_statusWorldScriptsMap[status] = worldAction; @@ -319,7 +319,7 @@ bool Sigencore::TeamMember::addStatus(Sigscript::StatusWrapper* status) arenaObjects["status"] = status; arenaObjects["owner"] = this; arenaObjects["client"] = team->player(); - arenaObjects["sigmod"] = m_sigmod; + arenaObjects["game"] = m_game; arenaObjects["arena"] = m_arena; Kross::Action* battleAction = runScript(QUuid::createUuid(), status->battleScript(), arenaObjects, m_statusBattleScripts); m_statusWorldScriptsMap[status] = battleAction; @@ -359,7 +359,7 @@ void Sigencore::TeamMember::makeActive(Arena* arena) { ObjectMap objects; objects["arena"] = arena; - objects["sigmod"] = m_sigmod; + objects["game"] = m_game; if (team) objects["client"] = team->player(); objects["owner"] = this; @@ -375,7 +375,7 @@ void Sigencore::TeamMember::makeActive(Arena* arena) { ObjectMap objects; objects["arena"] = arena; - objects["sigmod"] = m_sigmod; + objects["game"] = m_game; if (team) objects["client"] = team->player(); objects["owner"] = this; @@ -395,7 +395,7 @@ void Sigencore::TeamMember::exitArena() m_abilityBattleScriptsMap.clear(); for (int i = Sigmod::ST_Attack; i <= Sigmod::ST_Evasion; ++i) { - const QString entry = QString("stat-stages-%1").arg((m_sigmod->rules()->specialSplit() ? Sigmod::StatGSCStr : Sigmod::StatRBYStr)[i]); + const QString entry = QString("stat-stages-%1").arg((m_game->rules()->specialSplit() ? Sigmod::StatGSCStr : Sigmod::StatRBYStr)[i]); if (options(entry) & Temporary) removeValue(entry, false); } |