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

Jump to bottom

forsaken skills #2799

Merged
merged 5 commits into from
Oct 14, 2024
Merged

forsaken skills #2799

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
117d23e
forsaken skills
Gamemechanicwow Oct 14, 2024
3962a43
remove log output
Gamemechanicwow Oct 14, 2024
114e6a1
ffs
Gamemechanicwow Oct 14, 2024
c22e9b8
move var declaration and remove unneeded break
Gamemechanicwow Oct 14, 2024
3454232
add comments
Gamemechanicwow Oct 14, 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
15 changes: 10 additions & 5 deletions src/game/Spells/SpellAuras.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,8 +1115,6 @@ void Aura::TriggerSpell()
uint32 auraId = auraSpellInfo->Id;
Unit* target = GetTarget();

uint32 spellRandom;

// not in banished state
if (triggerTarget->HasUnitState(UNIT_STAT_ISOLATED))
return;
Expand Down Expand Up @@ -1456,10 +1454,15 @@ void Aura::TriggerSpell()
switch (auraId)
{
case 7054:
spellRandom = urand(0, 14) + 7038;
{
uint32 spellRandom = urand(0, 14) + 7038;
// spellRandom contains a random number from 7038 to 7052. But the available spells range from 7038 to 7051 and 7053. So we increase 7052 to 7053
if (spellRandom == 7052)
spellRandom = 7053;

target->CastSpell(target, spellRandom, true, nullptr, this);
return;
break;
}
case 8892: // Goblin Rocket Boots
case 13141: // Gnomish Rocket Boots
// FIXME: Confirm that the chance for rocket boots to explode in retail is actually meant to be 1% per-tick or 1/5 overall
Expand Down Expand Up @@ -6660,7 +6663,9 @@ void Aura::PeriodicDummyTick()
case 7054:
{
uint32 spellRandom = urand(0, 14) + 7038;
sLog.Out(LOG_BASIC, LOG_LVL_MINIMAL, "7054 %u", spellRandom);
// spellRandom contains a random number from 7038 to 7052. But the available spells range from 7038 to 7051 and 7053. So we increase 7052 to 7053
if (spellRandom == 7052)
spellRandom = 7053;

target->CastSpell(target, spellRandom, true, nullptr, this);
// Possibly need cast one of them (but
Expand Down