diff options
Diffstat (limited to 'sigencore/Arena.cpp')
| -rw-r--r-- | sigencore/Arena.cpp | 28 |
1 files changed, 14 insertions, 14 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; } |