diff options
author | Ben Boeckel <MathStuf@gmail.com> | 2009-02-24 16:43:57 -0500 |
---|---|---|
committer | Ben Boeckel <MathStuf@gmail.com> | 2009-02-24 16:43:57 -0500 |
commit | ed45ef2c1b99ed07c7fe6585d23ddb19fa87fec5 (patch) | |
tree | 0b363f68308f1d43f030a12fd3c6b033c5b1ecbc /sigencore/TeamMember.cpp | |
parent | a6ba3f8693a4e0f77e8a7a997c605f7bb17005aa (diff) | |
download | sigen-ed45ef2c1b99ed07c7fe6585d23ddb19fa87fec5.tar.gz sigen-ed45ef2c1b99ed07c7fe6585d23ddb19fa87fec5.tar.xz sigen-ed45ef2c1b99ed07c7fe6585d23ddb19fa87fec5.zip |
Update sigencore to the sigmod->game rename
Diffstat (limited to 'sigencore/TeamMember.cpp')
-rw-r--r-- | sigencore/TeamMember.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
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); } |