pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 04:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix AA loading and expansionbitmask saving/loading

Browse Source
This commit is contained in:
nytmyr
2024-12-01 20:36:27 -06:00
parent f123bcbf80
commit c54cb2f423
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot.cpp
+3 -4
View File
@@ -248,12 +248,12 @@ Bot::Bot(
database.botdb.LoadTimers(this); database.botdb.LoadTimers(this);
LoadAAs();
LoadDefaultBotSettings(); LoadDefaultBotSettings();
database.botdb.LoadBotSettings(this); database.botdb.LoadBotSettings(this);
LoadAAs();
if (database.botdb.LoadBuffs(this)) { if (database.botdb.LoadBuffs(this)) {
//reapply some buffs //reapply some buffs
uint32 buff_count = GetMaxBuffSlots(); uint32 buff_count = GetMaxBuffSlots();
@@ -1258,7 +1258,6 @@ int32 Bot::GenerateBaseHitPoints() {
} }
void Bot::LoadAAs() { void Bot::LoadAAs() {
aa_ranks.clear(); aa_ranks.clear();
int id = 0; int id = 0;
@@ -10202,7 +10201,7 @@ void Bot::LoadDefaultBotSettings() {
uint8 botStance = GetBotStance(); uint8 botStance = GetBotStance();
for (uint16 i = BotBaseSettings::START; i <= BotBaseSettings::END; ++i) { for (uint16 i = BotBaseSettings::START_ALL; i <= BotBaseSettings::END; ++i) {
SetBotBaseSetting(i, GetDefaultSetting(BotSettingCategories::BaseSetting, i, botStance)); SetBotBaseSetting(i, GetDefaultSetting(BotSettingCategories::BaseSetting, i, botStance));
LogBotSettingsDetail("{} says, 'Setting default {} [{}] to [{}]'", GetCleanName(), GetBotSettingCategoryName(i), i, GetDefaultBotBaseSetting(i, botStance)); //deleteme LogBotSettingsDetail("{} says, 'Setting default {} [{}] to [{}]'", GetCleanName(), GetBotSettingCategoryName(i), i, GetDefaultBotBaseSetting(i, botStance)); //deleteme
} }
zone/bot.h
+1
View File
@@ -142,6 +142,7 @@ namespace BotBaseSettings {
constexpr uint16 HPWhenToMed = 12; constexpr uint16 HPWhenToMed = 12;
constexpr uint16 ManaWhenToMed = 13; constexpr uint16 ManaWhenToMed = 13;
constexpr uint16 START_ALL = ExpansionBitmask;
constexpr uint16 START = BotBaseSettings::ShowHelm; // Everything above this cannot be copied, changed or viewed by players constexpr uint16 START = BotBaseSettings::ShowHelm; // Everything above this cannot be copied, changed or viewed by players
constexpr uint16 END = BotBaseSettings::ManaWhenToMed; // Increment as needed constexpr uint16 END = BotBaseSettings::ManaWhenToMed; // Increment as needed
}; };
zone/bot_database.cpp
+1 -1
View File
@@ -2294,7 +2294,7 @@ bool BotDatabase::SaveBotSettings(Mob* m)
if (m->IsBot()) { if (m->IsBot()) {
uint8 botStance = m->CastToBot()->GetBotStance(); uint8 botStance = m->CastToBot()->GetBotStance();
for (uint16 i = BotBaseSettings::START; i <= BotBaseSettings::END; ++i) { for (uint16 i = BotBaseSettings::START_ALL; i <= BotBaseSettings::END; ++i) {
if (m->CastToBot()->GetBotBaseSetting(i) != m->CastToBot()->GetDefaultBotBaseSetting(i, botStance)) { if (m->CastToBot()->GetBotBaseSetting(i) != m->CastToBot()->GetDefaultBotBaseSetting(i, botStance)) {
auto e = BotSettingsRepository::BotSettings{ auto e = BotSettingsRepository::BotSettings{
.char_id = charID, .char_id = charID,