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

Added dice notation to help command (#308)

Browse Source 
* added dice notation to roll and rollp commands
This commit is contained in:
cow-face 2022-07-06 10:59:07 -05:00 committed by GitHub
parent 035ebd1a9f
commit 9bba94fc93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 125 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/include/aoclient.h
View File

@ -2033,13 +2033,16 @@ class AOClient : public QObject
/** /**
* @brief A convenience function for rolling dice. * @brief A convenience function for rolling dice.
* *
* @param argc The amount of arguments. * @param sides The number of sides the dice to be rolled have
* *
* @param argv Stringlist of the arguments given by the client. * @param dice The number of dice to be rolled
* *
* @param p_roll Bool to determine of a roll is private or not. * @param p_roll Bool to determine of a roll is private or not.
*
* @param roll_modifier Option parameter to add or subtract from each
* rolled value
*/ */
void diceThrower(int argc, QStringList argv, bool p_roll); void diceThrower(int sides, int dice, bool p_roll, int roll_modifier = 0);
/** /**
* @brief Interprets an expression of time into amount of seconds. * @brief Interprets an expression of time into amount of seconds.

26
core/src/commands/command_helper.cpp
View File

@ -84,24 +84,28 @@ int AOClient::genRand(int min, int max)
#endif #endif
} }
void AOClient::diceThrower(int argc, QStringList argv, bool p_roll) void AOClient::diceThrower(int sides, int dice, bool p_roll, int roll_modifier)
{ {
int l_sides = 6; if (sides < 0 || dice < 0 || sides > ConfigManager::diceMaxValue() || dice > ConfigManager::diceMaxDice()) {
int l_dice = 1; sendServerMessage("Dice or side number out of bounds.");
return;
}
QStringList results; QStringList results;
if (argc >= 1) for (int i = 1; i <= dice; i++) {
l_sides = qBound(1, argv[0].toInt(), ConfigManager::diceMaxValue()); results.append(QString::number(AOClient::genRand(1, sides) + roll_modifier));
if (argc == 2)
l_dice = qBound(1, argv[1].toInt(), ConfigManager::diceMaxDice());
for (int i = 1; i <= l_dice; i++) {
results.append(QString::number(AOClient::genRand(1, l_sides)));
} }
QString total_results = results.join(" "); QString total_results = results.join(" ");
if (p_roll) { if (p_roll) {
sendServerMessage("You rolled a " + QString::number(l_dice) + "d" + QString::number(l_sides) + ". Results: " + total_results); if (roll_modifier)
sendServerMessage("You rolled a " + QString::number(dice) + "d" + QString::number(sides) + "+" + QString::number(roll_modifier) + ". Results: " + total_results);
else
sendServerMessage("You rolled a " + QString::number(dice) + "d" + QString::number(sides) + ". Results: " + total_results);
return; return;
} }
sendServerMessageArea(m_ooc_name + " rolled a " + QString::number(l_dice) + "d" + QString::number(l_sides) + ". Results: " + total_results); if (roll_modifier)
sendServerMessageArea(m_ooc_name + " rolled a " + QString::number(dice) + "d" + QString::number(sides) + "+" + QString::number(roll_modifier) + ". Results: " + total_results);
else
sendServerMessageArea(m_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)

106
core/src/commands/roleplay.cpp
View File

@ -38,12 +38,114 @@ void AOClient::cmdFlip(int argc, QStringList argv)
void AOClient::cmdRoll(int argc, QStringList argv) void AOClient::cmdRoll(int argc, QStringList argv)
{ {
diceThrower(argc, argv, false); int l_sides = 6;
int l_dice = 1;
QStringList results;
if (argc >= 1) {
if (argv[0].contains('d')) {
QStringList l_arguments = argv[0].split('d');
bool l_dice_ok;
bool l_sides_ok;
l_dice = l_arguments[0].toInt(&l_dice_ok);
l_sides = l_arguments[1].toInt(&l_sides_ok);
if (argv[0].contains('+')) {
bool l_mod_ok;
QStringList l_modifier = l_arguments[1].split('+');
int modifier = l_modifier[1].toInt(&l_mod_ok);
l_sides = l_modifier[0].toInt(&l_sides_ok);
if (l_mod_ok && l_dice_ok && l_sides_ok)
diceThrower(l_sides, l_dice, false, modifier);
else
sendServerMessage("Invalid dice notation.");
return;
}
else if (argv[0].contains('-')) {
bool l_mod_ok;
QStringList l_modifier = l_arguments[1].split('-');
int modifier = l_modifier[1].toInt(&l_mod_ok);
l_sides = l_modifier[0].toInt(&l_sides_ok);
if (l_mod_ok && l_dice_ok && l_sides_ok)
diceThrower(l_sides, l_dice, false, -modifier);
else
sendServerMessage("Invalid dice notation.");
return;
}
else if (l_dice_ok && l_sides_ok) {
diceThrower(l_sides, l_dice, false);
return;
}
else {
sendServerMessage("Invalid dice notation.");
return;
}
}
else
l_sides = qBound(1, argv[0].toInt(), ConfigManager::diceMaxValue());
}
if (argc == 2)
l_dice = qBound(1, argv[1].toInt(), ConfigManager::diceMaxDice());
diceThrower(l_sides, l_dice, false);
} }
void AOClient::cmdRollP(int argc, QStringList argv) void AOClient::cmdRollP(int argc, QStringList argv)
{ {
diceThrower(argc, argv, true); int l_sides = 6;
int l_dice = 1;
QStringList results;
if (argc >= 1) {
if (argv[0].contains('d')) {
QStringList l_arguments = argv[0].split('d');
bool l_dice_ok;
bool l_sides_ok;
l_dice = l_arguments[0].toInt(&l_dice_ok);
l_sides = l_arguments[1].toInt(&l_sides_ok);
if (argv[0].contains('+')) {
bool l_mod_ok;
QStringList l_modifier = l_arguments[1].split('+');
int modifier = l_modifier[1].toInt(&l_mod_ok);
l_sides = l_modifier[0].toInt(&l_sides_ok);
if (l_mod_ok && l_dice_ok && l_sides_ok)
diceThrower(l_sides, l_dice, true, modifier);
else
sendServerMessage("Invalid dice notation.");
return;
}
else if (argv[0].contains('-')) {
bool l_mod_ok;
QStringList l_modifier = l_arguments[1].split('-');
int modifier = l_modifier[1].toInt(&l_mod_ok);
l_sides = l_modifier[0].toInt(&l_sides_ok);
if (l_mod_ok && l_dice_ok && l_sides_ok)
diceThrower(l_sides, l_dice, true, -modifier);
else
sendServerMessage("Invalid dice notation.");
return;
}
else if (l_dice_ok && l_sides_ok) {
diceThrower(l_sides, l_dice, true);
return;
}
else {
sendServerMessage("Invalid dice notation.");
return;
}
}
else
l_sides = qBound(1, argv[0].toInt(), ConfigManager::diceMaxValue());
}
if (argc == 2)
l_dice = qBound(1, argv[1].toInt(), ConfigManager::diceMaxDice());
diceThrower(l_sides, l_dice, true);
} }
void AOClient::cmdTimer(int argc, QStringList argv) void AOClient::cmdTimer(int argc, QStringList argv)