diff --git a/common/net/packet.cpp b/common/net/packet.cpp index 4c7dc74b6..deaa07843 100644 --- a/common/net/packet.cpp +++ b/common/net/packet.cpp @@ -350,4 +350,5 @@ bool EQ::Net::StaticPacket::Resize(size_t new_size) } m_data_length = new_size; -} \ No newline at end of file + return true; +} diff --git a/common/ruletypes.h b/common/ruletypes.h index a40c2c5bc..e05e090b9 100644 --- a/common/ruletypes.h +++ b/common/ruletypes.h @@ -38,6 +38,7 @@ RULE_CATEGORY(Character) RULE_INT(Character, MaxLevel, 65) RULE_BOOL(Character, PerCharacterQglobalMaxLevel, false) // This will check for qglobal 'CharMaxLevel' character qglobal (Type 5), if player tries to level beyond that point, it will not go beyond that level +RULE_BOOL(Character, PerCharacterBucketMaxLevel, false) // This will check for data bucket 'CharMaxLevel', if player tries to level beyond that point, it will not go beyond that level RULE_INT(Character, MaxExpLevel, 0) //Sets the Max Level attainable via Experience RULE_INT(Character, DeathExpLossLevel, 10) // Any level greater than this will lose exp on death RULE_INT(Character, DeathExpLossMaxLevel, 255) // Any level greater than this will no longer lose exp on death @@ -342,7 +343,8 @@ RULE_INT(Spells, TranslocateTimeLimit, 0) // If not zero, time in seconds to acc RULE_INT(Spells, SacrificeMinLevel, 46) //first level Sacrifice will work on RULE_INT(Spells, SacrificeMaxLevel, 69) //last level Sacrifice will work on RULE_INT(Spells, SacrificeItemID, 9963) //Item ID of the item Sacrifice will return (defaults to an EE) -RULE_BOOL(Spells, EnableSpellGlobals, false) // If Enabled, spells check the spell_globals table and compare character data from the quest globals before allowing that spell to scribe with scribespells +RULE_BOOL(Spells, EnableSpellGlobals, false) // If Enabled, spells check the spell_globals table and compare character data from their quest globals before allowing the spell to scribe with scribespells/traindiscs +RULE_BOOL(Spells, EnableSpellBuckets, false) // If Enabled, spells check the spell_buckets table and compare character data from their data buckets before allowing the spell to scribe with scribespells/traindiscs RULE_INT(Spells, MaxBuffSlotsNPC, 60) // default to Tit's limit RULE_INT(Spells, MaxSongSlotsNPC, 0) // NPCs don't have songs ... RULE_INT(Spells, MaxDiscSlotsNPC, 0) // NPCs don't have discs ... @@ -419,6 +421,7 @@ RULE_BOOL(Combat, EnableFearPathing, true) RULE_REAL(Combat, FleeMultiplier, 2.0) // Determines how quickly a NPC will slow down while fleeing. Decrease multiplier to slow NPC down quicker. RULE_BOOL(Combat, FleeGray, true) // If true FleeGrayHPRatio will be used. RULE_INT(Combat, FleeGrayHPRatio, 50) //HP % when a Gray NPC begins to flee. +RULE_INT(Combat, FleeGrayMaxLevel, 18) // NPC's above this level won't do gray/green con flee RULE_INT(Combat, FleeHPRatio, 25) //HP % when a NPC begins to flee. RULE_BOOL(Combat, FleeIfNotAlone, false) // If false, mobs won't flee if other mobs are in combat with it. RULE_BOOL(Combat, AdjustProcPerMinute, true) diff --git a/common/version.h b/common/version.h index 4caca5b38..baead2fe2 100644 --- a/common/version.h +++ b/common/version.h @@ -30,7 +30,7 @@ Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt */ -#define CURRENT_BINARY_DATABASE_VERSION 9129 +#define CURRENT_BINARY_DATABASE_VERSION 9131 #ifdef BOTS #define CURRENT_BINARY_BOTS_DATABASE_VERSION 9021 #else diff --git a/utils/sql/db_update_manifest.txt b/utils/sql/db_update_manifest.txt index 587839291..a203b825b 100644 --- a/utils/sql/db_update_manifest.txt +++ b/utils/sql/db_update_manifest.txt @@ -383,6 +383,8 @@ 9127|2018_09_07_NPCMaxAggroDist.sql|SHOW COLUMNS FROM `zone` LIKE 'npc_max_aggro_dist'|empty| 9128|2018_08_13_inventory_version_update.sql|SHOW TABLES LIKE 'inventory_version'|not_empty| 9129|2018_08_13_inventory_update.sql|SHOW TABLES LIKE 'inventory_versions'|empty| +9130|2018_11_25_name_filter_update.sql|SHOW COLUMNS FROM `name_filter` LIKE 'id'|empty| +9131|2018_12_13_spell_buckets.sql|SHOW TABLES LIKE 'spell_buckets'|empty| # Upgrade conditions: # This won't be needed after this system is implemented, but it is used database that are not diff --git a/utils/sql/git/required/2018_11_25_name_filter_update.sql b/utils/sql/git/required/2018_11_25_name_filter_update.sql new file mode 100644 index 000000000..51a6ca86d --- /dev/null +++ b/utils/sql/git/required/2018_11_25_name_filter_update.sql @@ -0,0 +1,5 @@ +ALTER TABLE `name_filter` +ADD COLUMN `id` INT(11) NULL AUTO_INCREMENT FIRST, +DROP PRIMARY KEY, +ADD PRIMARY KEY (`id`) USING BTREE, +ADD INDEX `name_search_index`(`name`); diff --git a/utils/sql/git/required/2018_12_13_spell_buckets.sql b/utils/sql/git/required/2018_12_13_spell_buckets.sql new file mode 100644 index 000000000..1c56799f0 --- /dev/null +++ b/utils/sql/git/required/2018_12_13_spell_buckets.sql @@ -0,0 +1,10 @@ +CREATE TABLE `spell_buckets` ( + `spellid` bigint(11) unsigned NOT NULL, + `key` varchar(100) DEFAULT NULL, + `value` text, + PRIMARY KEY (`spellid`), + KEY `key_index` (`key`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Spells:EnableSpellBuckets', 'false', 'Enables spell buckets'); +INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Character:PerCharacterBucketMaxLevel', 'false', 'Enables data bucket-based max level.'); \ No newline at end of file diff --git a/utils/sql/system_tables.txt b/utils/sql/system_tables.txt index a5692dabd..fccb0e0c8 100644 --- a/utils/sql/system_tables.txt +++ b/utils/sql/system_tables.txt @@ -10,6 +10,7 @@ adventure_template_entry adventure_template_entry_flavor altadv_vars alternate_currency +auras base_data blocked_spells books @@ -59,6 +60,7 @@ merc_types merc_weaponinfo merchantlist mercs +name_filter npc_emotes npc_faction npc_faction_entries diff --git a/utils/sql/user_tables.txt b/utils/sql/user_tables.txt index 941e30c47..a76e110f3 100644 --- a/utils/sql/user_tables.txt +++ b/utils/sql/user_tables.txt @@ -59,7 +59,6 @@ launcher_zones lfguild mail merchantlist_temp -name_filter object_contents petitions player_titlesets @@ -86,6 +85,7 @@ reports respawn_times sharedbank spell_globals +spell_buckets timers trader trader_audit diff --git a/zone/aa.cpp b/zone/aa.cpp index 9fa76a9d4..648545dd3 100644 --- a/zone/aa.cpp +++ b/zone/aa.cpp @@ -1172,7 +1172,7 @@ void Client::ActivateAlternateAdvancementAbility(int rank_id, int target_id) { return; //check cooldown - if(!p_timers.Expired(&database, rank->spell_type + pTimerAAStart)) { + if(!p_timers.Expired(&database, rank->spell_type + pTimerAAStart, false)) { uint32 aaremain = p_timers.GetRemainingTime(rank->spell_type + pTimerAAStart); uint32 aaremain_hr = aaremain / (60 * 60); uint32 aaremain_min = (aaremain / 60) % 60; @@ -1208,6 +1208,17 @@ void Client::ActivateAlternateAdvancementAbility(int rank_id, int target_id) { if (spells[rank->spell].targettype == ST_Pet || spells[rank->spell].targettype == ST_SummonedPet) target_id = GetPetID(); + // extra handling for cast_not_standing spells + if (!spells[rank->spell].cast_not_standing) { + if (GetAppearance() == eaSitting) // we need to stand! + SetAppearance(eaStanding, false); + + if (GetAppearance() != eaStanding) { + Message_StringID(MT_SpellFailure, STAND_TO_CAST); + return; + } + } + // Bards can cast instant cast AAs while they are casting another song if(spells[rank->spell].cast_time == 0 && GetClass() == BARD && IsBardSong(casting_spell_id)) { if(!SpellFinished(rank->spell, entity_list.GetMob(target_id), EQEmu::CastingSlot::AltAbility, spells[rank->spell].mana, -1, spells[rank->spell].ResistDiff, false)) { diff --git a/zone/client.h b/zone/client.h index 9e2a459f9..9aecf43b0 100644 --- a/zone/client.h +++ b/zone/client.h @@ -776,8 +776,10 @@ public: void UnscribeSpellAll(bool update_client = true); void UntrainDisc(int slot, bool update_client = true); void UntrainDiscAll(bool update_client = true); - bool SpellGlobalCheck(uint16 Spell_ID, uint32 Char_ID); + bool SpellGlobalCheck(uint16 spell_id, uint32 char_id); + bool SpellBucketCheck(uint16 spell_id, uint32 char_id); uint32 GetCharMaxLevelFromQGlobal(); + uint32 GetCharMaxLevelFromBucket(); inline bool IsSitting() const {return (playeraction == 1);} inline bool IsBecomeNPC() const { return npcflag; } diff --git a/zone/command.cpp b/zone/command.cpp old mode 100644 new mode 100755 index a0f8061ce..737e2eaf0 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -1941,7 +1941,7 @@ void command_zheader(Client *c, const Seperator *sep) c->Message(0, "Invalid Zone Name: %s", sep->argplus[1]); else { - if (zone->LoadZoneCFG(sep->argplus[1], true)) + if (zone->LoadZoneCFG(sep->argplus[1], 0)) c->Message(0, "Successfully loaded zone header for %s from database.", sep->argplus[1]); else c->Message(0, "Failed to load zone header %s from database", sep->argplus[1]); diff --git a/zone/embparser_api.cpp b/zone/embparser_api.cpp index 4bdd4fcb8..3a3d3f179 100644 --- a/zone/embparser_api.cpp +++ b/zone/embparser_api.cpp @@ -2870,6 +2870,20 @@ XS(XS__GetInstanceID) { XSRETURN_UV(id); } +XS(XS__GetInstanceIDByCharID); +XS(XS__GetInstanceIDByCharID) { + dXSARGS; + if (items != 3) + Perl_croak(aTHX_ "Usage: quest::GetInstanceIDByCharID(string zone_name, uint16 version, uint32 char_id)"); + + char *zone = (char *) SvPV_nolen(ST(0)); + uint16 version = (int) SvUV(ST(1)); + uint32 char_id = (int) SvUV(ST(2)); + uint16 id = quest_manager.GetInstanceIDByCharID(zone, version, char_id); + + XSRETURN_UV(id); +} + XS(XS__GetCharactersInInstance); XS(XS__GetCharactersInInstance) { dXSARGS; @@ -2921,6 +2935,19 @@ XS(XS__AssignToInstance) { XSRETURN_EMPTY; } +XS(XS__AssignToInstanceByCharID); +XS(XS__AssignToInstanceByCharID) { + dXSARGS; + if (items != 2) + Perl_croak(aTHX_ "Usage: quest::AssignToInstanceByCharID(uint16 instance_id, uint32 char_id)"); + + uint16 instance_id = (int) SvUV(ST(0)); + uint32 char_id = (int) SvUV(ST(1)); + quest_manager.AssignToInstanceByCharID(instance_id, char_id); + + XSRETURN_EMPTY; +} + XS(XS__AssignGroupToInstance); XS(XS__AssignGroupToInstance) { dXSARGS; @@ -2957,6 +2984,19 @@ XS(XS__RemoveFromInstance) { XSRETURN_EMPTY; } +XS(XS__RemoveFromInstanceByCharID); +XS(XS__RemoveFromInstanceByCharID) { + dXSARGS; + if (items != 2) + Perl_croak(aTHX_ "Usage: quest::RemoveFromInstanceByCharID(uint16 instance_id, uint32 char_id)"); + + uint16 instance_id = (int) SvUV(ST(0)); + uint32 char_id = (int) SvUV(ST(1)); + quest_manager.RemoveFromInstanceByCharID(instance_id, char_id); + + XSRETURN_EMPTY; +} + XS(XS__RemoveAllFromInstance); XS(XS__RemoveAllFromInstance) { dXSARGS; @@ -3676,6 +3716,7 @@ EXTERN_C XS(boot_quest) { newXS(strcpy(buf, "AssignGroupToInstance"), XS__AssignGroupToInstance, file); newXS(strcpy(buf, "AssignRaidToInstance"), XS__AssignRaidToInstance, file); newXS(strcpy(buf, "AssignToInstance"), XS__AssignToInstance, file); + newXS(strcpy(buf, "AssignToInstanceByCharID"), XS__AssignToInstanceByCharID, file); newXS(strcpy(buf, "ChooseRandom"), XS__ChooseRandom, file); newXS(strcpy(buf, "CreateInstance"), XS__CreateInstance, file); newXS(strcpy(buf, "DestroyInstance"), XS__DestroyInstance, file); @@ -3687,12 +3728,14 @@ EXTERN_C XS(boot_quest) { newXS(strcpy(buf, "FlyMode"), XS__FlyMode, file); newXS(strcpy(buf, "GetCharactersInInstance"), XS__GetCharactersInInstance, file); newXS(strcpy(buf, "GetInstanceID"), XS__GetInstanceID, file); + newXS(strcpy(buf, "GetInstanceIDByCharID"), XS__GetInstanceIDByCharID, file); newXS(strcpy(buf, "GetSpellResistType"), XS__GetSpellResistType, file); newXS(strcpy(buf, "GetSpellTargetType"), XS__GetSpellTargetType, file); newXS(strcpy(buf, "GetTimeSeconds"), XS__GetTimeSeconds, file); newXS(strcpy(buf, "GetZoneID"), XS__GetZoneID, file); newXS(strcpy(buf, "GetZoneLongName"), XS__GetZoneLongName, file); newXS(strcpy(buf, "get_data"), XS__get_data, file); + newXS(strcpy(buf, "get_data_expires"), XS__get_data_expires, file); newXS(strcpy(buf, "set_data"), XS__set_data, file); newXS(strcpy(buf, "delete_data"), XS__delete_data, file); newXS(strcpy(buf, "IsBeneficialSpell"), XS__IsBeneficialSpell, file); @@ -3704,6 +3747,7 @@ EXTERN_C XS(boot_quest) { newXS(strcpy(buf, "MovePCInstance"), XS__MovePCInstance, file); newXS(strcpy(buf, "RemoveAllFromInstance"), XS__RemoveAllFromInstance, file); newXS(strcpy(buf, "RemoveFromInstance"), XS__RemoveFromInstance, file); + newXS(strcpy(buf, "RemoveFromInstanceByCharID"), XS__RemoveFromInstanceByCharID, file); newXS(strcpy(buf, "SendMail"), XS__SendMail, file); newXS(strcpy(buf, "SetRunning"), XS__SetRunning, file); newXS(strcpy(buf, "activespeakactivity"), XS__activespeakactivity, file); diff --git a/zone/exp.cpp b/zone/exp.cpp index 94f36197d..302e29279 100644 --- a/zone/exp.cpp +++ b/zone/exp.cpp @@ -695,6 +695,18 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) { } } } + + if(RuleB(Character, PerCharacterBucketMaxLevel)){ + uint32 MaxLevel = GetCharMaxLevelFromBucket(); + if(MaxLevel){ + if(GetLevel() >= MaxLevel){ + uint32 expneeded = GetEXPForLevel(MaxLevel); + if(set_exp > expneeded) { + set_exp = expneeded; + } + } + } + } if ((GetLevel() != check_level) && !(check_level >= maxlevel)) { char val1[20]={0}; @@ -1133,6 +1145,22 @@ uint32 Client::GetCharMaxLevelFromQGlobal() { return false; } +uint32 Client::GetCharMaxLevelFromBucket() { + uint32 char_id = this->CharacterID(); + std::string query = StringFormat("SELECT value FROM data_buckets WHERE key = '%i-CharMaxLevel'", char_id); + auto results = database.QueryDatabase(query); + if (!results.Success()) { + Log(Logs::General, Logs::Error, "Data bucket for CharMaxLevel for char ID %i failed.", char_id); + return false; + } + + if (results.RowCount() > 0) { + auto row = results.begin(); + return atoi(row[0]); + } + return false; +} + uint32 Client::GetRequiredAAExperience() { #ifdef LUA_EQEMU uint32 lua_ret = 0; diff --git a/zone/fearpath.cpp b/zone/fearpath.cpp index c73ec448e..de65f4e8a 100644 --- a/zone/fearpath.cpp +++ b/zone/fearpath.cpp @@ -62,7 +62,7 @@ void Mob::CheckFlee() { } // If no special flee_percent check for Gray or Other con rates - if(GetLevelCon(hate_top->GetLevel(), GetLevel()) == CON_GRAY && fleeratio == 0 && RuleB(Combat, FleeGray)) { + if(GetLevelCon(hate_top->GetLevel(), GetLevel()) == CON_GRAY && fleeratio == 0 && RuleB(Combat, FleeGray) && GetLevel() <= RuleI(Combat, FleeGrayMaxLevel)) { fleeratio = RuleI(Combat, FleeGrayHPRatio); } else if(fleeratio == 0) { fleeratio = RuleI(Combat, FleeHPRatio ); diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp index 055716efd..a98f50e5c 100644 --- a/zone/lua_general.cpp +++ b/zone/lua_general.cpp @@ -862,10 +862,18 @@ int lua_get_instance_id(const char *zone, uint32 version) { return quest_manager.GetInstanceID(zone, version); } +int lua_get_instance_id_by_char_id(const char *zone, uint32 version, uint32 char_id) { + return quest_manager.GetInstanceIDByCharID(zone, version, char_id); +} + void lua_assign_to_instance(uint32 instance_id) { quest_manager.AssignToInstance(instance_id); } +void lua_assign_to_instance_by_char_id(uint32 instance_id, uint32 char_id) { + quest_manager.AssignToInstanceByCharID(instance_id, char_id); +} + void lua_assign_group_to_instance(uint32 instance_id) { quest_manager.AssignGroupToInstance(instance_id); } @@ -878,6 +886,10 @@ void lua_remove_from_instance(uint32 instance_id) { quest_manager.RemoveFromInstance(instance_id); } +void lua_remove_from_instance_by_char_id(uint32 instance_id, uint32 char_id) { + quest_manager.RemoveFromInstanceByCharID(instance_id, char_id); +} + void lua_remove_all_from_instance(uint32 instance_id) { quest_manager.RemoveAllFromInstance(instance_id); } @@ -1676,6 +1688,7 @@ luabind::scope lua_register_general() { luabind::def("say_link", (std::string(*)(const char*,bool))&lua_say_link), luabind::def("say_link", (std::string(*)(const char*))&lua_say_link), luabind::def("get_data", (std::string(*)(std::string))&lua_get_data), + luabind::def("get_data_expires", (std::string(*)(std::string))&lua_get_data_expires), luabind::def("set_data", (void(*)(std::string, std::string))&lua_set_data), luabind::def("set_data", (void(*)(std::string, std::string, std::string))&lua_set_data), luabind::def("delete_data", (bool(*)(std::string))&lua_delete_data), @@ -1684,13 +1697,16 @@ luabind::scope lua_register_general() { luabind::def("destroy_instance", &lua_destroy_instance), luabind::def("update_instance_timer", &lua_update_instance_timer), luabind::def("get_instance_id", &lua_get_instance_id), + luabind::def("get_instance_id_by_char_id", &lua_get_instance_id_by_char_id), luabind::def("get_instance_timer", &lua_get_instance_timer), luabind::def("get_instance_timer_by_id", &lua_get_instance_timer_by_id), luabind::def("get_characters_in_instance", &lua_get_characters_in_instance), luabind::def("assign_to_instance", &lua_assign_to_instance), + luabind::def("assign_to_instance_by_char_id", &lua_assign_to_instance_by_char_id), luabind::def("assign_group_to_instance", &lua_assign_group_to_instance), luabind::def("assign_raid_to_instance", &lua_assign_raid_to_instance), luabind::def("remove_from_instance", &lua_remove_from_instance), + luabind::def("remove_from_instance_by_char_id", &lua_remove_from_instance_by_char_id), luabind::def("remove_all_from_instance", &lua_remove_all_from_instance), luabind::def("flag_instance_by_group_leader", &lua_flag_instance_by_group_leader), luabind::def("flag_instance_by_raid_leader", &lua_flag_instance_by_raid_leader), diff --git a/zone/npc.cpp b/zone/npc.cpp index 4841f9276..42d61b0dd 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -2611,7 +2611,16 @@ FACTION_VALUE NPC::CheckNPCFactionAlly(int32 other_faction) { return FACTION_INDIFFERENT; } } - return FACTION_INDIFFERENT; + + // I believe that the assumption is, barring no entry in npc_faction_entries + // that two npcs on like faction con ally to each other. This catches cases + // where an npc is on a faction but has no hits (hence no entry in + // npc_faction_entries). + + if (GetPrimaryFaction() == other_faction) + return FACTION_ALLY; + else + return FACTION_INDIFFERENT; } bool NPC::IsFactionListAlly(uint32 other_faction) { @@ -2801,7 +2810,6 @@ void NPC::ModifyStatsOnCharm(bool bRemoved) CalcAC(); } - uint16 NPC::GetMeleeTexture1() const { return d_melee_texture1; @@ -2840,4 +2848,4 @@ float NPC::GetProximityMinZ() float NPC::GetProximityMaxZ() { return proximity->max_z; -} \ No newline at end of file +} diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index 3bbd9f6ac..19ef30bbb 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -976,37 +976,44 @@ void QuestManager::permagender(int gender_id) { uint16 QuestManager::scribespells(uint8 max_level, uint8 min_level) { QuestManagerCurrentQuestVars(); uint16 book_slot, count; - uint16 curspell; + uint16 spell_id; - uint32 Char_ID = initiator->CharacterID(); + uint32 char_id = initiator->CharacterID(); bool SpellGlobalRule = RuleB(Spells, EnableSpellGlobals); + bool SpellBucketRule = RuleB(Spells, EnableSpellBuckets); bool SpellGlobalCheckResult = 0; + bool SpellBucketCheckResult = 0; - for(curspell = 0, book_slot = initiator->GetNextAvailableSpellBookSlot(), count = 0; curspell < SPDAT_RECORDS && book_slot < MAX_PP_SPELLBOOK; curspell++, book_slot = initiator->GetNextAvailableSpellBookSlot(book_slot)) + for(spell_id = 0, book_slot = initiator->GetNextAvailableSpellBookSlot(), count = 0; spell_id < SPDAT_RECORDS && book_slot < MAX_PP_SPELLBOOK; spell_id++, book_slot = initiator->GetNextAvailableSpellBookSlot(book_slot)) { if ( - spells[curspell].classes[WARRIOR] != 0 && //check if spell exists - spells[curspell].classes[initiator->GetPP().class_-1] <= max_level && //maximum level - spells[curspell].classes[initiator->GetPP().class_-1] >= min_level && //minimum level - spells[curspell].skill != 52 && - spells[curspell].effectid[EFFECT_COUNT - 1] != 10 + spells[spell_id].classes[WARRIOR] != 0 && //check if spell exists + spells[spell_id].classes[initiator->GetPP().class_-1] <= max_level && //maximum level + spells[spell_id].classes[initiator->GetPP().class_-1] >= min_level && //minimum level + spells[spell_id].skill != 52 && + spells[spell_id].effectid[EFFECT_COUNT - 1] != 10 ) { if (book_slot == -1) //no more book slots break; - if(!IsDiscipline(curspell) && !initiator->HasSpellScribed(curspell)) { //isn't a discipline & we don't already have it scribed + if(!IsDiscipline(spell_id) && !initiator->HasSpellScribed(spell_id)) { //isn't a discipline & we don't already have it scribed if (SpellGlobalRule) { // Bool to see if the character has the required QGlobal to scribe it if one exists in the Spell_Globals table - SpellGlobalCheckResult = initiator->SpellGlobalCheck(curspell, Char_ID); + SpellGlobalCheckResult = initiator->SpellGlobalCheck(spell_id, char_id); if (SpellGlobalCheckResult) { - initiator->ScribeSpell(curspell, book_slot); + initiator->ScribeSpell(spell_id, book_slot); count++; } - } - else { - initiator->ScribeSpell(curspell, book_slot); + } else if (SpellBucketRule) { + SpellBucketCheckResult = initiator->SpellBucketCheck(spell_id, char_id); + if (SpellBucketCheckResult) { + initiator->ScribeSpell(spell_id, book_slot); + count++; + } + } else { + initiator->ScribeSpell(spell_id, book_slot); count++; } } @@ -1018,46 +1025,59 @@ uint16 QuestManager::scribespells(uint8 max_level, uint8 min_level) { uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) { QuestManagerCurrentQuestVars(); uint16 count; - uint16 curspell; + uint16 spell_id; - uint32 Char_ID = initiator->CharacterID(); + uint32 char_id = initiator->CharacterID(); bool SpellGlobalRule = RuleB(Spells, EnableSpellGlobals); + bool SpellBucketRule = RuleB(Spells, EnableSpellBuckets); bool SpellGlobalCheckResult = 0; + bool SpellBucketCheckResult = 0; - for(curspell = 0, count = 0; curspell < SPDAT_RECORDS; curspell++) + for(spell_id = 0, count = 0; spell_id < SPDAT_RECORDS; spell_id++) { if ( - spells[curspell].classes[WARRIOR] != 0 && //check if spell exists - spells[curspell].classes[initiator->GetPP().class_-1] <= max_level && //maximum level - spells[curspell].classes[initiator->GetPP().class_-1] >= min_level && //minimum level - spells[curspell].skill != 52 && - ( !RuleB(Spells, UseCHAScribeHack) || spells[curspell].effectid[EFFECT_COUNT - 1] != 10 ) + spells[spell_id].classes[WARRIOR] != 0 && //check if spell exists + spells[spell_id].classes[initiator->GetPP().class_-1] <= max_level && //maximum level + spells[spell_id].classes[initiator->GetPP().class_-1] >= min_level && //minimum level + spells[spell_id].skill != 52 && + ( !RuleB(Spells, UseCHAScribeHack) || spells[spell_id].effectid[EFFECT_COUNT - 1] != 10 ) ) { - if(IsDiscipline(curspell)){ + if(IsDiscipline(spell_id)){ //we may want to come up with a function like Client::GetNextAvailableSpellBookSlot() to help speed this up a little for(uint32 r = 0; r < MAX_PP_DISCIPLINES; r++) { - if(initiator->GetPP().disciplines.values[r] == curspell) { + if(initiator->GetPP().disciplines.values[r] == spell_id) { initiator->Message(13, "You already know this discipline."); break; //continue the 1st loop } else if(initiator->GetPP().disciplines.values[r] == 0) { if (SpellGlobalRule) { // Bool to see if the character has the required QGlobal to train it if one exists in the Spell_Globals table - SpellGlobalCheckResult = initiator->SpellGlobalCheck(curspell, Char_ID); + SpellGlobalCheckResult = initiator->SpellGlobalCheck(spell_id, char_id); if (SpellGlobalCheckResult) { - initiator->GetPP().disciplines.values[r] = curspell; - database.SaveCharacterDisc(Char_ID, r, curspell); + initiator->GetPP().disciplines.values[r] = spell_id; + database.SaveCharacterDisc(char_id, r, spell_id); initiator->SendDisciplineUpdate(); initiator->Message(0, "You have learned a new discipline!"); count++; //success counter } break; //continue the 1st loop + } else if (SpellBucketRule) { + // Bool to see if the character has the required bucket to train it if one exists in the spell_buckets table + SpellBucketCheckResult = initiator->SpellBucketCheck(spell_id, char_id); + if (SpellBucketCheckResult) { + initiator->GetPP().disciplines.values[r] = spell_id; + database.SaveCharacterDisc(char_id, r, spell_id); + initiator->SendDisciplineUpdate(); + initiator->Message(0, "You have learned a new discipline!"); + count++; + } + break; } else { - initiator->GetPP().disciplines.values[r] = curspell; - database.SaveCharacterDisc(Char_ID, r, curspell); + initiator->GetPP().disciplines.values[r] = spell_id; + database.SaveCharacterDisc(char_id, r, spell_id); initiator->SendDisciplineUpdate(); initiator->Message(0, "You have learned a new discipline!"); count++; //success counter @@ -2661,6 +2681,10 @@ uint16 QuestManager::GetInstanceID(const char *zone, int16 version) return 0; } +uint16 QuestManager::GetInstanceIDByCharID(const char *zone, int16 version, uint32 char_id) { + return database.GetInstanceID(zone, char_id, version); +} + void QuestManager::AssignToInstance(uint16 instance_id) { QuestManagerCurrentQuestVars(); @@ -2670,6 +2694,10 @@ void QuestManager::AssignToInstance(uint16 instance_id) } } +void QuestManager::AssignToInstanceByCharID(uint16 instance_id, uint32 char_id) { + database.AddClientToInstance(instance_id, char_id); +} + void QuestManager::AssignGroupToInstance(uint16 instance_id) { QuestManagerCurrentQuestVars(); @@ -2710,6 +2738,10 @@ void QuestManager::RemoveFromInstance(uint16 instance_id) } } +void QuestManager::RemoveFromInstanceByCharID(uint16 instance_id, uint32 char_id) { + database.RemoveClientFromInstance(instance_id, char_id); +} + void QuestManager::RemoveAllFromInstance(uint16 instance_id) { QuestManagerCurrentQuestVars(); diff --git a/zone/questmgr.h b/zone/questmgr.h index 68a51ae08..660ba6d0d 100644 --- a/zone/questmgr.h +++ b/zone/questmgr.h @@ -234,10 +234,13 @@ public: uint32 GetInstanceTimerByID(uint16 instance_id = 0); void DestroyInstance(uint16 instance_id); uint16 GetInstanceID(const char *zone, int16 version); + uint16 GetInstanceIDByCharID(const char *zone, int16 version, uint32 char_id); void AssignToInstance(uint16 instance_id); + void AssignToInstanceByCharID(uint16 instance_id, uint32 char_id); void AssignGroupToInstance(uint16 instance_id); void AssignRaidToInstance(uint16 instance_id); void RemoveFromInstance(uint16 instance_id); + void RemoveFromInstanceByCharID(uint16 instance_id, uint32 char_id); //void RemoveGroupFromInstance(uint16 instance_id); //potentially useful but not implmented at this time. //void RemoveRaidFromInstance(uint16 instance_id); //potentially useful but not implmented at this time. void RemoveAllFromInstance(uint16 instance_id); diff --git a/zone/spells.cpp b/zone/spells.cpp index f1b8824f1..a7b52c1a1 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -5154,14 +5154,11 @@ int Client::FindSpellBookSlotBySpellID(uint16 spellid) { return -1; //default } -bool Client::SpellGlobalCheck(uint16 spell_ID, uint32 char_ID) { - - std::string spell_Global_Name; - int spell_Global_Value; - int global_Value; - - std::string query = StringFormat("SELECT qglobal, value FROM spell_globals " - "WHERE spellid = %i", spell_ID); +bool Client::SpellGlobalCheck(uint16 spell_id, uint32 char_id) { + std::string spell_global_name; + int spell_global_value; + int global_value; + std::string query = StringFormat("SELECT qglobal, value FROM spell_globals WHERE spellid = %i", spell_id); auto results = database.QueryDatabase(query); if (!results.Success()) { return false; // Query failed, so prevent spell from scribing just in case @@ -5171,37 +5168,79 @@ bool Client::SpellGlobalCheck(uint16 spell_ID, uint32 char_ID) { return true; // Spell ID isn't listed in the spells_global table, so it is not restricted from scribing auto row = results.begin(); - spell_Global_Name = row[0]; - spell_Global_Value = atoi(row[1]); + spell_global_name = row[0]; + spell_global_value = atoi(row[1]); - if (spell_Global_Name.empty()) + if (spell_global_name.empty()) return true; // If the entry in the spell_globals table has nothing set for the qglobal name query = StringFormat("SELECT value FROM quest_globals " "WHERE charid = %i AND name = '%s'", - char_ID, spell_Global_Name.c_str()); + char_id, spell_global_name.c_str()); results = database.QueryDatabase(query); if (!results.Success()) { - Log(Logs::General, Logs::Error, "Spell ID %i query of spell_globals with Name: '%s' Value: '%i' failed", spell_ID, spell_Global_Name.c_str(), spell_Global_Value); + Log(Logs::General, Logs::Error, "Spell ID %i query of spell_globals with Name: '%s' Value: '%i' failed", spell_id, spell_global_name.c_str(), spell_global_value); return false; } if (results.RowCount() != 1) { - Log(Logs::General, Logs::Error, "Char ID: %i does not have the Qglobal Name: '%s' for Spell ID %i", char_ID, spell_Global_Name.c_str(), spell_ID); + Log(Logs::General, Logs::Error, "Char ID: %i does not have the Qglobal Name: '%s' for Spell ID %i", char_id, spell_global_name.c_str(), spell_id); + return false; + } + + row = results.begin(); + global_value = atoi(row[0]); + if (global_value == spell_global_value) + return true; // If the values match from both tables, allow the spell to be scribed + else if (global_value > spell_global_value) + return true; // Check if the qglobal value is greater than the require spellglobal value + + // If no matching result found in qglobals, don't scribe this spell + Log(Logs::General, Logs::Error, "Char ID: %i Spell_globals Name: '%s' Value: '%i' did not match QGlobal Value: '%i' for Spell ID %i", char_id, spell_global_name.c_str(), spell_global_value, global_value, spell_id); + return false; +} + +bool Client::SpellBucketCheck(uint16 spell_id, uint32 char_id) { + std::string spell_bucket_name; + int spell_bucket_value; + int bucket_value; + std::string query = StringFormat("SELECT key, value FROM spell_buckets WHERE spellid = %i", spell_id); + auto results = database.QueryDatabase(query); + if (!results.Success()) + return false; + + if (results.RowCount() != 1) + return true; + + auto row = results.begin(); + spell_bucket_name = row[0]; + spell_bucket_value = atoi(row[1]); + if (spell_bucket_name.empty()) + return true; + + query = StringFormat("SELECT value FROM data_buckets WHERE key = '%i-%s'", char_id, spell_bucket_name.c_str()); + results = database.QueryDatabase(query); + if (!results.Success()) { + Log(Logs::General, Logs::Error, "Spell bucket %s for spell ID %i for char ID %i failed.", spell_bucket_name.c_str(), spell_id, char_id); + return false; + } + + if (results.RowCount() != 1) { + Log(Logs::General, Logs::Error, "Spell bucket %s does not exist for spell ID %i for char ID %i.", spell_bucket_name.c_str(), spell_id, char_id); return false; } row = results.begin(); - global_Value = atoi(row[0]); + bucket_value = atoi(row[0]); - if (global_Value == spell_Global_Value) + if (bucket_value == spell_bucket_value) return true; // If the values match from both tables, allow the spell to be scribed - else if (global_Value > spell_Global_Value) - return true; // Check if the qglobal value is greater than the require spellglobal value + else if (bucket_value > spell_bucket_value) + return true; // Check if the data bucket value is greater than the required spell bucket value - // If no matching result found in qglobals, don't scribe this spell - Log(Logs::General, Logs::Error, "Char ID: %i Spell_globals Name: '%s' Value: '%i' did not match QGlobal Value: '%i' for Spell ID %i", char_ID, spell_Global_Name.c_str(), spell_Global_Value, global_Value, spell_ID); + // If no matching result found in spell buckets, don't scribe this spell + Log(Logs::General, Logs::Error, "Spell bucket %s for spell ID %i for char ID %i did not match value %i.", spell_bucket_name.c_str(), spell_id, char_id, spell_bucket_value); return false; } diff --git a/zone/string_ids.h b/zone/string_ids.h index 2c223ffbd..acab3df22 100644 --- a/zone/string_ids.h +++ b/zone/string_ids.h @@ -418,6 +418,7 @@ #define NO_LONGER_HIDDEN 12337 //You are no longer hidden. #define STOP_SNEAKING 12338 //You stop sneaking #define NOT_IN_CONTROL 12368 //You do not have control of yourself right now. +#define STAND_TO_CAST 12441 //You must be standing to cast a spell. #define ALREADY_CASTING 12442 //You are already casting a spell! #define SHIMMERS_BRIEFLY 12444 //Your %1 shimmers briefly. #define SENSE_CORPSE_NOT_NAME 12446 //You don't sense any corpses of that name. diff --git a/zone/trading.cpp b/zone/trading.cpp index 8c07db9fc..154fdf148 100644 --- a/zone/trading.cpp +++ b/zone/trading.cpp @@ -1295,7 +1295,7 @@ EQEmu::ItemInstance* Client::FindTraderItemBySerialNumber(int32 SerialNumber){ GetItems_Struct* Client::GetTraderItems(){ const EQEmu::ItemInstance* item = nullptr; - uint16 SlotID = 0; + uint16 SlotID = INVALID_INDEX; auto gis = new GetItems_Struct; @@ -1304,9 +1304,14 @@ GetItems_Struct* Client::GetTraderItems(){ uint8 ndx = 0; for (int i = EQEmu::invslot::GENERAL_BEGIN; i <= EQEmu::invslot::GENERAL_END; i++) { + if (ndx >= 80) + break; item = this->GetInv().GetItem(i); if(item && item->GetItem()->ID == 17899){ //Traders Satchel for (int x = EQEmu::invbag::SLOT_BEGIN; x <= EQEmu::invbag::SLOT_END; x++) { + if (ndx >= 80) + break; + SlotID = EQEmu::InventoryProfile::CalcSlotId(i, x); item = this->GetInv().GetItem(SlotID); diff --git a/zone/zone.cpp b/zone/zone.cpp old mode 100644 new mode 100755 index 3b9e5e513..f1fce52ac --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -893,7 +893,7 @@ bool Zone::Init(bool iStaticZone) { SetStaticZone(iStaticZone); //load the zone config file. - if (!LoadZoneCFG(zone->GetShortName(), zone->GetInstanceVersion(), true)) // try loading the zone name... + if (!LoadZoneCFG(zone->GetShortName(), zone->GetInstanceVersion())) // try loading the zone name... LoadZoneCFG(zone->GetFileName(), zone->GetInstanceVersion()); // if that fails, try the file name, then load defaults if(RuleManager::Instance()->GetActiveRulesetID() != default_ruleset) @@ -1054,39 +1054,31 @@ void Zone::ReloadStaticData() { zone->LoadNPCEmotes(&NPCEmoteList); //load the zone config file. - if (!LoadZoneCFG(zone->GetShortName(), zone->GetInstanceVersion(), true)) // try loading the zone name... + if (!LoadZoneCFG(zone->GetShortName(), zone->GetInstanceVersion())) // try loading the zone name... LoadZoneCFG(zone->GetFileName(), zone->GetInstanceVersion()); // if that fails, try the file name, then load defaults Log(Logs::General, Logs::Status, "Zone Static Data Reloaded."); } -bool Zone::LoadZoneCFG(const char* filename, uint16 instance_id, bool DontLoadDefault) +bool Zone::LoadZoneCFG(const char* filename, uint16 instance_id) { + memset(&newzone_data, 0, sizeof(NewZone_Struct)); - if(instance_id == 0) + map_name = nullptr; + + if(!database.GetZoneCFG(database.GetZoneID(filename), instance_id, &newzone_data, can_bind, + can_combat, can_levitate, can_castoutdoor, is_city, is_hotzone, allow_mercs, zone_type, default_ruleset, &map_name)) { - map_name = nullptr; - if(!database.GetZoneCFG(database.GetZoneID(filename), 0, &newzone_data, can_bind, - can_combat, can_levitate, can_castoutdoor, is_city, is_hotzone, allow_mercs, zone_type, default_ruleset, &map_name)) - { - Log(Logs::General, Logs::Error, "Error loading the Zone Config."); - return false; - } - } - else - { - //Fall back to base zone if we don't find the instance version. - map_name = nullptr; - if(!database.GetZoneCFG(database.GetZoneID(filename), instance_id, &newzone_data, can_bind, - can_combat, can_levitate, can_castoutdoor, is_city, is_hotzone, allow_mercs, zone_type, default_ruleset, &map_name)) + // If loading a non-zero instance failed, try loading the default + if (instance_id != 0) { safe_delete_array(map_name); - if(!database.GetZoneCFG(database.GetZoneID(filename), 0, &newzone_data, can_bind, - can_combat, can_levitate, can_castoutdoor, is_city, is_hotzone, allow_mercs, zone_type, default_ruleset, &map_name)) - { + if(!database.GetZoneCFG(database.GetZoneID(filename), 0, &newzone_data, can_bind, can_combat, can_levitate, + can_castoutdoor, is_city, is_hotzone, allow_mercs, zone_type, default_ruleset, &map_name)) + { Log(Logs::General, Logs::Error, "Error loading the Zone Config."); return false; - } + } } } @@ -1274,7 +1266,8 @@ bool Zone::Process() { } } - if(Weather_Timer->Check()){ + if(Weather_Timer->Check()) + { Weather_Timer->Disable(); this->ChangeWeather(); } @@ -1860,26 +1853,22 @@ bool Zone::RemoveSpawnGroup(uint32 in_id) { return false; } - -// Added By Hogie -bool ZoneDatabase::GetDecayTimes(npcDecayTimes_Struct* npcCorpseDecayTimes) { - - const std::string query = "SELECT varname, value FROM variables WHERE varname LIKE 'decaytime%%' ORDER BY varname"; +bool ZoneDatabase::GetDecayTimes(npcDecayTimes_Struct *npcCorpseDecayTimes) +{ + const std::string query = + "SELECT varname, value FROM variables WHERE varname LIKE 'decaytime%%' ORDER BY varname"; auto results = QueryDatabase(query); if (!results.Success()) - return false; + return false; int index = 0; - for (auto row = results.begin(); row != results.end(); ++row, ++index) { - Seperator sep(row[0]); - npcCorpseDecayTimes[index].minlvl = atoi(sep.arg[1]); - npcCorpseDecayTimes[index].maxlvl = atoi(sep.arg[2]); + for (auto row = results.begin(); row != results.end(); ++row, ++index) { + Seperator sep(row[0]); + npcCorpseDecayTimes[index].minlvl = atoi(sep.arg[1]); + npcCorpseDecayTimes[index].maxlvl = atoi(sep.arg[2]); - if (atoi(row[1]) > 7200) - npcCorpseDecayTimes[index].seconds = 720; - else - npcCorpseDecayTimes[index].seconds = atoi(row[1]); - } + npcCorpseDecayTimes[index].seconds = std::min(24 * 60 * 60, atoi(row[1])); + } return true; } diff --git a/zone/zone.h b/zone/zone.h old mode 100644 new mode 100755 index 5f8651d8b..ae0d93332 --- a/zone/zone.h +++ b/zone/zone.h @@ -93,7 +93,7 @@ public: bool is_zone_time_localized; bool Init(bool iStaticZone); - bool LoadZoneCFG(const char* filename, uint16 instance_id, bool DontLoadDefault = false); + bool LoadZoneCFG(const char* filename, uint16 instance_id); bool SaveZoneCFG(); bool IsLoaded(); bool IsPVPZone() { return pvpzone; } diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index ba3d7ff45..2c61c05f0 100644 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -4356,15 +4356,15 @@ uint32 ZoneDatabase::GetCharacterCorpseCount(uint32 char_id) { } uint32 ZoneDatabase::GetCharacterCorpseID(uint32 char_id, uint8 corpse) { - std::string query = StringFormat("SELECT `id` FROM `character_corpses` WHERE `charid` = '%u'", char_id); - auto results = QueryDatabase(query); + std::string query = StringFormat("SELECT `id` FROM `character_corpses` WHERE `charid` = '%u' limit %d, 1", char_id, corpse); - for (auto row = results.begin(); row != results.end(); ++row) { - for (int i = 0; i < corpse; i++) { - return atoul(row[0]); - } - } - return 0; + auto results = QueryDatabase(query); + auto row = results.begin(); + + if (row != results.end()) + return atoul(row[0]); + else + return 0; } uint32 ZoneDatabase::GetCharacterCorpseItemCount(uint32 corpse_id){