fix: Do not apply Normal scaling if Mythic is enabled

[sogladev]

Changes

previously:
Normal mode: Normal mode scaling
Mythic mode: Normal mode scaling * Mythic mode scaling

This changes:
Normal mode: Normal mode scaling
Mythic mode: Mythic mode scaling

This should better reflect values table's data in zone_difficulty_info.

MapID	HealingNerfValue	AbsorbNerfValue	MeleeDmgBuffValue	SpellDmgBuffValue	Enabled	Comment
580	0.75	0.75	1.2	1.15	1	Normal
580	0.75	0.75	1.34	1.32	64	Mythic

Issues

• Closes Mythic mode applies 25% heal reduction on top of the 25% heal reduction chromiecraft/chromiecraft#7638

Tested ingame:

scaling values
ZA normal healing -50%
ZA mythic healing -90%
DELETE FROM `acore_world.zone_difficulty_info` WHERE `MapID` = 568;
INSERT INTO acore_world.zone_difficulty_info
(MapID, PhaseMask, HealingNerfValue, AbsorbNerfValue, MeleeDmgBuffValue, SpellDmgBuffValue, Enabled, Comment)
VALUES(568, 0, 0.5, 0.75, 1.2, 1.15, 1, 'Normal ZA Healing 75% / Absorb 75% Nerf / 20% physical & 15% spell damage buff');
INSERT INTO acore_world.zone_difficulty_info
(MapID, PhaseMask, HealingNerfValue, AbsorbNerfValue, MeleeDmgBuffValue, SpellDmgBuffValue, Enabled, Comment)
VALUES(568, 0, 0.1, 0.75, 1.34, 1.32, 64, 'Mythic ZA Healing 75% / Absorb 75% Nerf / 34% physical & 32% spell damage buff');

outside ZA 3.5k
inside ZA (normal) 1.7k (-50%)
apply mythic 0.35k (-90%)

[55Honey]

What happens with an enabled value of 65?

[sogladev]

What happens with an enabled value of 65?

Values 1,64,65 only matter when loading the scaling values from the db. If you set an entry of 65 if loads the same scaling values to Normal and for Mythic

mod-zone-difficulty/src/mod_zone_difficulty_handler.cpp

Line 116 in bceea32

if (sZoneDifficulty->HasNormalMode(mode))

update:

mod-zone-difficulty/src/ZoneDifficulty.h

Line 173 in bceea32

bool HasNormalMode(int8 mode) { return (mode & MODE_NORMAL) == MODE_NORMAL; }

[55Honey]

I don't understand what's been wrong with if (sZoneDifficulty->HasNormalMode(mode)) but i am glad you fixed it.

[sogladev]

I don't understand what's been wrong with if (sZoneDifficulty->HasNormalMode(mode)) but i am glad you fixed it.

sZoneDifficulty->HasNormalMode(mode) only checks if the map has Normal mode scaling data. This value is set during loading

mod-zone-difficulty/src/mod_zone_difficulty_handler.cpp

Line 122 in bceea32

data.Enabled = data.Enabled | mode;

For ZA, there are DB entries for 1 (normal) and 64 (mythic), resulting in a Enabled 65. The issue is HasNormalMode does not check whether normal mode or mythic mode is active. That's done with sZoneDifficulty->MythicmodeInstanceData[instanceid] This is checked when applying Mythic scaling, but the opposite was missing for Normal scaling