Skip to content

Fix Dungeon Hopping Continually Increasing Stats #19

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

Merged
merged 2 commits into from
May 1, 2021
+49 −14
Merged

Fix Dungeon Hopping Continually Increasing Stats #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
becf2c8
Fix Dungeon Hoping Continually Increasing Stats
LannyE Apr 6, 2021
d38a092
fix(core): Modified to compile with new ObjectGuid update
invalid-email-address Apr 30, 2021
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
63 changes: 49 additions & 14 deletions src/Solocraft.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,16 @@ class SolocraftAnnounce : public PlayerScript
}
}
}
void OnLogout(Player* player)
{
//Database query to see if an entry is still there
QueryResult result = CharacterDatabase.PQuery("SELECT `GUID` FROM `custom_solocraft_character_stats` WHERE GUID = %u", player->GetGUID().GetCounter());
if (result)
{
//Remove database entry as the player has logged out
CharacterDatabase.PExecute("DELETE FROM custom_solocraft_character_stats WHERE GUID = %u", player->GetGUID().GetCounter());
}
}
};

class solocraft_player_instance_handler : public PlayerScript {
Expand Down Expand Up @@ -406,14 +416,17 @@ class solocraft_player_instance_handler : public PlayerScript {

// Apply the player buffs
void ApplyBuffs(Player* player, Map* map, float difficulty, int dunLevel, int numInGroup)
{
int SpellPowerBonus = 0;
{
//Check whether to buff the player or check to debuff back to normal
if (difficulty != 0)
{
std::ostringstream ss;


//Check whether to buff the player or check to debuff back to normal
if (difficulty != 0)
{
std::ostringstream ss;
int SpellPowerBonus = 0;
// int SpellPowerBonusDB = 0;


if (player->getLevel() <= dunLevel + SolocraftLevelDiff) //If a player is too high level for dungeon don't buff but if in a group will count towards the group offset balancing.
{

Expand All @@ -438,10 +451,18 @@ class solocraft_player_instance_handler : public PlayerScript {
difficulty = roundf(difficulty * 100) / 100; //Float variables suck - two decimal rounding

}


//Check Database for a current dungeon entry
QueryResult result = CharacterDatabase.PQuery("SELECT `GUID`, `Difficulty`, `GroupSize`, `SpellPower`, `Stats` FROM `custom_solocraft_character_stats` WHERE GUID = %u", player->GetGUID().GetCounter());

//Modify Player Stats
for (int32 i = STAT_STRENGTH; i < MAX_STATS; ++i) //STATS defined/enum in SharedDefines.h
{
//Check for Dungeon to Dungeon Transfer and remove old buff
if (result)
{
player->HandleStatModifier(UnitMods(UNIT_MOD_STAT_START + i), TOTAL_PCT, (*result)[1].GetFloat() * (*result)[4].GetFloat(), false);
}
// Buff the player
player->HandleStatModifier(UnitMods(UNIT_MOD_STAT_START + i), TOTAL_PCT, difficulty * SoloCraftStatsMult, true); //Unitmods enum UNIT_MOD_STAT_START defined in Unit.h line 391

Expand All @@ -455,9 +476,19 @@ class solocraft_player_instance_handler : public PlayerScript {
{
// Buff the player's mana
player->SetPower(POWER_MANA, player->GetMaxPower(POWER_MANA));


//Check for Dungeon to Dungeon Transfer and remove old Spellpower buff
if (result)
{
// remove spellpower bonus
player->ApplySpellPowerBonus((*result)[3].GetUInt32() * (*result)[4].GetFloat(),false);
}

//Buff Spellpower
if (difficulty > 0) //Debuffed characters do not get spellpower
{

SpellPowerBonus = static_cast<int>((player->getLevel() * SoloCraftSpellMult) * difficulty);//Yes, I pulled this calc out of my butt.
player->ApplySpellPowerBonus(SpellPowerBonus,true);
//sLog->outError("%u: spellpower Bonus applied: %i", player->GetGUID(), SpellPowerBonus);
Expand All @@ -479,18 +510,22 @@ class solocraft_player_instance_handler : public PlayerScript {
}

// Save Player Dungeon Offsets to Database
CharacterDatabase.PExecute("REPLACE INTO custom_solocraft_character_stats (GUID, Difficulty, GroupSize, SpellPower, Stats) VALUES (%u, %f, %u, %i, %f)", player->GetGUID(), difficulty, numInGroup, SpellPowerBonus, SoloCraftStatsMult);
CharacterDatabase.PExecute("REPLACE INTO custom_solocraft_character_stats (GUID, Difficulty, GroupSize, SpellPower, Stats) VALUES (%u, %f, %u, %i, %f)", player->GetGUID().GetCounter(), difficulty, numInGroup, SpellPowerBonus, SoloCraftStatsMult);

}
else
{
// Announce to player - Over Max Level Threshold
ss << "|cffFF0000[SoloCraft] |cffFF8000" << player->GetName() << " entered %s - |cffFF0000You have not been buffed. |cffFF8000 Your level is higher than the max level (%i) threshold for this dungeon.";
ChatHandler(player->GetSession()).PSendSysMessage(ss.str().c_str(), map->GetMapName(), dunLevel + SolocraftLevelDiff);
ClearBuffs(player, map); //Check to revert player back to normal
}

}
else

}
else
{
ClearBuffs(player, map); //Check to revert player back to normal - Moving this here fixed logout and login while in instance buff and debuff issues
}
}

// Get the current group members GUIDS and return the total sum of the difficulty offset by all group members currently in the dungeon
Expand All @@ -506,7 +541,7 @@ class solocraft_player_instance_handler : public PlayerScript {
if (itr->guid != player->GetGUID())
{
//Database query to find difficulty for each group member that is currently in an instance
QueryResult result = CharacterDatabase.PQuery("SELECT `GUID`, `Difficulty`, `GroupSize` FROM `custom_solocraft_character_stats` WHERE GUID = %u", itr->guid);
QueryResult result = CharacterDatabase.PQuery("SELECT `GUID`, `Difficulty`, `GroupSize` FROM `custom_solocraft_character_stats` WHERE GUID = %u", itr->guid.GetCounter());
if (result)
{
//Test for debuffs already give to other members - They cannot be used to determine the total offset because negative numbers will skew the total difficulty offset
Expand All @@ -526,7 +561,7 @@ class solocraft_player_instance_handler : public PlayerScript {
{

//Database query to get offset from the last instance player exited
QueryResult result = CharacterDatabase.PQuery("SELECT `GUID`, `Difficulty`, `GroupSize`, `SpellPower`, `Stats` FROM `custom_solocraft_character_stats` WHERE GUID = %u", player->GetGUID());
QueryResult result = CharacterDatabase.PQuery("SELECT `GUID`, `Difficulty`, `GroupSize`, `SpellPower`, `Stats` FROM `custom_solocraft_character_stats` WHERE GUID = %u", player->GetGUID().GetCounter());
if (result)
{
float difficulty = (*result)[1].GetFloat();
Expand All @@ -553,7 +588,7 @@ class solocraft_player_instance_handler : public PlayerScript {
}

//Remove database entry as the player is no longer in an instance
CharacterDatabase.PExecute("DELETE FROM custom_solocraft_character_stats WHERE GUID = %u", player->GetGUID());
CharacterDatabase.PExecute("DELETE FROM custom_solocraft_character_stats WHERE GUID = %u", player->GetGUID().GetCounter());
}
}
};
Expand Down