Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor AOClient::diceThrower()

Browse Source
This commit is contained in:
MangosArentLiterature 2021-04-18 19:56:03 -05:00
parent 0baa643f40
commit a32cc0e27f
4 changed files with 19 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/aoclient.h
View File

@ -1735,7 +1735,7 @@ class AOClient : public QObject {
* See @ref commandArgv "CommandInfo's `action`'s second parameter". * See @ref commandArgv "CommandInfo's `action`'s second parameter".
* @param Type The type of the dice-rolling being done. * @param Type The type of the dice-rolling being done.
*/ */
void diceThrower(int argc, QStringList argv, RollType Type); void diceThrower(int argc, QStringList argv, bool p_roll);
/** /**
* @brief Interprets an expression of time into amount of seconds. * @brief Interprets an expression of time into amount of seconds.

2
include/server.h
View File

@ -225,7 +225,7 @@ class Server : public QObject {
/** /**
* @brief The highest value dice can have. * @brief The highest value dice can have.
*/ */
uint dice_value; int dice_value;
/** /**
* @brief The max amount of dice that can be rolled at once. * @brief The max amount of dice that can be rolled at once.

68
src/commands/command_helper.cpp
View File

@ -74,62 +74,24 @@ int AOClient::genRand(int min, int max)
#endif #endif
} }
void AOClient::diceThrower(int argc, QStringList argv, RollType type) void AOClient::diceThrower(int argc, QStringList argv, bool p_roll)
{ {
QString sender_name = ooc_name; int sides = 6;
int max_value = server->dice_value; int dice = 1;
int max_dice = server->max_dice; QStringList results;
int bounded_value; if (argc >= 1)
int bounded_amount; sides = qBound(1, argv[0].toInt(), server->dice_value);
QString dice_results; if (argc == 2)
dice = qBound(1, argv[1].toInt(), server->max_dice);
if (argc == 0) { for (int i = 1; i <= dice; i++) {
dice_results = QString::number(genRand(1, 6)); // Self-explanatory results.append(QString::number(AOClient::genRand(1, sides)));
} }
else if (argc == 1) { QString total_results = results.join(" ");
bounded_value = qBound(1, argv[0].toInt(), max_value); // faces, max faces if (p_roll) {
dice_results = QString::number(genRand(1, bounded_value)); sendServerMessage("You rolled a " + QString::number(dice) + "d" + QString::number(sides) + ". Results: " + total_results);
} return;
else if (argc == 2) {
bounded_value = qBound(1, argv[0].toInt(), max_value); // 1, faces, max faces
bounded_amount = qBound(1, argv[1].toInt(), max_dice); // 1, amount, max amount
for (int i = 1; i <= bounded_amount ; i++) // Loop as multiple dices are thrown
{
QString dice_result = QString::number(genRand(1, bounded_value));
if (i == bounded_amount) {
dice_results = dice_results.append(dice_result);
}
else {
dice_results = dice_results.append(dice_result + ",");
}
}
}
// Switch to change message behaviour, isEmpty check or the entire server crashes due to an out of range issue in the QStringList
switch(type)
{
case ROLL:
if (argv.isEmpty()) {
sendServerMessageArea(sender_name + " rolled " + dice_results + " out of 6");
}
else {
sendServerMessageArea(sender_name + " rolled " + dice_results + " out of " + QString::number(bounded_value));
}
break;
case ROLLP:
if (argv.isEmpty()) {
sendServerMessage(sender_name + " rolled " + dice_results + " out of 6");
sendServerMessageArea((sender_name + " rolled in secret."));
}
else {
sendServerMessageArea(sender_name + " rolled " + dice_results + " out of " + QString::number(bounded_value));
sendServerMessageArea((sender_name + " rolled in secret."));
}
break;
case ROLLA:
//Not implemented yet
default : break;
} }
sendServerMessageArea(ooc_name + " rolled a " + QString::number(dice) + "d" + QString::number(sides) + ". Results: " + total_results);
} }
QString AOClient::getAreaTimer(int area_idx, int timer_idx) QString AOClient::getAreaTimer(int area_idx, int timer_idx)

4
src/commands/roleplay.cpp
View File

@ -30,12 +30,12 @@ void AOClient::cmdFlip(int argc, QStringList argv)
void AOClient::cmdRoll(int argc, QStringList argv) void AOClient::cmdRoll(int argc, QStringList argv)
{ {
diceThrower(argc, argv, RollType::ROLL); diceThrower(argc, argv, false);
} }
void AOClient::cmdRollP(int argc, QStringList argv) void AOClient::cmdRollP(int argc, QStringList argv)
{ {
diceThrower(argc, argv, RollType::ROLLP); diceThrower(argc, argv, true);
} }
void AOClient::cmdTimer(int argc, QStringList argv) void AOClient::cmdTimer(int argc, QStringList argv)