diff --git a/zone/client_packet.h b/zone/client_packet.h
index 3951a1761..768a307a4 100644
--- a/zone/client_packet.h
+++ b/zone/client_packet.h
@@ -1,315 +1,314 @@
-	/* Connecting OpCode Handlers */
-	void Handle_Connect_0x3e33(const EQApplicationPacket *app);
-	void Handle_Connect_OP_ApproveZone(const EQApplicationPacket *app);
-	void Handle_Connect_OP_ClientError(const EQApplicationPacket *app);
-	void Handle_Connect_OP_ClientReady(const EQApplicationPacket *app);
-	void Handle_Connect_OP_ClientUpdate(const EQApplicationPacket *app);
-	void Handle_Connect_OP_ReqClientSpawn(const EQApplicationPacket *app);
-	void Handle_Connect_OP_ReqNewZone(const EQApplicationPacket *app);
-	void Handle_Connect_OP_SendAAStats(const EQApplicationPacket *app);
-	void Handle_Connect_OP_SendAATable(const EQApplicationPacket *app);
-	void Handle_Connect_OP_SendExpZonein(const EQApplicationPacket *app);
-	void Handle_Connect_OP_SendGuildTributes(const EQApplicationPacket *app);
-	void Handle_Connect_OP_SendTributes(const EQApplicationPacket *app);
-	void Handle_Connect_OP_SetDataRate(const EQApplicationPacket *app);
-	void Handle_Connect_OP_SetServerFilter(const EQApplicationPacket *app);
-	void Handle_Connect_OP_SpawnAppearance(const EQApplicationPacket *app);
-	void Handle_Connect_OP_TGB(const EQApplicationPacket *app);
-	void Handle_Connect_OP_UpdateAA(const EQApplicationPacket *app);
-	void Handle_Connect_OP_WearChange(const EQApplicationPacket *app);
-	void Handle_Connect_OP_WorldObjectsSent(const EQApplicationPacket *app);
-	void Handle_Connect_OP_ZoneComplete(const EQApplicationPacket *app);
-	void Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app);
-	/* Connected opcode handlers*/
-	void Handle_0x0193(const EQApplicationPacket *app);
-	void Handle_0x01e7(const EQApplicationPacket *app);
-	void Handle_OP_AAAction(const EQApplicationPacket *app);
-	void Handle_OP_AcceptNewTask(const EQApplicationPacket *app);
-	void Handle_OP_AdventureInfoRequest(const EQApplicationPacket *app);
-	void Handle_OP_AdventureLeaderboardRequest(const EQApplicationPacket *app);
-	void Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app);
-	void Handle_OP_AdventureMerchantRequest(const EQApplicationPacket *app);
-	void Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app);
-	void Handle_OP_AdventureRequest(const EQApplicationPacket *app);
-	void Handle_OP_AdventureStatsRequest(const EQApplicationPacket *app);
-	void Handle_OP_AggroMeterLockTarget(const EQApplicationPacket *app);
-	void Handle_OP_AltCurrencyMerchantRequest(const EQApplicationPacket *app);
-	void Handle_OP_AltCurrencyPurchase(const EQApplicationPacket *app);
-	void Handle_OP_AltCurrencyReclaim(const EQApplicationPacket *app);
-	void Handle_OP_AltCurrencySell(const EQApplicationPacket *app);
-	void Handle_OP_AltCurrencySellSelection(const EQApplicationPacket *app);
-	void Handle_OP_Animation(const EQApplicationPacket *app);
-	void Handle_OP_ApplyPoison(const EQApplicationPacket *app);
-	void Handle_OP_Assist(const EQApplicationPacket *app);
-	void Handle_OP_AssistGroup(const EQApplicationPacket *app);
-	void Handle_OP_AugmentInfo(const EQApplicationPacket *app);
-	void Handle_OP_AugmentItem(const EQApplicationPacket *app);
-	void Handle_OP_AutoAttack(const EQApplicationPacket *app);
-	void Handle_OP_AutoAttack2(const EQApplicationPacket *app);
-	void Handle_OP_AutoFire(const EQApplicationPacket *app);
-	void Handle_OP_Bandolier(const EQApplicationPacket *app);
-	void Handle_OP_BankerChange(const EQApplicationPacket *app);
-	void Handle_OP_Barter(const EQApplicationPacket *app);
-	void Handle_OP_BazaarInspect(const EQApplicationPacket *app);
-	void Handle_OP_BazaarSearch(const EQApplicationPacket *app);
-	void Handle_OP_Begging(const EQApplicationPacket *app);
-	void Handle_OP_Bind_Wound(const EQApplicationPacket *app);
-	void Handle_OP_BlockedBuffs(const EQApplicationPacket *app);
-	void Handle_OP_BoardBoat(const EQApplicationPacket *app);
-	void Handle_OP_Buff(const EQApplicationPacket *app);
-	void Handle_OP_BuffRemoveRequest(const EQApplicationPacket *app);
-	void Handle_OP_Bug(const EQApplicationPacket *app);
-	void Handle_OP_Camp(const EQApplicationPacket *app);
-	void Handle_OP_CancelTask(const EQApplicationPacket *app);
-	void Handle_OP_CancelTrade(const EQApplicationPacket *app);
-	void Handle_OP_CastSpell(const EQApplicationPacket *app);
-	void Handle_OP_ChannelMessage(const EQApplicationPacket *app);
-	void Handle_OP_ClearBlockedBuffs(const EQApplicationPacket *app);
-	void Handle_OP_ClearNPCMarks(const EQApplicationPacket *app);
-	void Handle_OP_ClearSurname(const EQApplicationPacket *app);
-	void Handle_OP_ClickDoor(const EQApplicationPacket *app);
-	void Handle_OP_ClickObject(const EQApplicationPacket *app);
-	void Handle_OP_ClickObjectAction(const EQApplicationPacket *app);
-	void Handle_OP_ClientError(const EQApplicationPacket *app);
-	void Handle_OP_ClientTimeStamp(const EQApplicationPacket *app);
-	void Handle_OP_ClientUpdate(const EQApplicationPacket *app);
+/* Connecting OpCode Handlers */
+void Handle_Connect_0x3e33(const EQApplicationPacket* app);
+void Handle_Connect_OP_ApproveZone(const EQApplicationPacket* app);
+void Handle_Connect_OP_ClientError(const EQApplicationPacket* app);
+void Handle_Connect_OP_ClientReady(const EQApplicationPacket* app);
+void Handle_Connect_OP_ClientUpdate(const EQApplicationPacket* app);
+void Handle_Connect_OP_ReqClientSpawn(const EQApplicationPacket* app);
+void Handle_Connect_OP_ReqNewZone(const EQApplicationPacket* app);
+void Handle_Connect_OP_SendAAStats(const EQApplicationPacket* app);
+void Handle_Connect_OP_SendAATable(const EQApplicationPacket* app);
+void Handle_Connect_OP_SendExpZonein(const EQApplicationPacket* app);
+void Handle_Connect_OP_SendGuildTributes(const EQApplicationPacket* app);
+void Handle_Connect_OP_SendTributes(const EQApplicationPacket* app);
+void Handle_Connect_OP_SetDataRate(const EQApplicationPacket* app);
+void Handle_Connect_OP_SetServerFilter(const EQApplicationPacket* app);
+void Handle_Connect_OP_SpawnAppearance(const EQApplicationPacket* app);
+void Handle_Connect_OP_TGB(const EQApplicationPacket* app);
+void Handle_Connect_OP_UpdateAA(const EQApplicationPacket* app);
+void Handle_Connect_OP_WearChange(const EQApplicationPacket* app);
+void Handle_Connect_OP_WorldObjectsSent(const EQApplicationPacket* app);
+void Handle_Connect_OP_ZoneComplete(const EQApplicationPacket* app);
+void Handle_Connect_OP_ZoneEntry(const EQApplicationPacket* app);
+/* Connected opcode handlers*/
+void Handle_0x01e7(const EQApplicationPacket* app);
+void Handle_OP_AAAction(const EQApplicationPacket* app);
+void Handle_OP_AcceptNewTask(const EQApplicationPacket* app);
+void Handle_OP_AdventureInfoRequest(const EQApplicationPacket* app);
+void Handle_OP_AdventureLeaderboardRequest(const EQApplicationPacket* app);
+void Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket* app);
+void Handle_OP_AdventureMerchantRequest(const EQApplicationPacket* app);
+void Handle_OP_AdventureMerchantSell(const EQApplicationPacket* app);
+void Handle_OP_AdventureRequest(const EQApplicationPacket* app);
+void Handle_OP_AdventureStatsRequest(const EQApplicationPacket* app);
+void Handle_OP_AggroMeterLockTarget(const EQApplicationPacket* app);
+void Handle_OP_AltCurrencyMerchantRequest(const EQApplicationPacket* app);
+void Handle_OP_AltCurrencyPurchase(const EQApplicationPacket* app);
+void Handle_OP_AltCurrencyReclaim(const EQApplicationPacket* app);
+void Handle_OP_AltCurrencySell(const EQApplicationPacket* app);
+void Handle_OP_AltCurrencySellSelection(const EQApplicationPacket* app);
+void Handle_OP_Animation(const EQApplicationPacket* app);
+void Handle_OP_ApplyPoison(const EQApplicationPacket* app);
+void Handle_OP_Assist(const EQApplicationPacket* app);
+void Handle_OP_AssistGroup(const EQApplicationPacket* app);
+void Handle_OP_AugmentInfo(const EQApplicationPacket* app);
+void Handle_OP_AugmentItem(const EQApplicationPacket* app);
+void Handle_OP_AutoAttack(const EQApplicationPacket* app);
+void Handle_OP_AutoAttack2(const EQApplicationPacket* app);
+void Handle_OP_AutoFire(const EQApplicationPacket* app);
+void Handle_OP_Bandolier(const EQApplicationPacket* app);
+void Handle_OP_BankerChange(const EQApplicationPacket* app);
+void Handle_OP_Barter(const EQApplicationPacket* app);
+void Handle_OP_BazaarInspect(const EQApplicationPacket* app);
+void Handle_OP_BazaarSearch(const EQApplicationPacket* app);
+void Handle_OP_Begging(const EQApplicationPacket* app);
+void Handle_OP_Bind_Wound(const EQApplicationPacket* app);
+void Handle_OP_BlockedBuffs(const EQApplicationPacket* app);
+void Handle_OP_BoardBoat(const EQApplicationPacket* app);
+void Handle_OP_Buff(const EQApplicationPacket* app);
+void Handle_OP_BuffRemoveRequest(const EQApplicationPacket* app);
+void Handle_OP_Bug(const EQApplicationPacket* app);
+void Handle_OP_Camp(const EQApplicationPacket* app);
+void Handle_OP_CancelTask(const EQApplicationPacket* app);
+void Handle_OP_CancelTrade(const EQApplicationPacket* app);
+void Handle_OP_CastSpell(const EQApplicationPacket* app);
+void Handle_OP_ChannelMessage(const EQApplicationPacket* app);
+void Handle_OP_ClearBlockedBuffs(const EQApplicationPacket* app);
+void Handle_OP_ClearNPCMarks(const EQApplicationPacket* app);
+void Handle_OP_ClearSurname(const EQApplicationPacket* app);
+void Handle_OP_ClickDoor(const EQApplicationPacket* app);
+void Handle_OP_ClickObject(const EQApplicationPacket* app);
+void Handle_OP_ClickObjectAction(const EQApplicationPacket* app);
+void Handle_OP_ClientError(const EQApplicationPacket* app);
+void Handle_OP_ClientTimeStamp(const EQApplicationPacket* app);
+void Handle_OP_ClientUpdate(const EQApplicationPacket* app);
 //	void Handle_OP_CloseContainer(const EQApplicationPacket *app);
