Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Unable to set spell group to 'NONE' #4872

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
+51 −69
Draft

Fix: Unable to set spell group to 'NONE' #4872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
504a603
Fix: Unable to set spell group to 'NONE'
Tofame Dec 10, 2024
bc056f6
Adapting revscript to loading 'none'
Tofame Dec 10, 2024
e61b3ba
Formatting issues
Tofame Dec 10, 2024
6163408
Formatting issue ???
Tofame Dec 10, 2024
861c365
Method: setCooldowns() instead of repetetive code
Tofame Dec 10, 2024
31d6792
Formatting && rename method
Tofame Dec 10, 2024
25a2768
Cleanup, compile & formatting
Tofame Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/enums.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ enum SpellGroup_t : uint8_t
SPELLGROUP_CRIPPLING = 6,
SPELLGROUP_FOCUS = 7,
SPELLGROUP_ULTIMATESTRIKES = 8,

SPELLGROUP_UNKNOWN = 255 // when no group set in revscript
};

enum SpellType_t : uint8_t
Expand Down
6 changes: 3 additions & 3 deletions src/luascript.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16375,7 +16375,7 @@ int LuaScriptInterface::luaSpellGroup(lua_State* L)
tfs::lua::pushBoolean(L, true);
} else if (lua_isstring(L, 2)) {
group = stringToSpellGroup(tfs::lua::getString(L, 2));
if (group != SPELLGROUP_NONE) {
if (group != SPELLGROUP_UNKNOWN) {
spell->setGroup(group);
} else {
std::cout << "[Warning - Spell::group] Unknown group: " << tfs::lua::getString(L, 2) << '\n';
Expand All @@ -16397,15 +16397,15 @@ int LuaScriptInterface::luaSpellGroup(lua_State* L)
tfs::lua::pushBoolean(L, true);
} else if (lua_isstring(L, 2) && lua_isstring(L, 3)) {
primaryGroup = stringToSpellGroup(tfs::lua::getString(L, 2));
if (primaryGroup != SPELLGROUP_NONE) {
if (primaryGroup != SPELLGROUP_UNKNOWN) {
spell->setGroup(primaryGroup);
} else {
std::cout << "[Warning - Spell::group] Unknown primaryGroup: " << tfs::lua::getString(L, 2) << '\n';
tfs::lua::pushBoolean(L, false);
return 1;
}
secondaryGroup = stringToSpellGroup(tfs::lua::getString(L, 3));
if (secondaryGroup != SPELLGROUP_NONE) {
if (secondaryGroup != SPELLGROUP_UNKNOWN) {
spell->setSecondaryGroup(secondaryGroup);
} else {
std::cout << "[Warning - Spell::group] Unknown secondaryGroup: " << tfs::lua::getString(L, 3)
Expand Down
97 changes: 34 additions & 63 deletions src/spells.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,10 +373,19 @@ bool Spell::configureSpell(const pugi::xml_node& node)
spellId = pugi::cast<uint16_t>(attr.value());
}

if ((attr = node.attribute("aggressive"))) {
aggressive = booleanString(attr.as_string());
}

if (group == SPELLGROUP_NONE) {
group = (aggressive ? SPELLGROUP_ATTACK : SPELLGROUP_HEALING);
}

if ((attr = node.attribute("group"))) {
std::string tmpStr = boost::algorithm::to_lower_copy<std::string>(attr.as_string());
if (tmpStr == "none" || tmpStr == "0") {
group = SPELLGROUP_NONE;
groupCooldown = 0;
} else if (tmpStr == "attack" || tmpStr == "1") {
group = SPELLGROUP_ATTACK;
} else if (tmpStr == "healing" || tmpStr == "2") {
Expand All @@ -390,14 +399,15 @@ bool Spell::configureSpell(const pugi::xml_node& node)
}
}

if ((attr = node.attribute("groupcooldown"))) {
if (group != SPELLGROUP_NONE && (attr = node.attribute("groupcooldown"))) {
groupCooldown = pugi::cast<uint32_t>(attr.value());
}

if ((attr = node.attribute("secondarygroup"))) {
std::string tmpStr = boost::algorithm::to_lower_copy<std::string>(attr.as_string());
if (tmpStr == "none" || tmpStr == "0") {
secondaryGroup = SPELLGROUP_NONE;
secondaryGroupCooldown = 0;
} else if (tmpStr == "attack" || tmpStr == "1") {
secondaryGroup = SPELLGROUP_ATTACK;
} else if (tmpStr == "healing" || tmpStr == "2") {
Expand All @@ -411,7 +421,7 @@ bool Spell::configureSpell(const pugi::xml_node& node)
}
}

if ((attr = node.attribute("secondarygroupcooldown"))) {
if (secondaryGroup != SPELLGROUP_NONE && (attr = node.attribute("secondarygroupcooldown"))) {
secondaryGroupCooldown = pugi::cast<uint32_t>(attr.value());
}

Expand Down Expand Up @@ -491,14 +501,6 @@ bool Spell::configureSpell(const pugi::xml_node& node)
pzLock = booleanString(attr.as_string());
}

if ((attr = node.attribute("aggressive"))) {
aggressive = booleanString(attr.as_string());
}

if (group == SPELLGROUP_NONE) {
group = (aggressive ? SPELLGROUP_ATTACK : SPELLGROUP_HEALING);
}

for (auto vocationNode : node.children()) {
if (!(attr = vocationNode.attribute("name"))) {
continue;
Expand Down Expand Up @@ -551,7 +553,7 @@ bool Spell::playerSpellCheck(Player* player) const
return false;
}

if (player->hasCondition(CONDITION_SPELLGROUPCOOLDOWN, group) ||
if ((group != SPELLGROUP_NONE && player->hasCondition(CONDITION_SPELLGROUPCOOLDOWN, group)) ||
player->hasCondition(CONDITION_SPELLCOOLDOWN, spellId) ||
(secondaryGroup != SPELLGROUP_NONE && player->hasCondition(CONDITION_SPELLGROUPCOOLDOWN, secondaryGroup))) {
player->sendCancelMessage(RETURNVALUE_YOUAREEXHAUSTED);
Expand Down Expand Up @@ -731,27 +733,29 @@ bool Spell::playerRuneSpellCheck(Player* player, const Position& toPos)
return true;
}

void Spell::addCooldowns(Player* player) const
{
if (cooldown > 0) {
Condition* condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLCOOLDOWN, cooldown, 0, false, spellId);
player->addCondition(condition);
}

if (group != SPELLGROUP_NONE && groupCooldown > 0) {
Condition* condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLGROUPCOOLDOWN, groupCooldown, 0, false, group);
player->addCondition(condition);
}

if (secondaryGroup != SPELLGROUP_NONE && secondaryGroupCooldown > 0) {
Condition* condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLGROUPCOOLDOWN, secondaryGroupCooldown, 0, false, secondaryGroup);
player->addCondition(condition);
}
}

void Spell::postCastSpell(Player* player, bool finishedCast /*= true*/, bool payCost /*= true*/) const
{
if (finishedCast) {
if (!player->hasFlag(PlayerFlag_HasNoExhaustion)) {
if (cooldown > 0) {
Condition* condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLCOOLDOWN,
cooldown, 0, false, spellId);
player->addCondition(condition);
}

if (groupCooldown > 0) {
Condition* condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLGROUPCOOLDOWN,
groupCooldown, 0, false, group);
player->addCondition(condition);
}

if (secondaryGroupCooldown > 0) {
Condition* condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLGROUPCOOLDOWN,
secondaryGroupCooldown, 0, false, secondaryGroup);
player->addCondition(condition);
}
addCooldowns(player);
}

if (aggressive) {
Expand Down Expand Up @@ -851,24 +855,7 @@ bool InstantSpell::playerCastInstant(Player* player, std::string& param)
target = playerTarget;
if (!target || target->isRemoved() || target->isDead()) {
if (!casterTargetOrDirection) {
if (cooldown > 0) {
Condition* condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLCOOLDOWN,
cooldown, 0, false, spellId);
player->addCondition(condition);
}

if (groupCooldown > 0) {
Condition* condition = Condition::createCondition(
CONDITIONID_DEFAULT, CONDITION_SPELLGROUPCOOLDOWN, groupCooldown, 0, false, group);
player->addCondition(condition);
}

if (secondaryGroupCooldown > 0) {
Condition* condition =
Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLGROUPCOOLDOWN,
secondaryGroupCooldown, 0, false, secondaryGroup);
player->addCondition(condition);
}
addCooldowns(player);

player->sendCancelMessage(ret);
g_game.addMagicEffect(player->getPosition(), CONST_ME_POFF);
Expand Down Expand Up @@ -915,23 +902,7 @@ bool InstantSpell::playerCastInstant(Player* player, std::string& param)
ReturnValue ret = g_game.getPlayerByNameWildcard(param, playerTarget);

if (ret != RETURNVALUE_NOERROR) {
if (cooldown > 0) {
Condition* condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLCOOLDOWN,
cooldown, 0, false, spellId);
player->addCondition(condition);
}

if (groupCooldown > 0) {
Condition* condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLGROUPCOOLDOWN,
groupCooldown, 0, false, group);
player->addCondition(condition);
}

if (secondaryGroupCooldown > 0) {
Condition* condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLGROUPCOOLDOWN,
secondaryGroupCooldown, 0, false, secondaryGroup);
player->addCondition(condition);
}
addCooldowns(player);

player->sendCancelMessage(ret);
g_game.addMagicEffect(player->getPosition(), CONST_ME_POFF);
Expand Down
9 changes: 8 additions & 1 deletion src/spells.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,13 @@ class Spell : public BaseSpell
}

SpellGroup_t getGroup() const { return group; }
void setGroup(SpellGroup_t g) { group = g; }
void setGroup(SpellGroup_t g)
{
group = g;
if (group == SPELLGROUP_NONE) {
groupCooldown = 0;
}
}
SpellGroup_t getSecondaryGroup() const { return secondaryGroup; }
void setSecondaryGroup(SpellGroup_t g) { secondaryGroup = g; }

Expand Down Expand Up @@ -185,6 +191,7 @@ class Spell : public BaseSpell
bool playerSpellCheck(Player* player) const;
bool playerInstantSpellCheck(Player* player, const Position& toPos);
bool playerRuneSpellCheck(Player* player, const Position& toPos);
void addCooldowns(Player* player) const;

std::map<uint16_t, bool> vocationSpellMap;

Expand Down
6 changes: 4 additions & 2 deletions src/tools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,9 @@ int64_t OTSYS_TIME()
SpellGroup_t stringToSpellGroup(const std::string& value)
{
std::string tmpStr = boost::algorithm::to_lower_copy(value);
if (tmpStr == "attack" || tmpStr == "1") {
if (tmpStr == "none" || tmpStr == "0") {
return SPELLGROUP_NONE;
} else if (tmpStr == "attack" || tmpStr == "1") {
return SPELLGROUP_ATTACK;
} else if (tmpStr == "healing" || tmpStr == "2") {
return SPELLGROUP_HEALING;
Expand All @@ -1125,7 +1127,7 @@ SpellGroup_t stringToSpellGroup(const std::string& value)
return SPELLGROUP_SPECIAL;
}

return SPELLGROUP_NONE;
return SPELLGROUP_UNKNOWN;
}

const std::vector<Direction>& getShuffleDirections()
Expand Down
Loading