Merge branch 'master' of https://github.com/EQEmu/Server

utils/scripts/opcode_scripts/patch_NEW.conf

@@ -10,7 +10,7 @@
 # OP_CommonMessage -> OP_ChannelMessage
 
 OP_Unknown=0x0000
-OP_ExploreUnknown=0x0000 used for unknown explorer
+OP_ExploreUnknown=0x0000	# used for unknown explorer
 
 # world packets
 # Required to reach Char Select:
@@ -100,7 +100,7 @@ OP_SendAAStats=0x43c8
 OP_AAExpUpdate=0x7d14
 OP_ExpUpdate=0x20ed
 OP_HPUpdate=0x2828
-OP_ManaChange=0x43af
+OP_ManaChange=0x5467
 OP_TGB=0x0876
 OP_SpecialMesg=0x0083
 OP_GuildMemberList=0x12a6
@@ -108,18 +108,18 @@ OP_GuildMOTD=0x3e13
 OP_CharInventory=0x5ca6
 OP_WearChange=0x7994
 OP_ClientUpdate=0x7dfc
-OP_ClientReady=0x345d				# 0x422d
+OP_ClientReady=0x345d
 OP_SetServerFilter=0x444d
 
 # Guild Opcodes - Disabled until crashes are resolved in RoF
-OP_GetGuildMOTD=0x36e0				# Was 0x35dc
-OP_GetGuildMOTDReply=0x4f1f			# Was 0x4586
-OP_GuildMemberUpdate=0x69b9			# Was 0x5643
+OP_GetGuildMOTD=0x36e0
+OP_GetGuildMOTDReply=0x4f1f
+OP_GuildMemberUpdate=0x69b9
 OP_GuildInvite=0x7099
 OP_GuildRemove=0x1444
 OP_GuildPeace=0x67e3
 OP_SetGuildMOTD=0x0b0b
-OP_GuildList=0x507a
+OP_GuildList=0x6279
 OP_GuildWar=0x1ffb
 OP_GuildLeader=0x7e09
 OP_GuildDelete=0x3708
@@ -127,12 +127,12 @@ OP_GuildInviteAccept=0x7053
 OP_GuildDemote=0x2d4e
 OP_GuildPromote=0x0000
 OP_GuildPublicNote=0x5053
-OP_GuildManageBanker=0x748f			# Was 0x0737
-OP_GuildBank=0x5134					# Was 0x10c3
+OP_GuildManageBanker=0x748f
+OP_GuildBank=0x5134
 OP_SetGuildRank=0x0b9c
 OP_GuildUpdateURLAndChannel=0x2958
 OP_GuildStatus=0x7326
-OP_GuildCreate=0x1dc8				# or maybe 0x086e
+OP_GuildCreate=0x76d9
 OP_GuildMemberLevelUpdate=0x0000	# Unused?
 OP_ZoneGuildList=0x0000				# Unused?
 OP_GetGuildsList=0x0000				# Unused?
@@ -152,21 +152,21 @@ OP_GMHideMe=0x79c5
 OP_GMDelCorpse=0x607e
 OP_GMApproval=0x6db5
 OP_GMToggle=0x2097
-OP_GMSummon=0x486f			# Was 0x684f
-OP_GMEmoteZone=0x1cfd		# Was 0x0655
-OP_GMEmoteWorld=0x458e		# Was 0x1935
+OP_GMSummon=0x486f
+OP_GMEmoteZone=0x1cfd
+OP_GMEmoteWorld=0x458e
 OP_GMFind=0x4a8f
 OP_GMKick=0x26a7
 OP_GMKill=0x51d3
-OP_GMNameChange=0x035f		# Was 0x4434
-OP_GMLastName=0x46ce		# Was 0x3077
+OP_GMNameChange=0x035f
+OP_GMLastName=0x46ce
 
 # Misc Opcodes
 OP_InspectRequest=0x57bc
 OP_InspectAnswer=0x71ac
 OP_InspectMessageUpdate=0x4d25
 OP_BeginCast=0x318f
-OP_ColoredText=0x0000
+OP_ColoredText=0x43af
 OP_ConsentResponse=0x384a
 OP_MemorizeSpell=0x217c
 OP_SwapSpell=0x0efa
