yolinlin/mod-individual-progression
1
0
Fork 0
mirror of https://github.com/ZhengPeiRu21/mod-individual-progression synced 2025-11-29 23:44:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enable code that had been waiting for upstream PR merge

Browse Source
This commit is contained in:
郑佩茹
2022-09-21 09:44:47 -06:00
parent 566402809e
commit c229ef3742
2 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/IndividualProgression.cpp
View File

@@ -272,7 +272,7 @@ public:
if (sIndividualProgression->simpleConfigOverride)
{
sWorld->setIntConfig(CONFIG_WATER_BREATH_TIMER, 60000);
// sWorld->setBoolConfig(CONFIG_OBJECT_QUEST_MARKERS, false); Waiting for PR merge: https://github.com/azerothcore/azerothcore-wotlk/pull/13013
sWorld->setBoolConfig(CONFIG_OBJECT_QUEST_MARKERS, false);
sWorld->setBoolConfig(CONFIG_OBJECT_SPARKLES, false);
sWorld->setBoolConfig(CONFIG_PLAYER_SETTINGS_ENABLED, true);
}

57
src/IndividualProgressionPlayer.cpp
View File

@@ -330,35 +330,34 @@ public:
IndividualPlayerProgression_AccountScript() : AccountScript("IndividualProgression_AccountScript")
{}
// Waiting for PR: https://github.com/azerothcore/azerothcore-wotlk/pull/13060
// bool CanAccountCreateCharacter(uint32 accountId, uint8 charRace, uint8 charClass) override
// {
// if ((!sIndividualProgression->enabled) ||
// (charRace != RACE_DRAENEI && charRace != RACE_BLOODELF && charClass != CLASS_DEATH_KNIGHT) ||
// (!sIndividualProgression->tbcRacesProgressionLevel && !sIndividualProgression->deathKnightProgressionLevel))
// {
// return true;
// }
// uint8 highestProgression = sIndividualProgression->GetAccountProgression(accountId);
// if (charRace == RACE_DRAENEI || charRace == RACE_BLOODELF)
// {
// if (sIndividualProgression->tbcRacesProgressionLevel)
// {
// if (highestProgression < sIndividualProgression->tbcRacesProgressionLevel)
// {
// return false;
// }
// }
// }
// if (charClass == CLASS_DEATH_KNIGHT && sIndividualProgression->deathKnightProgressionLevel)
// {
// if (highestProgression < sIndividualProgression->deathKnightProgressionLevel)
// {
// return false;
// }
// }
// return true;
// }
bool CanAccountCreateCharacter(uint32 accountId, uint8 charRace, uint8 charClass) override
{
if ((!sIndividualProgression->enabled) ||
(charRace != RACE_DRAENEI && charRace != RACE_BLOODELF && charClass != CLASS_DEATH_KNIGHT) ||
(!sIndividualProgression->tbcRacesProgressionLevel && !sIndividualProgression->deathKnightProgressionLevel))
{
return true;
}
uint8 highestProgression = sIndividualProgression->GetAccountProgression(accountId);
if (charRace == RACE_DRAENEI || charRace == RACE_BLOODELF)
{
if (sIndividualProgression->tbcRacesProgressionLevel)
{
if (highestProgression < sIndividualProgression->tbcRacesProgressionLevel)
{
return false;
}
}
}
if (charClass == CLASS_DEATH_KNIGHT && sIndividualProgression->deathKnightProgressionLevel)
{
if (highestProgression < sIndividualProgression->deathKnightProgressionLevel)
{
return false;
}
}
return true;
}
};