diff --git a/changelog.txt b/changelog.txt index 5eec1f8af..a866613ee 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,8 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- +== 12/19/2014 == +Trevius: (RoF2) Fixed Leadership AA Purchasing and Recipe Search by correcting opcodes. + == 12/18/2014 == Trevius: Finished lining up the RoF2 Player Profile Struct. Zone times are now normal, and everything from the PP is accurate in game now. Trevius: Fixed zoning after death for RoF2. diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp index fff449379..c857eaccf 100644 --- a/common/patches/rof2.cpp +++ b/common/patches/rof2.cpp @@ -3877,6 +3877,7 @@ namespace RoF2 } // DECODE methods + DECODE(OP_AdventureMerchantSell) { DECODE_LENGTH_EXACT(structs::Adventure_Sell_Struct); diff --git a/common/patches/rof2_ops.h b/common/patches/rof2_ops.h index fbdd20575..19519212a 100644 --- a/common/patches/rof2_ops.h +++ b/common/patches/rof2_ops.h @@ -4,7 +4,6 @@ // incoming packets that require a DECODE translation: // Begin RoF2 Decodes - // End RoF2 Encodes/Decodes // These require Encodes/Decodes for RoF, so they do for RoF2 as well diff --git a/utils/patches/patch_RoF2.conf b/utils/patches/patch_RoF2.conf index 2692481a9..60b94e87d 100644 --- a/utils/patches/patch_RoF2.conf +++ b/utils/patches/patch_RoF2.conf @@ -113,7 +113,7 @@ OP_ClientUpdate=0x7dfc OP_ClientReady=0x345d OP_SetServerFilter=0x444d -# Guild Opcodes - Disabled until crashes are resolved in RoF +# Guild Opcodes OP_GetGuildMOTD=0x36e0 OP_GetGuildMOTDReply=0x4f1f OP_GuildMemberUpdate=0x69b9 @@ -121,7 +121,6 @@ OP_GuildInvite=0x7099 OP_GuildRemove=0x1444 OP_GuildPeace=0x67e3 OP_SetGuildMOTD=0x0b0b -OP_GuildList=0x6279 OP_GuildWar=0x1ffb OP_GuildLeader=0x7e09 OP_GuildDelete=0x3708 @@ -287,16 +286,16 @@ OP_ReadBook=0x72df OP_Dye=0x23b9 OP_InterruptCast=0x048c OP_AAAction=0x424e -OP_LeadershipExpToggle=0x6c55 +OP_LeadershipExpToggle=0x74bd OP_LeadershipExpUpdate=0x2797 -OP_PurchaseLeadershipAA=0x0026 -OP_UpdateLeadershipAA=0x026 -OP_MarkNPC=0x5a58 -OP_MarkRaidNPC=0x74bd #unimplemented +OP_PurchaseLeadershipAA=0x6c55 +OP_UpdateLeadershipAA=0x0026 +OP_MarkNPC=0x1fb5 +OP_MarkRaidNPC=0x5a58 #unimplemented OP_ClearNPCMarks=0x2003 OP_ClearRaidNPCMarks=0x20d3 #unimplemented -OP_DelegateAbility=0x76b8 -OP_SetGroupTarget=0x2814 +OP_DelegateAbility=0x4c9d +OP_SetGroupTarget=0x026 OP_Charm=0x5d92 OP_Stun=0x36a4 OP_SendFindableNPCs=0x4613 @@ -367,7 +366,7 @@ OP_DzExpeditionInfo=0x4f7e OP_DzExpeditionList=0x9119 OP_DzMemberStatus=0xb2e3 OP_DzLeaderStatus=0x32f0 -OP_DzExpeditionEndsWarning=0x7e94 +OP_DzExpeditionEndsWarning=0x383c OP_DzMemberList=0x3de9 OP_DzCompass=0x3e0e OP_DzChooseZone=0x0b7d @@ -445,11 +444,11 @@ OP_ShopDelItem=0x724f OP_ClickObject=0x4aa1 OP_ClickObjectAction=0x0c1e OP_ClearObject=0x7a11 -OP_RecipeDetails=0x40d7 +OP_RecipeDetails=0x6e02 OP_RecipesFavorite=0x71b1 -OP_RecipesSearch=0x1db6 -OP_RecipeReply=0x6e02 -OP_RecipeAutoCombine=0x6261 +OP_RecipesSearch=0x6290 +OP_RecipeReply=0x1db6 +OP_RecipeAutoCombine=0x40d7 OP_TradeSkillCombine=0x579a # Tribute Packets: @@ -501,7 +500,7 @@ OP_GroupDisbandOther=0x74da OP_GroupLeaderChange=0x21b4 OP_GroupRoles=0x70e2 OP_GroupMakeLeader=0x4229 -OP_DoGroupLeadershipAbility=0x1fb5 +OP_DoGroupLeadershipAbility=0x6eae OP_GroupLeadershipAAUpdate=0x02cf OP_GroupMentor=0x3342 OP_InspectBuffs=0x486c