@@ -179,8 +179,8 @@ OP_Illusion=0x312a
 OP_MoneyOnCorpse=0x5f44
 OP_RandomReply=0x106b
 OP_DenyResponse=0x2382
-OP_SkillUpdate=0x004c
-OP_GMTrainSkillConfirm=0x66dd	# 0x3960
+OP_SkillUpdate=0x04c
+OP_GMTrainSkillConfirm=0x4b64
 OP_RandomReq=0x7b10
 OP_Death=0x6517
 OP_GMTraining=0x1966
@@ -194,7 +194,7 @@ OP_AutoFire=0x241e
 OP_PetCommands=0x0159
 OP_DeleteSpell=0x52e5
 OP_Surname=0x0423
-OP_ClearSurname=0x7d23
+OP_ClearSurname=0x3fb0
 OP_FaceChange=0x5578
 OP_SenseHeading=0x260a
 OP_Action=0x744c
@@ -212,19 +212,19 @@ OP_AssistGroup=0x27f8
 OP_MoveCoin=0x0bcf
 OP_ZonePlayerToBind=0x0ecb
 OP_KeyRing=0x6857
-OP_WhoAllRequest=0x65ab
-OP_WhoAllResponse=0x7c88
+OP_WhoAllRequest=0x674b
+OP_WhoAllResponse=0x578c
 OP_FriendsWho=0x3956
 OP_ConfirmDelete=0x43a3
 OP_Logout=0x4ac6
 OP_Rewind=0x1745
 OP_TargetCommand=0x58e2
 OP_Hide=0x67fe
-OP_Jump=0x2060
+OP_Jump=0x31f4
 OP_Camp=0x28ec
 OP_Emote=0x373b
 OP_SetRunMode=0x009f
-OP_BankerChange=0x383c
+OP_BankerChange=0x791e
 OP_TargetMouse=0x075d
 OP_MobHealth=0x37b1
 OP_InitialMobHealth=0x0000	# Unused?
@@ -243,7 +243,7 @@ OP_MoveItem=0x32ee
 OP_DeleteItem=0x18ad
 OP_DeleteCharge=0x01b8
 OP_ItemPacket=0x368e
-OP_ItemLinkResponse=0x633c
+OP_ItemLinkResponse=0x70c0
 OP_ItemLinkClick=0x4cef
 OP_ItemPreview=0x6b5c
 OP_NewSpawn=0x6097
@@ -265,19 +265,19 @@ OP_RezzAnswer=0x701c
 OP_Shielding=0x48c1
 OP_RequestDuel=0x3af1
 OP_MobRename=0x2c57
-OP_AugmentItem=0x661b	 	# Was 0x37cb
+OP_AugmentItem=0x661b
 OP_WeaponEquip1=0x34a7
-OP_WeaponEquip2=0x559a		# Was 0x6022
-OP_WeaponUnequip2=0x2d25	# Was 0x0110
+OP_WeaponEquip2=0x559a
+OP_WeaponUnequip2=0x2d25
 OP_ApplyPoison=0x31e6
 OP_Save=0x4a39
-OP_TestBuff=0x7cb8			# Was 0x3772
+OP_TestBuff=0x7cb8
 OP_CustomTitles=0x100e
 OP_Split=0x3a54
 OP_YellForHelp=0x4e56
 OP_LoadSpellSet=0x261d
 OP_Bandolier=0x7677
-OP_PotionBelt=0x1a3e		# Was 0x4d3b
+OP_PotionBelt=0x1a3e
 OP_DuelResponse=0x6a46
 OP_DuelResponse2=0x68d3
 OP_SaveOnZoneReq=0x600d
@@ -290,14 +290,14 @@ OP_LeadershipExpUpdate=0x2797
 OP_PurchaseLeadershipAA=0x0026
 OP_UpdateLeadershipAA=0x026
 OP_MarkNPC=0x5a58
-OP_MarkRaidNPC=0x74bd	#unimplemented
+OP_MarkRaidNPC=0x74bd		#unimplemented
 OP_ClearNPCMarks=0x2003
 OP_ClearRaidNPCMarks=0x20d3	#unimplemented
 OP_DelegateAbility=0x76b8
 OP_SetGroupTarget=0x2814
 OP_Charm=0x5d92
 OP_Stun=0x36a4
