[Item Ticks] Remove Item Ticks Code (#3955)

* [Items] Convert Load of Item Ticks to Repositories

- Convert `LoadItemTicks()` to repositories.

* Remove item tick code.

* Remove repository references.

* Update zone.h

zone/client.cpp

@@ -165,7 +165,6 @@ Client::Client(EQStreamInterface *ieqs) : Mob(
   TrackingTimer(2000),
   RespawnFromHoverTimer(0),
   merc_timer(RuleI(Mercs, UpkeepIntervalMS)),
-  ItemTickTimer(10000),
   ItemQuestTimer(500),
   anon_toggle_timer(250),
   afk_toggle_timer(250),
@@ -6568,7 +6567,7 @@ void Client::SendAltCurrencies() {
 		if (!currency_count) {
 			return;
 		}
-			
+
 		auto outapp = new EQApplicationPacket(
 			OP_AltCurrency,
 			sizeof(AltCurrencyPopulate_Struct) +
@@ -7744,68 +7743,6 @@ std::vector<std::string> Client::GetAccountFlags()
 	return l;
 }
 
-void Client::TickItemCheck()
-{
-	int i;
-
-	if(zone->tick_items.empty()) { return; }
-
-	//Scan equip, general, cursor slots for items
-	for (i = EQ::invslot::POSSESSIONS_BEGIN; i <= EQ::invslot::POSSESSIONS_END; i++)
-	{
-		TryItemTick(i);
-	}
-	//Scan bags
-	for (i = EQ::invbag::GENERAL_BAGS_BEGIN; i <= EQ::invbag::CURSOR_BAG_END; i++)
-	{
-		TryItemTick(i);
-	}
-}
-
-void Client::TryItemTick(int slot)
-{
-	int iid = 0;
-	const EQ::ItemInstance* inst = m_inv[slot];
-	if(inst == 0) { return; }
-
-	iid = inst->GetID();
-
-	if(zone->tick_items.count(iid) > 0)
-	{
-		if (GetLevel() >= zone->tick_items[iid].level && zone->random.Int(0, 100) >= (100 - zone->tick_items[iid].chance) && (zone->tick_items[iid].bagslot || slot <= EQ::invslot::EQUIPMENT_END))
-		{
-			EQ::ItemInstance* e_inst = (EQ::ItemInstance*)inst;
-
-			if (parse->ItemHasQuestSub(e_inst, EVENT_ITEM_TICK)) {
-				parse->EventItem(EVENT_ITEM_TICK, this, e_inst, nullptr, "", slot);
-			}
-		}
-	}
-
-	//Only look at augs in main inventory
-	if (slot > EQ::invslot::EQUIPMENT_END) { return; }
-
-	for (int x = EQ::invaug::SOCKET_BEGIN; x <= EQ::invaug::SOCKET_END; ++x)
-	{
-		EQ::ItemInstance * a_inst = inst->GetAugment(x);
-		if(!a_inst) { continue; }
-
-		iid = a_inst->GetID();
-
-		if(zone->tick_items.count(iid) > 0)
-		{
-			if( GetLevel() >= zone->tick_items[iid].level && zone->random.Int(0, 100) >= (100 - zone->tick_items[iid].chance) )
-			{
-				EQ::ItemInstance* e_inst = (EQ::ItemInstance*) a_inst;
-
-				if (parse->ItemHasQuestSub(e_inst, EVENT_ITEM_TICK)) {
-					parse->EventItem(EVENT_ITEM_TICK, this, e_inst, nullptr, "", slot);
-				}
-			}
-		}
-	}
-}
-
 void Client::ItemTimerCheck()
 {
 	int i;

zone/client.h

@@ -1590,8 +1590,6 @@ public:
 	void DuplicateLoreMessage(uint32 ItemID);
 	void GarbleMessage(char *, uint8);
 
-	void TickItemCheck();
-	void TryItemTick(int slot);
 	void ItemTimerCheck();
 	void TryItemTimer(int slot);
 	void SendItemScale(EQ::ItemInstance *inst);
@@ -2008,7 +2006,6 @@ private:
 
 	AggroMeter m_aggrometer;
 
-	Timer ItemTickTimer;
 	Timer ItemQuestTimer;
 	std::map<std::string,std::string> accountflags;
 

zone/client_process.cpp

@@ -525,11 +525,6 @@ bool Client::Process() {
 				CalcBonuses();
 			}
 
-			if (ItemTickTimer.Check())
-			{
-				TickItemCheck();
-			}
-
 			if (ItemQuestTimer.Check())
 			{
 				ItemTimerCheck();

zone/event_codes.h

@@ -61,7 +61,7 @@ typedef enum {
 	EVENT_DISCOVER_ITEM,
 	EVENT_DISCONNECT,
 	EVENT_CONNECT,
-	EVENT_ITEM_TICK,
+	EVENT_ITEM_TICK, // Unused, keeping so event IDs don't get out of wack
 	EVENT_DUEL_WIN,
 	EVENT_DUEL_LOSE,
 	EVENT_ENCOUNTER_LOAD,

zone/lua_general.cpp

@@ -6547,7 +6547,6 @@ luabind::scope lua_register_events() {
 			luabind::value("discover_item", static_cast<int>(EVENT_DISCOVER_ITEM)),
 			luabind::value("disconnect", static_cast<int>(EVENT_DISCONNECT)),
 			luabind::value("connect", static_cast<int>(EVENT_CONNECT)),
-			luabind::value("item_tick", static_cast<int>(EVENT_ITEM_TICK)),
 			luabind::value("duel_win", static_cast<int>(EVENT_DUEL_WIN)),
 			luabind::value("duel_lose", static_cast<int>(EVENT_DUEL_LOSE)),
 			luabind::value("encounter_load", static_cast<int>(EVENT_ENCOUNTER_LOAD)),

zone/zone.cpp

@@ -1219,7 +1219,6 @@ bool Zone::Init(bool is_static) {
 	LogInfo("Zone booted successfully zone_id [{}] time_offset [{}]", zoneid, zone_time.getEQTimeZone());
 
 	LoadGrids();
-	LoadTickItems();
 
 	npc_scale_manager->LoadScaleData();
 
@@ -2664,34 +2663,6 @@ void Zone::ClearSpawnTimers()
 	);
 }
 
-void Zone::LoadTickItems()
-{
-	tick_items.clear();
-
-    const std::string query = "SELECT it_itemid, it_chance, it_level, it_qglobal, it_bagslot FROM item_tick";
-    auto results = database.QueryDatabase(query);
-    if (!results.Success()) {
-        return;
-    }
-
-
-    for (auto row = results.begin(); row != results.end(); ++row) {
-        if(Strings::ToInt(row[0]) == 0)
-            continue;
-
-        item_tick_struct ti_tmp;
-		ti_tmp.itemid = Strings::ToInt(row[0]);
-		ti_tmp.chance = Strings::ToInt(row[1]);
-		ti_tmp.level = Strings::ToInt(row[2]);
-		ti_tmp.bagslot = (int16)Strings::ToInt(row[4]);
-		ti_tmp.qglobal = std::string(row[3]);
-		tick_items[Strings::ToInt(row[0])] = ti_tmp;
-
-    }
-
-	LogInfo("Loaded [{}] item_tick entries", Strings::Commify(results.RowCount()));
-}
-
 uint32 Zone::GetSpawnKillCount(uint32 in_spawnid) {
 	LinkedListIterator<Spawn2*> iterator(spawn2_list);
 

zone/zone.h

@@ -77,14 +77,6 @@ struct ZoneEXPModInfo {
 	float AAExpMod;
 };
 
-struct item_tick_struct {
-	uint32      itemid;
-	uint32      chance;
-	uint32      level;
-	int16       bagslot;
-	std::string qglobal;
-};
-
 class Client;
 class Expedition;
 class Map;
@@ -219,7 +211,6 @@ public:
 
 	std::pair<AA::Ability *, AA::Rank *> GetAlternateAdvancementAbilityAndRank(int id, int points_spent);
 
-	std::unordered_map<int, item_tick_struct>             tick_items;
 	std::unordered_map<int, std::unique_ptr<AA::Ability>> aa_abilities;
 	std::unordered_map<int, std::unique_ptr<AA::Rank>>    aa_ranks;
 
@@ -285,7 +276,6 @@ public:
 	void LoadNewMerchantData(uint32 merchantid);
 	void LoadNPCEmotes(std::vector<NPC_Emote_Struct *> *NPCEmoteList);
 	void LoadTempMerchantData();
-	void LoadTickItems();
 	void LoadVeteranRewards();
 	void LoadZoneDoors();
 	void ReloadStaticData();