-	void Handle_OP_CombatAbility(const EQApplicationPacket *app);
-	void Handle_OP_ConfirmDelete(const EQApplicationPacket *app);
-	void Handle_OP_Consent(const EQApplicationPacket *app);
-	void Handle_OP_ConsentDeny(const EQApplicationPacket *app);
-	void Handle_OP_Consider(const EQApplicationPacket *app);
-	void Handle_OP_ConsiderCorpse(const EQApplicationPacket *app);
-	void Handle_OP_Consume(const EQApplicationPacket *app);
-	void Handle_OP_ControlBoat(const EQApplicationPacket *app);
-	void Handle_OP_CorpseDrag(const EQApplicationPacket *app);
-	void Handle_OP_CorpseDrop(const EQApplicationPacket *app);
-	void Handle_OP_CrashDump(const EQApplicationPacket *app);
-	void Handle_OP_CreateObject(const EQApplicationPacket *app);
-	void Handle_OP_CrystalCreate(const EQApplicationPacket *app);
-	void Handle_OP_CrystalReclaim(const EQApplicationPacket *app);
-	void Handle_OP_Damage(const EQApplicationPacket *app);
-	void Handle_OP_Death(const EQApplicationPacket *app);
-	void Handle_OP_DelegateAbility(const EQApplicationPacket *app);
-	void Handle_OP_DeleteItem(const EQApplicationPacket *app);
-	void Handle_OP_DeleteSpawn(const EQApplicationPacket *app);
-	void Handle_OP_DeleteSpell(const EQApplicationPacket *app);
-	void Handle_OP_Disarm(const EQApplicationPacket *app);
-	void Handle_OP_DisarmTraps(const EQApplicationPacket *app);
-	void Handle_OP_DoGroupLeadershipAbility(const EQApplicationPacket *app);
-	void Handle_OP_DuelResponse(const EQApplicationPacket *app);
-	void Handle_OP_DuelResponse2(const EQApplicationPacket *app);
-	void Handle_OP_DumpName(const EQApplicationPacket *app);
-	void Handle_OP_Dye(const EQApplicationPacket *app);
-	void Handle_OP_DzAddPlayer(const EQApplicationPacket *app);
-	void Handle_OP_DzChooseZoneReply(const EQApplicationPacket *app);
-	void Handle_OP_DzExpeditionInviteResponse(const EQApplicationPacket *app);
-	void Handle_OP_DzListTimers(const EQApplicationPacket *app);
-	void Handle_OP_DzMakeLeader(const EQApplicationPacket *app);
-	void Handle_OP_DzPlayerList(const EQApplicationPacket *app);
-	void Handle_OP_DzRemovePlayer(const EQApplicationPacket *app);
-	void Handle_OP_DzSwapPlayer(const EQApplicationPacket *app);
-	void Handle_OP_DzQuit(const EQApplicationPacket *app);
-	void Handle_OP_Emote(const EQApplicationPacket *app);
-	void Handle_OP_EndLootRequest(const EQApplicationPacket *app);
-	void Handle_OP_EnvDamage(const EQApplicationPacket *app);
-	void Handle_OP_FaceChange(const EQApplicationPacket *app);
-	void Handle_OP_FeignDeath(const EQApplicationPacket *app);
-	void Handle_OP_FindPersonRequest(const EQApplicationPacket *app);
-	void Handle_OP_Fishing(const EQApplicationPacket *app);
-	void Handle_OP_Forage(const EQApplicationPacket *app);
-	void Handle_OP_FriendsWho(const EQApplicationPacket *app);
-	void Handle_OP_GetGuildMOTD(const EQApplicationPacket *app);
-	void Handle_OP_GetGuildsList(const EQApplicationPacket *app);
-	void Handle_OP_GMBecomeNPC(const EQApplicationPacket *app);
-	void Handle_OP_GMDelCorpse(const EQApplicationPacket *app);
-	void Handle_OP_GMEmoteZone(const EQApplicationPacket *app);
-	void Handle_OP_GMEndTraining(const EQApplicationPacket *app);
-	void Handle_OP_GMFind(const EQApplicationPacket *app);
-	void Handle_OP_GMGoto(const EQApplicationPacket *app);
-	void Handle_OP_GMHideMe(const EQApplicationPacket *app);
-	void Handle_OP_GMKick(const EQApplicationPacket *app);
-	void Handle_OP_GMKill(const EQApplicationPacket *app);
-	void Handle_OP_GMLastName(const EQApplicationPacket *app);
-	void Handle_OP_GMNameChange(const EQApplicationPacket *app);
-	void Handle_OP_GMSearchCorpse(const EQApplicationPacket *app);
-	void Handle_OP_GMServers(const EQApplicationPacket *app);
-	void Handle_OP_GMSummon(const EQApplicationPacket *app);
-	void Handle_OP_GMToggle(const EQApplicationPacket *app);
-	void Handle_OP_GMTraining(const EQApplicationPacket *app);
-	void Handle_OP_GMTrainSkill(const EQApplicationPacket *app);
-	void Handle_OP_GMZoneRequest(const EQApplicationPacket *app);
-	void Handle_OP_GMZoneRequest2(const EQApplicationPacket *app);
-	void Handle_OP_GroupAcknowledge(const EQApplicationPacket *app);
-	void Handle_OP_GroupCancelInvite(const EQApplicationPacket *app);
-	void Handle_OP_GroupDelete(const EQApplicationPacket *app);
-	void Handle_OP_GroupDisband(const EQApplicationPacket *app);
-	void Handle_OP_GroupFollow(const EQApplicationPacket *app);
-	void Handle_OP_GroupFollow2(const EQApplicationPacket *app);
-	void Handle_OP_GroupInvite(const EQApplicationPacket *app);
-	void Handle_OP_GroupInvite2(const EQApplicationPacket *app);
-	void Handle_OP_GroupMakeLeader(const EQApplicationPacket *app);
-	void Handle_OP_GroupMentor(const EQApplicationPacket *app);
-	void Handle_OP_GroupRoles(const EQApplicationPacket *app);
-	void Handle_OP_GroupUpdate(const EQApplicationPacket *app);
-	void Handle_OP_GuildBank(const EQApplicationPacket *app);
-	void Handle_OP_GuildCreate(const EQApplicationPacket *app);
-	void Handle_OP_GuildDelete(const EQApplicationPacket *app);
-	void Handle_OP_GuildDemote(const EQApplicationPacket *app);
-	void Handle_OP_GuildInvite(const EQApplicationPacket *app);
-	void Handle_OP_GuildInviteAccept(const EQApplicationPacket *app);
-	void Handle_OP_GuildLeader(const EQApplicationPacket *app);
-	void Handle_OP_GuildManageBanker(const EQApplicationPacket *app);
-	void Handle_OP_GuildPeace(const EQApplicationPacket *app);
-	void Handle_OP_GuildPromote(const EQApplicationPacket *app);
-	void Handle_OP_GuildPublicNote(const EQApplicationPacket *app);
-	void Handle_OP_GuildRemove(const EQApplicationPacket *app);
-	void Handle_OP_GuildStatus(const EQApplicationPacket *app);
-	void Handle_OP_GuildUpdateURLAndChannel(const EQApplicationPacket *app);
-	void Handle_OP_GuildWar(const EQApplicationPacket *app);
-	void Handle_OP_Heartbeat(const EQApplicationPacket *app);
-	void Handle_OP_Hide(const EQApplicationPacket *app);
-	void Handle_OP_HideCorpse(const EQApplicationPacket *app);
-	void Handle_OP_Ignore(const EQApplicationPacket *app);
-	void Handle_OP_Illusion(const EQApplicationPacket *app);
-	void Handle_OP_InspectAnswer(const EQApplicationPacket *app);
-	void Handle_OP_InspectMessageUpdate(const EQApplicationPacket *app);
-	void Handle_OP_InspectRequest(const EQApplicationPacket *app);
-	void Handle_OP_InstillDoubt(const EQApplicationPacket *app);
-	void Handle_OP_ItemLinkClick(const EQApplicationPacket *app);
-	void Handle_OP_ItemLinkResponse(const EQApplicationPacket *app);
-	void Handle_OP_ItemName(const EQApplicationPacket *app);
-	void Handle_OP_ItemPreview(const EQApplicationPacket *app);
-	void Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app);
-	void Handle_OP_Jump(const EQApplicationPacket *app);
-	void Handle_OP_KeyRing(const EQApplicationPacket *app);
-	void Handle_OP_KickPlayers(const EQApplicationPacket *app);
-	void Handle_OP_LDoNButton(const EQApplicationPacket *app);
-	void Handle_OP_LDoNDisarmTraps(const EQApplicationPacket *app);
-	void Handle_OP_LDoNInspect(const EQApplicationPacket *app);
-	void Handle_OP_LDoNOpen(const EQApplicationPacket *app);
-	void Handle_OP_LDoNPickLock(const EQApplicationPacket *app);
-	void Handle_OP_LDoNSenseTraps(const EQApplicationPacket *app);
-	void Handle_OP_LeadershipExpToggle(const EQApplicationPacket *app);
-	void Handle_OP_LeaveAdventure(const EQApplicationPacket *app);
-	void Handle_OP_LeaveBoat(const EQApplicationPacket *app);
-	void Handle_OP_LFGCommand(const EQApplicationPacket *app);
-	void Handle_OP_LFGGetMatchesRequest(const EQApplicationPacket *app);
-	void Handle_OP_LFGuild(const EQApplicationPacket *app);
-	void Handle_OP_LFPCommand(const EQApplicationPacket *app);
-	void Handle_OP_LFPGetMatchesRequest(const EQApplicationPacket *app);
-	void Handle_OP_LoadSpellSet(const EQApplicationPacket *app);
-	void Handle_OP_Logout(const EQApplicationPacket *app);
-	void Handle_OP_LootItem(const EQApplicationPacket *app);
-	void Handle_OP_LootRequest(const EQApplicationPacket *app);
-	void Handle_OP_ManaChange(const EQApplicationPacket *app);
-	void Handle_OP_Medding(const EQApplicationPacket *app);
-	void Handle_OP_MemorizeSpell(const EQApplicationPacket *app);
-	void Handle_OP_Mend(const EQApplicationPacket *app);
-	void Handle_OP_MercenaryCommand(const EQApplicationPacket *app);
-	void Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app);
-	void Handle_OP_MercenaryDataUpdateRequest(const EQApplicationPacket *app);
-	void Handle_OP_MercenaryDismiss(const EQApplicationPacket *app);
-	void Handle_OP_MercenaryHire(const EQApplicationPacket *app);
-	void Handle_OP_MercenarySuspendRequest(const EQApplicationPacket *app);
-	void Handle_OP_MercenaryTimerRequest(const EQApplicationPacket *app);
-	void Handle_OP_MoveCoin(const EQApplicationPacket *app);
-	void Handle_OP_MoveItem(const EQApplicationPacket *app);
-	void Handle_OP_MoveMultipleItems(const EQApplicationPacket *app);
-	void Handle_OP_OpenContainer(const EQApplicationPacket *app);
-	void Handle_OP_OpenGuildTributeMaster(const EQApplicationPacket *app);
-	void Handle_OP_OpenInventory(const EQApplicationPacket *app);
-	void Handle_OP_OpenTributeMaster(const EQApplicationPacket *app);
-	void Handle_OP_PDeletePetition(const EQApplicationPacket *app);
-	void Handle_OP_PetCommands(const EQApplicationPacket *app);
-	void Handle_OP_Petition(const EQApplicationPacket *app);
-	void Handle_OP_PetitionBug(const EQApplicationPacket *app);
-	void Handle_OP_PetitionCheckIn(const EQApplicationPacket *app);
-	void Handle_OP_PetitionCheckout(const EQApplicationPacket *app);
-	void Handle_OP_PetitionDelete(const EQApplicationPacket *app);
-	void Handle_OP_PetitionQue(const EQApplicationPacket *app);
-	void Handle_OP_PetitionRefresh(const EQApplicationPacket *app);
-	void Handle_OP_PetitionResolve(const EQApplicationPacket *app);
-	void Handle_OP_PetitionUnCheckout(const EQApplicationPacket *app);
-	void Handle_OP_PlayerStateAdd(const EQApplicationPacket *app);
-	void Handle_OP_PlayerStateRemove(const EQApplicationPacket *app);
-	void Handle_OP_PickPocket(const EQApplicationPacket *app);
-	void Handle_OP_PopupResponse(const EQApplicationPacket *app);
-	void Handle_OP_PotionBelt(const EQApplicationPacket *app);
-	void Handle_OP_PurchaseLeadershipAA(const EQApplicationPacket *app);
-	void Handle_OP_PVPLeaderBoardDetailsRequest(const EQApplicationPacket *app);
-	void Handle_OP_PVPLeaderBoardRequest(const EQApplicationPacket *app);
-	void Handle_OP_QueryUCSServerStatus(const EQApplicationPacket *app);
-	void Handle_OP_RaidCommand(const EQApplicationPacket *app);
-	void Handle_OP_RandomReq(const EQApplicationPacket *app);
-	void Handle_OP_ReadBook(const EQApplicationPacket *app);
-	void Handle_OP_RecipeAutoCombine(const EQApplicationPacket *app);
-	void Handle_OP_RecipeDetails(const EQApplicationPacket *app);
-	void Handle_OP_RecipesFavorite(const EQApplicationPacket *app);
-	void Handle_OP_RecipesSearch(const EQApplicationPacket *app);
-	void Handle_OP_ReloadUI(const EQApplicationPacket *app);
-	void Handle_OP_RemoveBlockedBuffs(const EQApplicationPacket *app);
-	void Handle_OP_RemoveTrap(const EQApplicationPacket *app);
-	void Handle_OP_Report(const EQApplicationPacket *app);
-	void Handle_OP_RequestDuel(const EQApplicationPacket *app);
-	void Handle_OP_RequestTitles(const EQApplicationPacket *app);
-	void Handle_OP_RespawnWindow(const EQApplicationPacket *app);
-	void Handle_OP_Rewind(const EQApplicationPacket *app);
-	void Handle_OP_RezzAnswer(const EQApplicationPacket *app);
-	void Handle_OP_Sacrifice(const EQApplicationPacket *app);
-	void Handle_OP_SafeFallSuccess(const EQApplicationPacket *app);
-	void Handle_OP_SafePoint(const EQApplicationPacket *app);
-	void Handle_OP_Save(const EQApplicationPacket *app);
-	void Handle_OP_SaveOnZoneReq(const EQApplicationPacket *app);
-	void Handle_OP_SelectTribute(const EQApplicationPacket *app);
-	void Handle_OP_SenseHeading(const EQApplicationPacket *app);
-	void Handle_OP_SenseTraps(const EQApplicationPacket *app);
-	void Handle_OP_SetGuildMOTD(const EQApplicationPacket *app);
-	void Handle_OP_SetRunMode(const EQApplicationPacket *app);
-	void Handle_OP_SetServerFilter(const EQApplicationPacket *app);
-	void Handle_OP_SetStartCity(const EQApplicationPacket *app);
-	void Handle_OP_SetTitle(const EQApplicationPacket *app);
-	void Handle_OP_Shielding(const EQApplicationPacket *app);
-	void Handle_OP_ShopEnd(const EQApplicationPacket *app);
-	void Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app);
-	void Handle_OP_ShopPlayerSell(const EQApplicationPacket *app);
-	void Handle_OP_ShopRequest(const EQApplicationPacket *app);
-	void Handle_OP_Sneak(const EQApplicationPacket *app);
-	void Handle_OP_SpawnAppearance(const EQApplicationPacket *app);
-	void Handle_OP_Split(const EQApplicationPacket *app);
-	void Handle_OP_Surname(const EQApplicationPacket *app);
-	void Handle_OP_SwapSpell(const EQApplicationPacket *app);
-	void Handle_OP_TargetCommand(const EQApplicationPacket *app);
-	void Handle_OP_TargetMouse(const EQApplicationPacket *app);
-	void Handle_OP_TaskHistoryRequest(const EQApplicationPacket *app);
-	void Handle_OP_Taunt(const EQApplicationPacket *app);
-	void Handle_OP_TestBuff(const EQApplicationPacket *app);
-	void Handle_OP_TGB(const EQApplicationPacket *app);
-	void Handle_OP_Track(const EQApplicationPacket *app);
-	void Handle_OP_TrackTarget(const EQApplicationPacket *app);
-	void Handle_OP_TrackUnknown(const EQApplicationPacket *app);
-	void Handle_OP_TradeAcceptClick(const EQApplicationPacket *app);
-	void Handle_OP_TradeBusy(const EQApplicationPacket *app);
-	void Handle_OP_Trader(const EQApplicationPacket *app);
-	void Handle_OP_TraderBuy(const EQApplicationPacket *app);
-	void Handle_OP_TradeRequest(const EQApplicationPacket *app);
-	void Handle_OP_TradeRequestAck(const EQApplicationPacket *app);
-	void Handle_OP_TraderShop(const EQApplicationPacket *app);
-	void Handle_OP_TradeSkillCombine(const EQApplicationPacket *app);
-	void Handle_OP_Translocate(const EQApplicationPacket *app);
-	void Handle_OP_TributeItem(const EQApplicationPacket *app);
-	void Handle_OP_TributeMoney(const EQApplicationPacket *app);
-	void Handle_OP_TributeNPC(const EQApplicationPacket *app);
-	void Handle_OP_TributeToggle(const EQApplicationPacket *app);
-	void Handle_OP_TributeUpdate(const EQApplicationPacket *app);
-	void Handle_OP_UpdateAura(const EQApplicationPacket *app);
-	void Handle_OP_VetClaimRequest(const EQApplicationPacket *app);
-	void Handle_OP_VoiceMacroIn(const EQApplicationPacket *app);
-	void Handle_OP_WearChange(const EQApplicationPacket *app);
-	void Handle_OP_WhoAllRequest(const EQApplicationPacket *app);
-	void Handle_OP_XTargetAutoAddHaters(const EQApplicationPacket *app);
-	void Handle_OP_XTargetOpen(const EQApplicationPacket *app);
-	void Handle_OP_XTargetRequest(const EQApplicationPacket *app);
-	void Handle_OP_YellForHelp(const EQApplicationPacket *app);
-	void Handle_OP_ZoneChange(const EQApplicationPacket *app);
-	void Handle_OP_ResetAA(const EQApplicationPacket *app);
+void Handle_OP_CombatAbility(const EQApplicationPacket* app);
+void Handle_OP_ConfirmDelete(const EQApplicationPacket* app);
+void Handle_OP_Consent(const EQApplicationPacket* app);
+void Handle_OP_ConsentDeny(const EQApplicationPacket* app);
+void Handle_OP_Consider(const EQApplicationPacket* app);
+void Handle_OP_ConsiderCorpse(const EQApplicationPacket* app);
+void Handle_OP_Consume(const EQApplicationPacket* app);
+void Handle_OP_ControlBoat(const EQApplicationPacket* app);
+void Handle_OP_CorpseDrag(const EQApplicationPacket* app);
+void Handle_OP_CorpseDrop(const EQApplicationPacket* app);
+void Handle_OP_CrashDump(const EQApplicationPacket* app);
+void Handle_OP_CreateObject(const EQApplicationPacket* app);
+void Handle_OP_CrystalCreate(const EQApplicationPacket* app);
+void Handle_OP_CrystalReclaim(const EQApplicationPacket* app);
+void Handle_OP_Damage(const EQApplicationPacket* app);
+void Handle_OP_Death(const EQApplicationPacket* app);
+void Handle_OP_DelegateAbility(const EQApplicationPacket* app);
+void Handle_OP_DeleteItem(const EQApplicationPacket* app);
+void Handle_OP_DeleteSpawn(const EQApplicationPacket* app);
+void Handle_OP_DeleteSpell(const EQApplicationPacket* app);
+void Handle_OP_Disarm(const EQApplicationPacket* app);
+void Handle_OP_DisarmTraps(const EQApplicationPacket* app);
+void Handle_OP_DoGroupLeadershipAbility(const EQApplicationPacket* app);
+void Handle_OP_DuelResponse(const EQApplicationPacket* app);
+void Handle_OP_DuelResponse2(const EQApplicationPacket* app);
+void Handle_OP_DumpName(const EQApplicationPacket* app);
+void Handle_OP_Dye(const EQApplicationPacket* app);
+void Handle_OP_DzAddPlayer(const EQApplicationPacket* app);
+void Handle_OP_DzChooseZoneReply(const EQApplicationPacket* app);
+void Handle_OP_DzExpeditionInviteResponse(const EQApplicationPacket* app);
+void Handle_OP_DzListTimers(const EQApplicationPacket* app);
+void Handle_OP_DzMakeLeader(const EQApplicationPacket* app);
+void Handle_OP_DzPlayerList(const EQApplicationPacket* app);
+void Handle_OP_DzRemovePlayer(const EQApplicationPacket* app);
+void Handle_OP_DzSwapPlayer(const EQApplicationPacket* app);
+void Handle_OP_DzQuit(const EQApplicationPacket* app);
+void Handle_OP_Emote(const EQApplicationPacket* app);
+void Handle_OP_EndLootRequest(const EQApplicationPacket* app);
+void Handle_OP_EnvDamage(const EQApplicationPacket* app);
+void Handle_OP_FaceChange(const EQApplicationPacket* app);
+void Handle_OP_FeignDeath(const EQApplicationPacket* app);
+void Handle_OP_FindPersonRequest(const EQApplicationPacket* app);
+void Handle_OP_Fishing(const EQApplicationPacket* app);
+void Handle_OP_Forage(const EQApplicationPacket* app);
+void Handle_OP_FriendsWho(const EQApplicationPacket* app);
+void Handle_OP_GetGuildMOTD(const EQApplicationPacket* app);
+void Handle_OP_GetGuildsList(const EQApplicationPacket* app);
+void Handle_OP_GMBecomeNPC(const EQApplicationPacket* app);
+void Handle_OP_GMDelCorpse(const EQApplicationPacket* app);
+void Handle_OP_GMEmoteZone(const EQApplicationPacket* app);
+void Handle_OP_GMEndTraining(const EQApplicationPacket* app);
+void Handle_OP_GMFind(const EQApplicationPacket* app);
+void Handle_OP_GMGoto(const EQApplicationPacket* app);
+void Handle_OP_GMHideMe(const EQApplicationPacket* app);
+void Handle_OP_GMKick(const EQApplicationPacket* app);
+void Handle_OP_GMKill(const EQApplicationPacket* app);
+void Handle_OP_GMLastName(const EQApplicationPacket* app);
+void Handle_OP_GMNameChange(const EQApplicationPacket* app);
+void Handle_OP_GMSearchCorpse(const EQApplicationPacket* app);
+void Handle_OP_GMServers(const EQApplicationPacket* app);
+void Handle_OP_GMSummon(const EQApplicationPacket* app);
+void Handle_OP_GMToggle(const EQApplicationPacket* app);
+void Handle_OP_GMTraining(const EQApplicationPacket* app);
+void Handle_OP_GMTrainSkill(const EQApplicationPacket* app);
+void Handle_OP_GMZoneRequest(const EQApplicationPacket* app);
+void Handle_OP_GMZoneRequest2(const EQApplicationPacket* app);
+void Handle_OP_GroupAcknowledge(const EQApplicationPacket* app);
+void Handle_OP_GroupCancelInvite(const EQApplicationPacket* app);
+void Handle_OP_GroupDelete(const EQApplicationPacket* app);
+void Handle_OP_GroupDisband(const EQApplicationPacket* app);
+void Handle_OP_GroupFollow(const EQApplicationPacket* app);
+void Handle_OP_GroupFollow2(const EQApplicationPacket* app);
+void Handle_OP_GroupInvite(const EQApplicationPacket* app);
+void Handle_OP_GroupInvite2(const EQApplicationPacket* app);
+void Handle_OP_GroupMakeLeader(const EQApplicationPacket* app);
+void Handle_OP_GroupMentor(const EQApplicationPacket* app);
+void Handle_OP_GroupRoles(const EQApplicationPacket* app);
+void Handle_OP_GroupUpdate(const EQApplicationPacket* app);
+void Handle_OP_GuildBank(const EQApplicationPacket* app);
+void Handle_OP_GuildCreate(const EQApplicationPacket* app);
+void Handle_OP_GuildDelete(const EQApplicationPacket* app);
+void Handle_OP_GuildDemote(const EQApplicationPacket* app);
+void Handle_OP_GuildInvite(const EQApplicationPacket* app);
+void Handle_OP_GuildInviteAccept(const EQApplicationPacket* app);
+void Handle_OP_GuildLeader(const EQApplicationPacket* app);
+void Handle_OP_GuildManageBanker(const EQApplicationPacket* app);
+void Handle_OP_GuildPeace(const EQApplicationPacket* app);
+void Handle_OP_GuildPromote(const EQApplicationPacket* app);
+void Handle_OP_GuildPublicNote(const EQApplicationPacket* app);
+void Handle_OP_GuildRemove(const EQApplicationPacket* app);
+void Handle_OP_GuildStatus(const EQApplicationPacket* app);
+void Handle_OP_GuildUpdateURLAndChannel(const EQApplicationPacket* app);
+void Handle_OP_GuildWar(const EQApplicationPacket* app);
+void Handle_OP_Heartbeat(const EQApplicationPacket* app);
+void Handle_OP_Hide(const EQApplicationPacket* app);
+void Handle_OP_HideCorpse(const EQApplicationPacket* app);
+void Handle_OP_Ignore(const EQApplicationPacket* app);
+void Handle_OP_Illusion(const EQApplicationPacket* app);
+void Handle_OP_InspectAnswer(const EQApplicationPacket* app);
+void Handle_OP_InspectMessageUpdate(const EQApplicationPacket* app);
+void Handle_OP_InspectRequest(const EQApplicationPacket* app);
+void Handle_OP_InstillDoubt(const EQApplicationPacket* app);
+void Handle_OP_ItemLinkClick(const EQApplicationPacket* app);
+void Handle_OP_ItemLinkResponse(const EQApplicationPacket* app);
+void Handle_OP_ItemName(const EQApplicationPacket* app);
+void Handle_OP_ItemPreview(const EQApplicationPacket* app);
+void Handle_OP_ItemVerifyRequest(const EQApplicationPacket* app);
+void Handle_OP_Jump(const EQApplicationPacket* app);
+void Handle_OP_KeyRing(const EQApplicationPacket* app);
+void Handle_OP_KickPlayers(const EQApplicationPacket* app);
+void Handle_OP_LDoNButton(const EQApplicationPacket* app);
+void Handle_OP_LDoNDisarmTraps(const EQApplicationPacket* app);
+void Handle_OP_LDoNInspect(const EQApplicationPacket* app);
+void Handle_OP_LDoNOpen(const EQApplicationPacket* app);
+void Handle_OP_LDoNPickLock(const EQApplicationPacket* app);
+void Handle_OP_LDoNSenseTraps(const EQApplicationPacket* app);
+void Handle_OP_LeadershipExpToggle(const EQApplicationPacket* app);
+void Handle_OP_LeaveAdventure(const EQApplicationPacket* app);
+void Handle_OP_LeaveBoat(const EQApplicationPacket* app);
+void Handle_OP_LFGCommand(const EQApplicationPacket* app);
+void Handle_OP_LFGGetMatchesRequest(const EQApplicationPacket* app);
+void Handle_OP_LFGuild(const EQApplicationPacket* app);
+void Handle_OP_LFPCommand(const EQApplicationPacket* app);
+void Handle_OP_LFPGetMatchesRequest(const EQApplicationPacket* app);
+void Handle_OP_LoadSpellSet(const EQApplicationPacket* app);
+void Handle_OP_Logout(const EQApplicationPacket* app);
+void Handle_OP_LootItem(const EQApplicationPacket* app);
+void Handle_OP_LootRequest(const EQApplicationPacket* app);
+void Handle_OP_ManaChange(const EQApplicationPacket* app);
+void Handle_OP_Medding(const EQApplicationPacket* app);
+void Handle_OP_MemorizeSpell(const EQApplicationPacket* app);
+void Handle_OP_Mend(const EQApplicationPacket* app);
+void Handle_OP_MercenaryCommand(const EQApplicationPacket* app);
+void Handle_OP_MercenaryDataRequest(const EQApplicationPacket* app);
+void Handle_OP_MercenaryDataUpdateRequest(const EQApplicationPacket* app);
+void Handle_OP_MercenaryDismiss(const EQApplicationPacket* app);
+void Handle_OP_MercenaryHire(const EQApplicationPacket* app);
+void Handle_OP_MercenarySuspendRequest(const EQApplicationPacket* app);
+void Handle_OP_MercenaryTimerRequest(const EQApplicationPacket* app);
+void Handle_OP_MoveCoin(const EQApplicationPacket* app);
+void Handle_OP_MoveItem(const EQApplicationPacket* app);
+void Handle_OP_MoveMultipleItems(const EQApplicationPacket* app);
+void Handle_OP_OpenContainer(const EQApplicationPacket* app);
+void Handle_OP_OpenGuildTributeMaster(const EQApplicationPacket* app);
+void Handle_OP_OpenInventory(const EQApplicationPacket* app);
+void Handle_OP_OpenTributeMaster(const EQApplicationPacket* app);
+void Handle_OP_PDeletePetition(const EQApplicationPacket* app);
+void Handle_OP_PetCommands(const EQApplicationPacket* app);
+void Handle_OP_Petition(const EQApplicationPacket* app);
+void Handle_OP_PetitionBug(const EQApplicationPacket* app);
+void Handle_OP_PetitionCheckIn(const EQApplicationPacket* app);
+void Handle_OP_PetitionCheckout(const EQApplicationPacket* app);
+void Handle_OP_PetitionDelete(const EQApplicationPacket* app);
+void Handle_OP_PetitionQue(const EQApplicationPacket* app);
+void Handle_OP_PetitionRefresh(const EQApplicationPacket* app);
+void Handle_OP_PetitionResolve(const EQApplicationPacket* app);
+void Handle_OP_PetitionUnCheckout(const EQApplicationPacket* app);
+void Handle_OP_PlayerStateAdd(const EQApplicationPacket* app);
+void Handle_OP_PlayerStateRemove(const EQApplicationPacket* app);
+void Handle_OP_PickPocket(const EQApplicationPacket* app);
+void Handle_OP_PopupResponse(const EQApplicationPacket* app);
+void Handle_OP_PotionBelt(const EQApplicationPacket* app);
+void Handle_OP_PurchaseLeadershipAA(const EQApplicationPacket* app);
+void Handle_OP_PVPLeaderBoardDetailsRequest(const EQApplicationPacket* app);
+void Handle_OP_PVPLeaderBoardRequest(const EQApplicationPacket* app);
+void Handle_OP_QueryUCSServerStatus(const EQApplicationPacket* app);
+void Handle_OP_RaidCommand(const EQApplicationPacket* app);
+void Handle_OP_RandomReq(const EQApplicationPacket* app);
+void Handle_OP_ReadBook(const EQApplicationPacket* app);
+void Handle_OP_RecipeAutoCombine(const EQApplicationPacket* app);
+void Handle_OP_RecipeDetails(const EQApplicationPacket* app);
+void Handle_OP_RecipesFavorite(const EQApplicationPacket* app);
+void Handle_OP_RecipesSearch(const EQApplicationPacket* app);
+void Handle_OP_ReloadUI(const EQApplicationPacket* app);
+void Handle_OP_RemoveBlockedBuffs(const EQApplicationPacket* app);
+void Handle_OP_RemoveTrap(const EQApplicationPacket* app);
+void Handle_OP_Report(const EQApplicationPacket* app);
+void Handle_OP_RequestDuel(const EQApplicationPacket* app);
+void Handle_OP_RequestTitles(const EQApplicationPacket* app);
+void Handle_OP_RespawnWindow(const EQApplicationPacket* app);
+void Handle_OP_Rewind(const EQApplicationPacket* app);
+void Handle_OP_RezzAnswer(const EQApplicationPacket* app);
+void Handle_OP_Sacrifice(const EQApplicationPacket* app);
+void Handle_OP_SafeFallSuccess(const EQApplicationPacket* app);
+void Handle_OP_SafePoint(const EQApplicationPacket* app);
+void Handle_OP_Save(const EQApplicationPacket* app);
+void Handle_OP_SaveOnZoneReq(const EQApplicationPacket* app);
+void Handle_OP_SelectTribute(const EQApplicationPacket* app);
+void Handle_OP_SenseHeading(const EQApplicationPacket* app);
+void Handle_OP_SenseTraps(const EQApplicationPacket* app);
+void Handle_OP_SetGuildMOTD(const EQApplicationPacket* app);
+void Handle_OP_SetRunMode(const EQApplicationPacket* app);
+void Handle_OP_SetServerFilter(const EQApplicationPacket* app);
+void Handle_OP_SetStartCity(const EQApplicationPacket* app);
+void Handle_OP_SetTitle(const EQApplicationPacket* app);
+void Handle_OP_Shielding(const EQApplicationPacket* app);
+void Handle_OP_ShopEnd(const EQApplicationPacket* app);
+void Handle_OP_ShopPlayerBuy(const EQApplicationPacket* app);
+void Handle_OP_ShopPlayerSell(const EQApplicationPacket* app);
+void Handle_OP_ShopRequest(const EQApplicationPacket* app);
+void Handle_OP_Sneak(const EQApplicationPacket* app);
+void Handle_OP_SpawnAppearance(const EQApplicationPacket* app);
+void Handle_OP_Split(const EQApplicationPacket* app);
+void Handle_OP_Surname(const EQApplicationPacket* app);
+void Handle_OP_SwapSpell(const EQApplicationPacket* app);
+void Handle_OP_TargetCommand(const EQApplicationPacket* app);
+void Handle_OP_TargetMouse(const EQApplicationPacket* app);
+void Handle_OP_TaskHistoryRequest(const EQApplicationPacket* app);
+void Handle_OP_Taunt(const EQApplicationPacket* app);
+void Handle_OP_TestBuff(const EQApplicationPacket* app);
+void Handle_OP_TGB(const EQApplicationPacket* app);
+void Handle_OP_Track(const EQApplicationPacket* app);
+void Handle_OP_TrackTarget(const EQApplicationPacket* app);
+void Handle_OP_TrackUnknown(const EQApplicationPacket* app);
+void Handle_OP_TradeAcceptClick(const EQApplicationPacket* app);
+void Handle_OP_TradeBusy(const EQApplicationPacket* app);
+void Handle_OP_Trader(const EQApplicationPacket* app);
+void Handle_OP_TraderBuy(const EQApplicationPacket* app);
+void Handle_OP_TradeRequest(const EQApplicationPacket* app);
+void Handle_OP_TradeRequestAck(const EQApplicationPacket* app);
+void Handle_OP_TraderShop(const EQApplicationPacket* app);
+void Handle_OP_TradeSkillCombine(const EQApplicationPacket* app);
+void Handle_OP_Translocate(const EQApplicationPacket* app);
+void Handle_OP_TributeItem(const EQApplicationPacket* app);
+void Handle_OP_TributeMoney(const EQApplicationPacket* app);
+void Handle_OP_TributeNPC(const EQApplicationPacket* app);
+void Handle_OP_TributeToggle(const EQApplicationPacket* app);
+void Handle_OP_TributeUpdate(const EQApplicationPacket* app);
+void Handle_OP_UpdateAura(const EQApplicationPacket* app);
+void Handle_OP_VetClaimRequest(const EQApplicationPacket* app);
+void Handle_OP_VoiceMacroIn(const EQApplicationPacket* app);
+void Handle_OP_WearChange(const EQApplicationPacket* app);
+void Handle_OP_WhoAllRequest(const EQApplicationPacket* app);
+void Handle_OP_XTargetAutoAddHaters(const EQApplicationPacket* app);
+void Handle_OP_XTargetOpen(const EQApplicationPacket* app);
+void Handle_OP_XTargetRequest(const EQApplicationPacket* app);
+void Handle_OP_YellForHelp(const EQApplicationPacket* app);
+void Handle_OP_ZoneChange(const EQApplicationPacket* app);
+void Handle_OP_ResetAA(const EQApplicationPacket* app);
diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp
index 75dec71c3..f2decdbef 100644
--- a/zone/lua_general.cpp
+++ b/zone/lua_general.cpp
@@ -55,9 +55,9 @@ extern std::map<std::string, Encounter*> lua_encounters;
 extern void MapOpcodes();
 extern void ClearMappedOpcode(EmuOpcode op);
 