-OP_SendFindableNPCs=0x3897
+OP_SendFindableNPCs=0x4613
 OP_FindPersonRequest=0x5cea
 OP_FindPersonReply=0x7e58
 OP_Sound=0x1a30
@@ -305,69 +305,70 @@ OP_PetBuffWindow=0x5882
 OP_LevelAppearance=0x3bc9
 OP_Translocate=0x6580
 OP_Sacrifice=0x1821
-OP_PopupResponse=0x214a
-OP_OnLevelMessage=0x4fd0
+OP_PopupResponse=0x08a6
+OP_OnLevelMessage=0x4d6e
 OP_AugmentInfo=0x0afb
-OP_Petition=0x5f03
+OP_Petition=0x1901
 OP_SomeItemPacketMaybe=0x747c
-OP_PVPStats=0x6f4b				# Unsure
-OP_PVPLeaderBoardRequest=0x3707
-OP_PVPLeaderBoardReply=0x25b7
-OP_PVPLeaderBoardDetailsRequest=0x15a9
-OP_PVPLeaderBoardDetailsReply=0x04aa
-OP_RestState=0x00f
+OP_PVPStats=0x4b15
+OP_PVPLeaderBoardRequest=0x04aa
+OP_PVPLeaderBoardReply=0x071f
+OP_PVPLeaderBoardDetailsRequest=0x3707
+OP_PVPLeaderBoardDetailsReply=0x25b7
+OP_RestState=0x000f
 OP_RespawnWindow=0x28bc
 OP_LDoNButton=0x5327
-OP_SetStartCity=0x6326			# Was 0x2d1b
+OP_SetStartCity=0x6326
 OP_VoiceMacroIn=0x17fd
 OP_VoiceMacroOut=0x409a
-OP_ItemViewUnknown=0x2289
+OP_ItemViewUnknown=0x465b
 OP_VetRewardsAvaliable=0x590e
 OP_VetClaimRequest=0x1126
 OP_VetClaimReply=0x16d4
-OP_DisciplineUpdate=0x759e		# Was 0x2f05
-OP_DisciplineTimer=0x6989		# Was 0x5e3f
+OP_DisciplineUpdate=0x759e
+OP_DisciplineTimer=0x6989
 OP_BecomeCorpse=0x0000			# Unused?
 OP_Action2=0x0000				# Unused?
 OP_MobUpdate=0x2c84
-OP_NPCMoveUpdate=0x189c
+OP_NPCMoveUpdate=0x5892
 OP_CameraEffect=0x127f
 OP_SpellEffect=0x5936
-OP_RemoveNimbusEffect=0xc693
-OP_AltCurrency=0x7121
-OP_AltCurrencyMerchantRequest=0x6b6d
-OP_AltCurrencyMerchantReply=0x74ec
-OP_AltCurrencyPurchase=0x61cb
-OP_AltCurrencySell=0x0165
-OP_AltCurrencySellSelection=0x5409
-OP_AltCurrencyReclaim=0x532a
-OP_CrystalCountUpdate=0x467f	# Was 0x3f60
-OP_CrystalCreate=0x7aee			# Was 0x5a82
-OP_CrystalReclaim=0x2439		# Was 0x7616
+OP_RemoveNimbusEffect=0x7b1e
+OP_AltCurrency=0x6b6d
+OP_AltCurrencyMerchantRequest=0x5409
+OP_AltCurrencyMerchantReply=0x27a2
+OP_AltCurrencyPurchase=0x3788
+OP_AltCurrencySell=0x40b6
+OP_AltCurrencySellSelection=0x532a
+OP_AltCurrencyReclaim=0x0339
+OP_CrystalCountUpdate=0x467f
+OP_CrystalCreate=0x7aee
+OP_CrystalReclaim=0x2439
 OP_Untargetable=0x053c
 OP_IncreaseStats=0x70a3
-OP_Weblink=0x18d3
-#OP_OpenInventory=0x0000			# Likely does not exist in RoF -U
+OP_Weblink=0x6f4b
 OP_OpenContainer=0x0000
-OP_Marquee=0x0000
+OP_Marquee=0x502e
+OP_ItemRecastDelay=0x15a9
+#OP_OpenInventory=0x0000			# Likely does not exist in RoF -U
 
