Skip to content

Commit b11afeb

Browse files
committed
Update handling of config value for InNormalDungeons
Inverse the handling of config value InNormalDungeons Added new category: "Other" for stuff like mounts, currencies, etc.. Added Gnomeregan and RFK
1 parent 22bb77a commit b11afeb

3 files changed

+13
-2
lines changed

src/ZoneDifficulty.h

+1
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ uint32 const ITEMTYPE_LEATHER = 3;
102102
uint32 const ITEMTYPE_MAIL = 4;
103103
uint32 const ITEMTYPE_PLATE = 5;
104104
uint32 const ITEMTYPE_WEAPONS = 6;
105+
uint32 const ITEMTYPE_OTHER = 7;
105106

106107
uint32 const TARGET_NONE = 0;
107108
uint32 const TARGET_SELF = 1;

src/mod_zone_difficulty_handler.cpp

+10
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ void ZoneDifficulty::LoadMapDifficultySettings()
6666
HeroicTBCQuestMapList[554] = 11386; // The Mechanar
6767
HeroicTBCQuestMapList[545] = 11370; // The Steamvault
6868

69+
// Category 1
70+
EncounterCounter[47] = 5; // Razorfen Kraul
71+
EncounterCounter[90] = 5; // Gnomeregan
72+
6973
// Category 8
7074
EncounterCounter[542] = 3; // Blood Furnace
7175
EncounterCounter[543] = 3; // Hellfire Ramparts
@@ -472,6 +476,9 @@ std::string ZoneDifficulty::GetItemTypeString(uint32 type)
472476
case ITEMTYPE_WEAPONS:
473477
typestring = "Weapons and Shields";
474478
break;
479+
case ITEMTYPE_OTHER:
480+
typestring = "Emblem, Vanity, Consumables, and other items";
481+
break;
475482
default:
476483
LOG_ERROR("module", "MOD-ZONE-DIFFICULTY: Unknown type {} in ZoneDifficulty::GetItemTypeString.", type);
477484
}
@@ -1009,6 +1016,9 @@ bool ZoneDifficulty::HasCompletedFullTier(uint32 category, uint32 playerGuid)
10091016
std::vector<uint32> MapList;
10101017
switch (category)
10111018
{
1019+
case TYPE_VANILLA:
1020+
MapList = { 47, 90 };
1021+
break;
10121022
case TYPE_HEROIC_TBC:
10131023
//585 is Magister's Terrace. Only add when released.
10141024
MapList = { 269, 540, 542, 543, 545, 547, 546, 552, 553, 554, 555, 556, 557, 558, 560/*, 585*/ };

src/mod_zone_difficulty_scripts.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ class mod_zone_difficulty_globalscript : public GlobalScript
600600
}
601601
uint32 instanceId = instance->GetInstanceId();
602602
if (!sZoneDifficulty->IsMythicmodeMap(instance->GetId()) ||
603-
(!sZoneDifficulty->MythicmodeInNormalDungeons && !instance->IsRaidOrHeroicDungeon()))
603+
(sZoneDifficulty->MythicmodeInNormalDungeons && !instance->IsRaidOrHeroicDungeon()))
604604
{
605605
//LOG_INFO("module", "MOD-ZONE-DIFFICULTY: OnBeforeSetBossState: Instance not handled because there is no Mythicmode loot data for map id: {}", instance->GetId());
606606
return;
@@ -697,7 +697,7 @@ class mod_zone_difficulty_globalscript : public GlobalScript
697697
{
698698
sZoneDifficulty->AddMythicmodeScore(map, sZoneDifficulty->Expansion[mapId], score);
699699
}
700-
else if (map->IsRaid())
700+
else if (map->IsRaid() || sZoneDifficulty->MythicmodeInNormalDungeons)
701701
{
702702
sZoneDifficulty->AddMythicmodeScore(map, sZoneDifficulty->Expansion[mapId], score);
703703
}

0 commit comments

Comments
 (0)