pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Fix Spell Bucket and Spell Global Logic Checks. (#2285)

Browse Source 
- Default to true and set to false if they fail the proper check.
This commit is contained in:
Kinglykrab 2022-07-04 23:28:21 -04:00 committed by GitHub
parent 0f13a92b73
commit 6d56b5b730
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zone/client.cpp
View File

@ -10288,7 +10288,7 @@ void Client::Fling(float value, float target_x, float target_y, float target_z,
std::vector<int> Client::GetLearnableDisciplines(uint8 min_level, uint8 max_level) {
std::vector<int> learnable_disciplines;
for (uint16 spell_id = 0; spell_id < SPDAT_RECORDS; ++spell_id) {
bool learnable = false;
bool learnable = true;
if (!IsValidSpell(spell_id)) {
continue;
}
@ -10321,12 +10321,10 @@ std::vector<int> Client::GetLearnableDisciplines(uint8 min_level, uint8 max_leve
continue;
}
if (RuleB(Spells, EnableSpellGlobals) && SpellGlobalCheck(spell_id, CharacterID())) {
learnable = true;
} else if (RuleB(Spells, EnableSpellBuckets) && SpellBucketCheck(spell_id, CharacterID())) {
learnable = true;
} else {
learnable = true;
if (RuleB(Spells, EnableSpellGlobals) && !SpellGlobalCheck(spell_id, CharacterID())) {
learnable = false;
} else if (RuleB(Spells, EnableSpellBuckets) && !SpellBucketCheck(spell_id, CharacterID())) {
learnable = false;
}
if (learnable) {
@ -10359,7 +10357,7 @@ std::vector<int> Client::GetMemmedSpells() {
std::vector<int> Client::GetScribeableSpells(uint8 min_level, uint8 max_level) {
std::vector<int> scribeable_spells;
for (uint16 spell_id = 0; spell_id < SPDAT_RECORDS; ++spell_id) {
bool scribeable = false;
bool scribeable = true;
if (!IsValidSpell(spell_id)) {
continue;
}
@ -10392,12 +10390,10 @@ std::vector<int> Client::GetScribeableSpells(uint8 min_level, uint8 max_level) {
continue;
}
if (RuleB(Spells, EnableSpellGlobals) && SpellGlobalCheck(spell_id, CharacterID())) {
scribeable = true;
} else if (RuleB(Spells, EnableSpellBuckets) && SpellBucketCheck(spell_id, CharacterID())) {
scribeable = true;
} else {
scribeable = true;
if (RuleB(Spells, EnableSpellGlobals) && !SpellGlobalCheck(spell_id, CharacterID())) {
scribeable = false;
} else if (RuleB(Spells, EnableSpellBuckets) && !SpellBucketCheck(spell_id, CharacterID())) {
scribeable = false;
}
if (scribeable) {