-void unregister_event(std::string package_name, std::string name, int evt);
+void lua_unregister_event(std::string package_name, std::string name, int evt);
 
-void load_encounter(std::string name) {
+void lua_load_encounter(std::string name) {
 	if (lua_encounters_loaded.count(name) > 0)
 		return;
 	auto enc = new Encounter(name.c_str());
@@ -67,7 +67,7 @@ void load_encounter(std::string name) {
 	parse->EventEncounter(EVENT_ENCOUNTER_LOAD, name, "", 0);
 }
 
-void load_encounter_with_data(std::string name, std::string info_str) {
+void lua_load_encounter_with_data(std::string name, std::string info_str) {
 	if (lua_encounters_loaded.count(name) > 0)
 		return;
 	auto enc = new Encounter(name.c_str());
@@ -79,7 +79,7 @@ void load_encounter_with_data(std::string name, std::string info_str) {
 	parse->EventEncounter(EVENT_ENCOUNTER_LOAD, name, "", 0, &info_ptrs);
 }
 
-void unload_encounter(std::string name) {
+void lua_unload_encounter(std::string name) {
 	if (lua_encounters_loaded.count(name) == 0)
 		return;
 
@@ -110,7 +110,7 @@ void unload_encounter(std::string name) {
 	parse->EventEncounter(EVENT_ENCOUNTER_UNLOAD, name, "", 0);
 }
 
-void unload_encounter_with_data(std::string name, std::string info_str) {
+void lua_unload_encounter_with_data(std::string name, std::string info_str) {
 	if (lua_encounters_loaded.count(name) == 0)
 		return;
 
@@ -143,11 +143,11 @@ void unload_encounter_with_data(std::string name, std::string info_str) {
 	parse->EventEncounter(EVENT_ENCOUNTER_UNLOAD, name, "", 0, &info_ptrs);
 }
 
-void register_event(std::string package_name, std::string name, int evt, luabind::adl::object func) {
+void lua_register_event(std::string package_name, std::string name, int evt, luabind::adl::object func) {
 	if (lua_encounters_loaded.count(name) == 0)
 		return;
 
-	unregister_event(package_name, name, evt);
+	lua_unregister_event(package_name, name, evt);
 
 	lua_registered_event e;
 	e.encounter_name = name;
@@ -166,7 +166,7 @@ void register_event(std::string package_name, std::string name, int evt, luabind
 	}
 }
 
-void unregister_event(std::string package_name, std::string name, int evt) {
+void lua_unregister_event(std::string package_name, std::string name, int evt) {
 	auto liter = lua_encounter_events_registered.find(package_name);
 	if (liter != lua_encounter_events_registered.end()) {
 		std::list<lua_registered_event> elist = liter->second;
@@ -182,102 +182,102 @@ void unregister_event(std::string package_name, std::string name, int evt) {
 	}
 }
 
-void register_npc_event(std::string name, int evt, int npc_id, luabind::adl::object func) {
+void lua_register_npc_event(std::string name, int evt, int npc_id, luabind::adl::object func) {
 	if (luabind::type(func) == LUA_TFUNCTION) {
 		std::stringstream package_name;
 		package_name << "npc_" << npc_id;
 
-		register_event(package_name.str(), name, evt, func);
+		lua_register_event(package_name.str(), name, evt, func);
 	}
 }
 
-void register_npc_event(int evt, int npc_id, luabind::adl::object func) {
+void lua_register_npc_event(int evt, int npc_id, luabind::adl::object func) {
 	std::string name = quest_manager.GetEncounter();
-	register_npc_event(name, evt, npc_id, func);
+	lua_register_npc_event(name, evt, npc_id, func);
 }
 
-void unregister_npc_event(std::string name, int evt, int npc_id) {
+void lua_unregister_npc_event(std::string name, int evt, int npc_id) {
 	std::stringstream package_name;
 	package_name << "npc_" << npc_id;
 
-	unregister_event(package_name.str(), name, evt);
+	lua_unregister_event(package_name.str(), name, evt);
 }
 
-void unregister_npc_event(int evt, int npc_id) {
+void lua_unregister_npc_event(int evt, int npc_id) {
 	std::string name = quest_manager.GetEncounter();
-	unregister_npc_event(name, evt, npc_id);
+	lua_unregister_npc_event(name, evt, npc_id);
 }
 
-void register_player_event(std::string name, int evt, luabind::adl::object func) {
+void lua_register_player_event(std::string name, int evt, luabind::adl::object func) {
 	if (luabind::type(func) == LUA_TFUNCTION) {
-		register_event("player", name, evt, func);
+		lua_register_event("player", name, evt, func);
 	}
 }
 
-void register_player_event(int evt, luabind::adl::object func) {
+void lua_register_player_event(int evt, luabind::adl::object func) {
 	std::string name = quest_manager.GetEncounter();
-	register_player_event(name, evt, func);
+	lua_register_player_event(name, evt, func);
 }
 
-void unregister_player_event(std::string name, int evt) {
-	unregister_event("player", name, evt);
+void lua_unregister_player_event(std::string name, int evt) {
+	lua_unregister_event("player", name, evt);
 }
 
-void unregister_player_event(int evt) {
+void lua_unregister_player_event(int evt) {
 	std::string name = quest_manager.GetEncounter();
-	unregister_player_event(name, evt);
+	lua_unregister_player_event(name, evt);
 }
 
-void register_item_event(std::string name, int evt, int item_id, luabind::adl::object func) {
+void lua_register_item_event(std::string name, int evt, int item_id, luabind::adl::object func) {
 	std::string package_name = "item_";
 	package_name += std::to_string(item_id);
 
 	if (luabind::type(func) == LUA_TFUNCTION) {
-		register_event(package_name, name, evt, func);
+		lua_register_event(package_name, name, evt, func);
 	}
 }
 
-void register_item_event(int evt, int item_id, luabind::adl::object func) {
+void lua_register_item_event(int evt, int item_id, luabind::adl::object func) {
 	std::string name = quest_manager.GetEncounter();
-	register_item_event(name, evt, item_id, func);
+	lua_register_item_event(name, evt, item_id, func);
 }
 
-void unregister_item_event(std::string name, int evt, int item_id) {
+void lua_unregister_item_event(std::string name, int evt, int item_id) {
 	std::string package_name = "item_";
 	package_name += std::to_string(item_id);
 
-	unregister_event(package_name, name, evt);
+	lua_unregister_event(package_name, name, evt);
 }
 
-void unregister_item_event(int evt, int item_id) {
+void lua_unregister_item_event(int evt, int item_id) {
 	std::string name = quest_manager.GetEncounter();
-	unregister_item_event(name, evt, item_id);
+	lua_unregister_item_event(name, evt, item_id);
 }
 
-void register_spell_event(std::string name, int evt, int spell_id, luabind::adl::object func) {
+void lua_register_spell_event(std::string name, int evt, int spell_id, luabind::adl::object func) {
 	if (luabind::type(func) == LUA_TFUNCTION) {
 		std::stringstream package_name;
 		package_name << "spell_" << spell_id;
 
-		register_event(package_name.str(), name, evt, func);
+		lua_register_event(package_name.str(), name, evt, func);
 	}
 }
 
-void register_spell_event(int evt, int spell_id, luabind::adl::object func) {
+void lua_register_spell_event(int evt, int spell_id, luabind::adl::object func) {
 	std::string name = quest_manager.GetEncounter();
-	register_spell_event(name, evt, spell_id, func);
+	lua_register_spell_event(name, evt, spell_id, func);
 }
 
-void unregister_spell_event(std::string name, int evt, int spell_id) {
+void lua_unregister_spell_event(std::string name, int evt, int spell_id) {
 	std::stringstream package_name;
 	package_name << "spell_" << spell_id;
 
-	unregister_event(package_name.str(), name, evt);
+	lua_unregister_event(package_name.str(), name, evt);
 }
 
-void unregister_spell_event(int evt, int spell_id) {
+void lua_unregister_spell_event(int evt, int spell_id) {
 	std::string name = quest_manager.GetEncounter();
-	unregister_spell_event(name, evt, spell_id);
+	lua_unregister_spell_event(name, evt, spell_id);
 }
 
 Lua_Mob lua_spawn2(int npc_type, int grid, int unused, double x, double y, double z, double heading) {
@@ -2504,26 +2504,26 @@ bool get_ruleb(int rule) {
 luabind::scope lua_register_general() {
 	return luabind::namespace_("eq")
 		[
-			luabind::def("load_encounter", &load_encounter),
-			luabind::def("unload_encounter", &unload_encounter),
-			luabind::def("load_encounter_with_data", &load_encounter_with_data),
-			luabind::def("unload_encounter_with_data", &unload_encounter_with_data),
-			luabind::def("register_npc_event", (void(*)(std::string, int, int, luabind::adl::object)) & register_npc_event),
-			luabind::def("register_npc_event", (void(*)(int, int, luabind::adl::object)) & register_npc_event),
-			luabind::def("unregister_npc_event", (void(*)(std::string, int, int)) & unregister_npc_event),
-			luabind::def("unregister_npc_event", (void(*)(int, int)) & unregister_npc_event),
-			luabind::def("register_player_event", (void(*)(std::string, int, luabind::adl::object)) & register_player_event),
-			luabind::def("register_player_event", (void(*)(int, luabind::adl::object)) & register_player_event),
-			luabind::def("unregister_player_event", (void(*)(std::string, int)) & unregister_player_event),
-			luabind::def("unregister_player_event", (void(*)(int)) & unregister_player_event),
-			luabind::def("register_item_event", (void(*)(std::string, int, int, luabind::adl::object)) & register_item_event),
-			luabind::def("register_item_event", (void(*)(int, int, luabind::adl::object)) & register_item_event),
-			luabind::def("unregister_item_event", (void(*)(std::string, int, int)) & unregister_item_event),
-			luabind::def("unregister_item_event", (void(*)(int, int)) & unregister_item_event),
-			luabind::def("register_spell_event", (void(*)(std::string, int, int, luabind::adl::object func)) & register_spell_event),
-			luabind::def("register_spell_event", (void(*)(int, int, luabind::adl::object func)) & register_spell_event),
-			luabind::def("unregister_spell_event", (void(*)(std::string, int, int)) & unregister_spell_event),
-			luabind::def("unregister_spell_event", (void(*)(int, int)) & unregister_spell_event),
+			luabind::def("load_encounter", &lua_load_encounter),
+			luabind::def("unload_encounter", &lua_unload_encounter),
+			luabind::def("load_encounter_with_data", &lua_load_encounter_with_data),
+			luabind::def("unload_encounter_with_data", &lua_unload_encounter_with_data),
+			luabind::def("register_npc_event", (void(*)(std::string, int, int, luabind::adl::object)) & lua_register_npc_event),
+			luabind::def("register_npc_event", (void(*)(int, int, luabind::adl::object)) & lua_register_npc_event),
+			luabind::def("unregister_npc_event", (void(*)(std::string, int, int)) & lua_unregister_npc_event),
+			luabind::def("unregister_npc_event", (void(*)(int, int)) & lua_unregister_npc_event),
+			luabind::def("register_player_event", (void(*)(std::string, int, luabind::adl::object)) & lua_register_player_event),
+			luabind::def("register_player_event", (void(*)(int, luabind::adl::object)) & lua_register_player_event),
+			luabind::def("unregister_player_event", (void(*)(std::string, int)) & lua_unregister_player_event),
+			luabind::def("unregister_player_event", (void(*)(int)) & lua_unregister_player_event),
+			luabind::def("register_item_event", (void(*)(std::string, int, int, luabind::adl::object)) & lua_register_item_event),
+			luabind::def("register_item_event", (void(*)(int, int, luabind::adl::object)) & lua_register_item_event),
+			luabind::def("unregister_item_event", (void(*)(std::string, int, int)) & lua_unregister_item_event),
+			luabind::def("unregister_item_event", (void(*)(int, int)) & lua_unregister_item_event),
+			luabind::def("register_spell_event", (void(*)(std::string, int, int, luabind::adl::object func)) & lua_register_spell_event),
+			luabind::def("register_spell_event", (void(*)(int, int, luabind::adl::object func)) & lua_register_spell_event),
+			luabind::def("unregister_spell_event", (void(*)(std::string, int, int)) & lua_unregister_spell_event),
+			luabind::def("unregister_spell_event", (void(*)(int, int)) & lua_unregister_spell_event),
 			luabind::def("spawn2", (Lua_Mob(*)(int, int, int, double, double, double, double)) & lua_spawn2),
 			luabind::def("unique_spawn", (Lua_Mob(*)(int, int, int, double, double, double)) & lua_unique_spawn),
 			luabind::def("unique_spawn", (Lua_Mob(*)(int, int, int, double, double, double, double)) & lua_unique_spawn),