-OP_DzQuit=0xb2e3
-OP_DzListTimers=0x7b68
-OP_DzAddPlayer=0x4701
-OP_DzRemovePlayer=0x1abc
-OP_DzSwapPlayer=0x405b
-OP_DzMakeLeader=0x543d
-OP_DzPlayerList=0x14c6
-OP_DzJoinExpeditionConfirm=0x7f4b
-OP_DzJoinExpeditionReply=0x1950
-OP_DzExpeditionInfo=0x9119
-OP_DzExpeditionList=0x205f
-OP_DzMemberStatus=0x32f0
-OP_DzLeaderStatus=0x3de9
-OP_DzExpeditionEndsWarning=0x5189
-OP_DzMemberList=0x5ae4
-OP_DzCompass=0x3e0e		# Was 0x4f09
-OP_DzChooseZone=0x0000	# Maybe 0x29d6
+OP_DzQuit=0x205f
+OP_DzListTimers=0x0398
+OP_DzAddPlayer=0x59ca
+OP_DzRemovePlayer=0x4701
+OP_DzSwapPlayer=0x1abc
+OP_DzMakeLeader=0x405b
+OP_DzPlayerList=0x543d
+OP_DzJoinExpeditionConfirm=0x14c6
+OP_DzJoinExpeditionReply=0x7f4b
+OP_DzExpeditionInfo=0x4f7e
+OP_DzExpeditionList=0x9119
+OP_DzMemberStatus=0xb2e3
+OP_DzLeaderStatus=0x32f0
+OP_DzExpeditionEndsWarning=0x7e94
+OP_DzMemberList=0x3de9
+OP_DzCompass=0x3e0e
+OP_DzChooseZone=0x0b7d
 
 # New Opcodes
 OP_SpawnPositionUpdate=0x0000	# Actually OP_MobUpdate ?
@@ -402,7 +403,7 @@ OP_BazaarSearch=0x39d6
 OP_TraderDelItem=0x0000
 OP_BecomeTrader=0x61b3
 OP_TraderShop=0x31df
-OP_Trader=0x4ef5	# Was 0x6790
+OP_Trader=0x4ef5
 OP_TraderBuy=0x0000
 OP_Barter=0x243a
 OP_ShopItem=0x0000
@@ -427,15 +428,15 @@ OP_FinishWindow2=0x40ef
 
 # Sent on Live for what seems to be item existance verification
 # Ex. Before Right Click Effect happens from items
-OP_ItemVerifyRequest=0x097b
-OP_ItemVerifyReply=0x2115
+OP_ItemVerifyRequest=0x189c
+OP_ItemVerifyReply=0x097b
 
 # merchant stuff
-OP_ShopPlayerSell=0x1901
+OP_ShopPlayerSell=0x0000
 OP_ShopRequest=0x4fed
 OP_ShopEnd=0x30a8
 OP_ShopEndConfirm=0x3196
-OP_ShopPlayerBuy=0x04c
+OP_ShopPlayerBuy=0x0ddd
 OP_ShopDelItem=0x724f
 
 # tradeskill stuff:
@@ -443,7 +444,7 @@ OP_ClickObject=0x4aa1
 OP_ClickObjectAction=0x0c1e
 OP_ClearObject=0x7a11
 OP_RecipeDetails=0x40d7
-OP_RecipesFavorite=0x5c74
+OP_RecipesFavorite=0x71b1
 OP_RecipesSearch=0x1db6
 OP_RecipeReply=0x6e02
 OP_RecipeAutoCombine=0x6261
@@ -451,10 +452,10 @@ OP_TradeSkillCombine=0x579a
 
 # Tribute Packets:
 OP_OpenGuildTributeMaster=0x378d
-OP_OpenTributeMaster=0x7666 # Was 0x40f5
+OP_OpenTributeMaster=0x7666
 OP_SelectTribute=0x79fc
 OP_TributeItem=0x4f3e
-OP_TributeMoney=0x58fb # Was 0x6fed
+OP_TributeMoney=0x58fb
 OP_TributeToggle=0x241d
 OP_TributePointUpdate=0x5300
 OP_TributeNPC=0x0000
@@ -471,11 +472,11 @@ OP_AdventureRequest=0x2c6c
 OP_AdventureDetails=0x5648
 OP_AdventureData=0x7171
 OP_AdventureUpdate=0x1b01
