Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2023-06-09 23:40:54 +08:00
18 changed files with 937 additions and 929 deletions

View File

@@ -1297,18 +1297,6 @@ AllowTickets = 1
DeletedCharacterTicketTrace = 0
#
# DungeonFinder.OptionsMask
# Description: Dungeon and raid finder system.
# Value is a bitmask consisting of:
# LFG_OPTION_ENABLE_DUNGEON_FINDER = 1, Enable the dungeon finder browser
# LFG_OPTION_ENABLE_RAID_BROWSER = 2, Enable the raid browser
# LFG_OPTION_ENABLE_SEASONAL_BOSSES = 4, Enable seasonal bosses
# Default: 5
DungeonFinder.OptionsMask = 5
#
# DBC.EnforceItemAttributes
# Disallow overriding item attributes stored in DBC files with values from the database
@@ -3682,6 +3670,17 @@ Calculate.Gameoject.Zone.Area.Data = 0
Group.Raid.LevelRestriction = 10
#
# DungeonFinder.OptionsMask
# Description: Dungeon and raid finder system.
# Value is a bitmask consisting of:
# LFG_OPTION_ENABLE_DUNGEON_FINDER = 1, Enable the dungeon finder browser
# LFG_OPTION_ENABLE_RAID_BROWSER = 2, Enable the raid browser
# LFG_OPTION_ENABLE_SEASONAL_BOSSES = 4, Enable seasonal bosses
# Default: 5
DungeonFinder.OptionsMask = 5
#
# LFG.Location.All
#