-OP_AdventureMerchantRequest=0x6922 # Was 654d
-OP_AdventureMerchantResponse=0x3e47 # Was 7949
-OP_AdventureMerchantPurchase=0x5b72 # Was 155a
-OP_AdventureMerchantSell=0x2f9b # Was 389c
-OP_AdventurePointsUpdate=0x65c3 # Was 7589
+OP_AdventureMerchantRequest=0x6922
+OP_AdventureMerchantResponse=0x3e47
+OP_AdventureMerchantPurchase=0x5b72
+OP_AdventureMerchantSell=0x2f9b
+OP_AdventurePointsUpdate=0x65c3
 OP_AdventureStatsRequest=0x5a62
 OP_AdventureStatsReply=0x2370
 OP_AdventureLeaderboardRequest=0x7093
@@ -483,16 +484,16 @@ OP_AdventureLeaderboardReply=0x7f79
 
 # Group Opcodes
 OP_GroupDisband=0x4c10
-OP_GroupInvite=0x1649
-OP_GroupFollow=0x05ce
+OP_GroupInvite=0x6110
+OP_GroupFollow=0x1649
 OP_GroupUpdate=0x3abb
 OP_GroupUpdateB=0x6194
 OP_GroupCancelInvite=0x0000
 OP_GroupAcknowledge=0x7323
 OP_GroupDelete=0x0f6c
-OP_CancelInvite=0x32c2
-OP_GroupFollow2=0x2a50
-OP_GroupInvite2=0x6c65
+OP_CancelInvite=0x2a50
+OP_GroupFollow2=0x2060
+OP_GroupInvite2=0x32c2
 OP_GroupDisbandYou=0x1ae5
 OP_GroupDisbandOther=0x74da
 OP_GroupLeaderChange=0x21b4
@@ -500,7 +501,7 @@ OP_GroupRoles=0x70e2
 OP_GroupMakeLeader=0x4229
 OP_DoGroupLeadershipAbility=0x1fb5
 OP_GroupLeadershipAAUpdate=0x02cf
-OP_GroupMentor=0x5892
+OP_GroupMentor=0x3342
 OP_InspectBuffs=0x486c
 
 # LFG/LFP Opcodes
@@ -521,7 +522,7 @@ OP_RaidJoin=0x0000
 # Button-push commands
 OP_Taunt=0x2703
 OP_CombatAbility=0x3eba
-OP_SenseTraps=0x02af			# Was 0x2ee0
+OP_SenseTraps=0x02af
 OP_PickPocket=0x39e8
 OP_DisarmTraps=0x78bf
 OP_Disarm=0x5ec8
@@ -534,15 +535,15 @@ OP_Bind_Wound=0x0386
 OP_LDoNOpen=0x3d5c
 
 # Task packets
-OP_TaskDescription=0x083
-OP_TaskActivity=0x3714
+OP_TaskDescription=0x3714
+OP_TaskActivity=0x08d3
 OP_CompletedTasks=0x4eba
 OP_TaskActivityComplete=0x5e19
 OP_AcceptNewTask=0x0a23
-OP_CancelTask=0x08d3
-OP_TaskMemberList=0x5727		# Was 0x1656
-OP_OpenNewTasksWindow=0x48a2	# Was 0x11de
-OP_AvaliableTask=0x36e8			# Was 0x2377
+OP_CancelTask=0x39f0
+OP_TaskMemberList=0x5727
+OP_OpenNewTasksWindow=0x48a2
+OP_AvaliableTask=0x36e8
 OP_TaskHistoryRequest=0x5f1c
 OP_TaskHistoryReply=0x3d05
 OP_DeclineAllTasks=0x0000
@@ -584,7 +585,7 @@ OP_LoginComplete=0x0000
 
 # discovered opcodes not yet used:
 OP_PickLockSuccess=0x0000
-OP_PlayMP3=0x0000
+OP_PlayMP3=0x5770
 OP_ReclaimCrystals=0x0000
 OP_DynamicWall=0x0000
 OP_OpenDiscordMerchant=0x0000
@@ -657,5 +658,3 @@ OP_RAWOutOfSession=0x0000
 # we need to document the differences between these packets to make identifying them easier
 OP_Some3ByteHPUpdate=0x0000 # initial HP update for mobs
 OP_InitialHPUpdate=0x0000
-
-OP_ItemRecastDelay=0x08a6