From 036cd83a256163c71e653a0179c9239675e03f17 Mon Sep 17 00:00:00 2001 From: WildCard_25 Date: Sun, 24 Mar 2019 17:12:04 +1100 Subject: [PATCH] Remove Order Hall code --- FollowerCache.lua | 24 +--------- GarrisonCommander.lua | 37 ++++----------- GarrisonCommander.toc | 1 - Init.lua | 125 ------------------------------------------------- MatchMaker.lua | 29 +----------- MissionCache.lua | 18 +------ MissionCompletion.lua | 9 ---- 7 files changed, 14 insertions(+), 229 deletions(-) diff --git a/FollowerCache.lua b/FollowerCache.lua index 4a41532..8ee8723 100644 --- a/FollowerCache.lua +++ b/FollowerCache.lua @@ -20,13 +20,11 @@ local tostring=tostring local GetItemInfo=GetItemInfo local LE_FOLLOWER_TYPE_GARRISON_6_0=_G.LE_FOLLOWER_TYPE_GARRISON_6_0 local LE_FOLLOWER_TYPE_SHIPYARD_6_2=_G.LE_FOLLOWER_TYPE_SHIPYARD_6_2 -local LE_FOLLOWER_TYPE_GARRISON_7_0=_G.LE_FOLLOWER_TYPE_GARRISON_7_0 local maxrank=_G.GARRISON_FOLLOWER_MAX_UPGRADE_QUALITY[LE_FOLLOWER_TYPE_GARRISON_6_0]*1000+GARRISON_FOLLOWER_MAX_LEVEL -local maxrankoh=_G.GARRISON_FOLLOWER_MAX_UPGRADE_QUALITY[LE_FOLLOWER_TYPE_GARRISON_7_0]*1000+110 local module=addon:NewSubClass('FollowerCache') --#module local cache={} --#cache local followerTypes={} -local cacheTypes={LE_FOLLOWER_TYPE_GARRISON_6_0,LE_FOLLOWER_TYPE_SHIPYARD_6_2,LE_FOLLOWER_TYPE_GARRISON_7_0} +local cacheTypes={LE_FOLLOWER_TYPE_GARRISON_6_0,LE_FOLLOWER_TYPE_SHIPYARD_6_2} local EMPTY={} local GMCUsedFollowers={} local GMCUsedFollowersCount=0 @@ -50,12 +48,9 @@ print(event,...) self.caches[LE_FOLLOWER_TYPE_SHIPYARD_6_2]:OnEvent(event,...) elseif self.caches[LE_FOLLOWER_TYPE_GARRISON_6_0].cache[followerID].followerID then self.caches[LE_FOLLOWER_TYPE_GARRISON_6_0]:OnEvent(event,...) - elseif self.caches[LE_FOLLOWER_TYPE_GARRISON_7_0].cache[followerID].followerID then - self.caches[LE_FOLLOWER_TYPE_GARRISON_7_0]:OnEvent(event,...) else self.caches[LE_FOLLOWER_TYPE_GARRISON_6_0]:Wipe() self.caches[LE_FOLLOWER_TYPE_SHIPYARD_6_2]:Wipe() - self.caches[LE_FOLLOWER_TYPE_GARRISON_7_0]:Wipe() end end @@ -65,12 +60,6 @@ function cache:new(type) return rc end function cache:OnEvent(event,followerType,followerID) ---@debug@ - if followerType==LE_FOLLOWER_TYPE_GARRISON_7_0 and ns.ignoreHall then - return - end -print(event,followerType,followerID) ---@end-debug@ if event=="GARRISON_FOLLOWER_UPGRADED" or event=="GARRISON_FOLLOWER_XP_CHANGED" then if (self.cache[followerID]) then self.cache[followerID]['level']=G.GetFollowerLevel(followerID) @@ -154,9 +143,6 @@ function cache:AddExtraData(follower) follower.coloredname=C(follower.name,tostring(follower.quality)) follower.fullname=format("%3d %s",follower.rank,follower.coloredname) follower.maxed=follower.qLevel>=maxrank - if follower.followerTypeID==LE_FOLLOWER_TYPE_GARRISON_7_0 then - follower.maxed=follower.qLevel>=maxrankoh - end local weaponItemID, weaponItemLevel, armorItemID, armorItemLevel = G.GetFollowerItems(follower.followerID); follower.weaponItemID=weaponItemID follower.weaponItemLevel=weaponItemLevel @@ -241,15 +227,10 @@ function addon:GetAnyData(followerType,...) end if followerType== LE_FOLLOWER_TYPE_SHIPYARD_6_2 then return self:GetShipData(...) - elseif followerType== LE_FOLLOWER_TYPE_GARRISON_7_0 then - return self:GetHeroData(...) else return self:GetFollowerData(...) end end -function addon:GetHeroData(followerID,key,default) - return module.caches[LE_FOLLOWER_TYPE_GARRISON_7_0]:GetFollowerData(followerID,key,default) -end function addon:GetFollowerData(followerID,key,default) return module.caches[LE_FOLLOWER_TYPE_GARRISON_6_0]:GetFollowerData(followerID,key,default) end @@ -268,9 +249,6 @@ end function addon:GetShipsIterator(func) return module.caches[LE_FOLLOWER_TYPE_SHIPYARD_6_2]:GetFollowersIterator(func) end -function addon:GetHeroesIterator(func) - return module.caches[LE_FOLLOWER_TYPE_GARRISON_7_0]:GetFollowersIterator(func) -end function addon:GetAnyIterator(followerTypeID,func) return module.caches[followerTypeID]:GetFollowersIterator(func) end diff --git a/GarrisonCommander.lua b/GarrisonCommander.lua index bcdebbc..599ae66 100644 --- a/GarrisonCommander.lua +++ b/GarrisonCommander.lua @@ -29,10 +29,8 @@ local minHeight local addon=addon --#addon local LE_FOLLOWER_TYPE_GARRISON_6_0=_G.LE_FOLLOWER_TYPE_GARRISON_6_0 local LE_FOLLOWER_TYPE_SHIPYARD_6_2=_G.LE_FOLLOWER_TYPE_SHIPYARD_6_2 -local LE_FOLLOWER_TYPE_GARRISON_7_0=_G.LE_FOLLOWER_TYPE_GARRISON_7_0 local LE_GARRISON_TYPE_6_0=_G.LE_GARRISON_TYPE_6_0 local LE_GARRISON_TYPE_6_2=_G.LE_GARRISON_TYPE_6_2 -local LE_GARRISON_TYPE_7_0=_G.LE_GARRISON_TYPE_7_0 ns.bigscreen=true local tprint=print local backdrop = { @@ -97,7 +95,6 @@ local GARRISON_MISSION_PERCENT_CHANCE="%d%%"-- GARRISON_MISSION_PERCENT_CHANCE --local GARRISON_CURRENCY=GARRISON_CURRENCY --824 local LE_FOLLOWER_TYPE_GARRISON_6_0=LE_FOLLOWER_TYPE_GARRISON_6_0 local LE_FOLLOWER_TYPE_SHIPYARD_6_2=LE_FOLLOWER_TYPE_SHIPYARD_6_2 -local LE_FOLLOWER_TYPE_GARRISON_7_0=LE_FOLLOWER_TYPE_GARRISON_7_0 local GARRISON_FOLLOWER_MAX_UPGRADE_QUALITY=GARRISON_FOLLOWER_MAX_UPGRADE_QUALITY[LE_FOLLOWER_TYPE_GARRISON_6_0] --local GARRISON_FOLLOWER_MAX_LEVEL=GARRISON_FOLLOWER_MAX_LEVEL -- 100 @@ -388,14 +385,10 @@ function addon:OnInitialized() ns.custom={ [LE_FOLLOWER_TYPE_GARRISON_6_0]=addon, [LE_FOLLOWER_TYPE_SHIPYARD_6_2]=self:GetModule("ShipYard"), - --[LE_FOLLOWER_TYPE_GARRISON_7_0]=self:GetModule("OrderHall"), - --[LE_FOLLOWER_TYPE_GARRISON_8_0]=self:GetModule("BFA"), - } self:SafeRegisterEvent("GARRISON_MISSION_COMPLETE_RESPONSE") self:SafeRegisterEvent("GARRISON_MISSION_NPC_CLOSED") self:SafeRegisterEvent("GARRISON_MISSION_STARTED") - self:SafeRegisterEvent("ADDON_LOADED") self:SafeRegisterEvent("QUEST_TURNED_IN") for _,b in ipairs(GMF.MissionTab.MissionList.listScroll.buttons) do local scale=0.8 @@ -1960,7 +1953,6 @@ local fakeframe={} local mainframes={ [LE_FOLLOWER_TYPE_GARRISON_6_0]="GarrisonMissionFrame", [LE_FOLLOWER_TYPE_SHIPYARD_6_2]="GarrisonShipyardFrame", - [LE_FOLLOWER_TYPE_GARRISON_7_0]="OrderHallMissionFrame", } function addon:FillMissionPage(missionInfo) @@ -1968,7 +1960,7 @@ function addon:FillMissionPage(missionInfo) if type(missionInfo)=="number" then missionInfo=self:GetMissionData(missionInfo) end if not missionInfo then return end local missionType=missionInfo.followerTypeID - if missionType==LE_FOLLOWER_TYPE_SHIPYARD_6_2 or missionType==LE_FOLLOWER_TYPE_GARRISON_7_0 then + if missionType==LE_FOLLOWER_TYPE_SHIPYARD_6_2 then if not missionInfo.canStart then return end end local main=_G[mainframes[missionType]] @@ -1976,9 +1968,6 @@ function addon:FillMissionPage(missionInfo) local missionpage=main:GetMissionPage() local stage=main.MissionTab.MissionPage.Stage local missionenv=stage.MissionInfo.MissionEnv - if missionType==LE_FOLLOWER_TYPE_GARRISON_7_0 then - missionenv=stage.MissionInfo.MissionTime - end if not stage.MissionSeen then if not stage.expires then stage.expires=stage:CreateFontString() @@ -2732,20 +2721,16 @@ function addon:ScriptGarrisonMissionButton_OnEnter(this, button) GameTooltip:AddLine(GARRISON_MISSION_AVAILABILITY); GameTooltip:AddLine(this.info.offerTimeRemaining, 1, 1, 1); end - if not this.hall then - if (blacklist[this.info.missionID]) then - GameTooltip:AddDoubleLine(L["Blacklisted"],L["Right-Click to remove from blacklist"],1,0.125,0.125,C:Green()) - GameTooltip:AddLine(L["Blacklisted missions are ignored in Mission Control"]) - else - GameTooltip:AddDoubleLine(L["Not blacklisted"],L["Right-Click to blacklist"],0.125,1.0,0.125,C:Red()) - end + if (blacklist[this.info.missionID]) then + GameTooltip:AddDoubleLine(L["Blacklisted"],L["Right-Click to remove from blacklist"],1,0.125,0.125,C:Green()) + GameTooltip:AddLine(L["Blacklisted missions are ignored in Mission Control"]) + else + GameTooltip:AddDoubleLine(L["Not blacklisted"],L["Right-Click to blacklist"],0.125,1.0,0.125,C:Red()) end - addon:AddFollowersToTooltip(this.info.missionID,this.hall and LE_FOLLOWER_TYPE_GARRISON_7_0 or LE_FOLLOWER_TYPE_GARRISON_6_0) - if not this.hall then - if not C_Garrison.IsOnGarrisonMap() and not GMF:IsVisible() then - GameTooltip:AddLine(" "); - GameTooltip:AddLine(GARRISON_MISSION_TOOLTIP_RETURN_TO_START, nil, nil, nil, 1); - end + addon:AddFollowersToTooltip(this.info.missionID,LE_FOLLOWER_TYPE_GARRISON_6_0) + if not C_Garrison.IsOnGarrisonMap() and not GMF:IsVisible() then + GameTooltip:AddLine(" "); + GameTooltip:AddLine(GARRISON_MISSION_TOOLTIP_RETURN_TO_START, nil, nil, nil, 1); end end --@debug@ @@ -2809,8 +2794,6 @@ function addon:DrawSlimButton(source,frame,progressing,bigscreen) local numRewards=self:AddRewards(frame, mission.rewards, mission.numRewards); if mission.followerTypeID==LE_FOLLOWER_TYPE_GARRISON_6_0 then self:AddFollowersToButton(frame,mission,missionID,bigscreen,numRewards) - elseif mission.followerTypeID==LE_FOLLOWER_TYPE_GARRISON_7_0 then - self:AddFollowersToButton(frame,mission,missionID,false,numRewards) elseif mission.followerTypeID==LE_FOLLOWER_TYPE_SHIPYARD_6_2 then self:AddShipsToButton(frame,mission,missionID,bigscreen,numRewards) end diff --git a/GarrisonCommander.toc b/GarrisonCommander.toc index bcccc9f..6c3106f 100644 --- a/GarrisonCommander.toc +++ b/GarrisonCommander.toc @@ -47,7 +47,6 @@ FollowerRecruiting.lua BuildingPage.lua ShipYard.lua ShipControl.lua -OrderHall.lua quick.lua RelNotes.lua #@do-not-package@ diff --git a/Init.lua b/Init.lua index e3cae0f..20b4b70 100644 --- a/Init.lua +++ b/Init.lua @@ -378,128 +378,3 @@ function ns.Configure() end setfenv(2, ENV) end -function addon:EventADDON_LOADED(event,AddOn) - if AddOn~="Blizzard_OrderHallUI" then return end - self:UnregisterEvent("ADDON_LOADED") - ns.GHF=_G.OrderHallMissionFrame - ns.GHFMissions=ns.GHF.MissionTab.MissionList - ENV.GHF=ns.GHF - ENV.GHFMissions=ns.GHFMissions - self:GetModule("OrderHall"):OnInitialize() -end --- Order Hall data -local fake={} -local data={ - Upgrades={ - 136412, - 137207, - 137208, - - }, - Xp={ - 141028 - }, - Equipment={ - 'Success Chance Increase', - 139816, - 139801, - 139802, - 140572, - 140571, - 140573, - 140581, - 140582, - 140583, - 'Mission Time Reduction', - 139813, - 139814, - 139799, - 'Combat Ally Bonus', - 139792, - 139808, - 139809, - 139795, - 139811, - 139812, - 'Troop Affinity', - 139875, - 139876, - 139877, - 139878, - 139835, - 139836, - 139837, - 139838, - 139863, - 139864, - 139865, - 139866, - 139847, - 139848, - 139849, - 139850, - 139843, - 139844, - 139845, - 139846, - 139859, - 139860, - 139861, - 139862, - 139867, - 139868, - 139869, - 139870, - 139871, - 139872, - 139873, - 139874, - 139831, - 139832, - 139833, - 139834, - 139839, - 139840, - 139841, - 139842, - 139855, - 139856, - 139857, - 139858, - 139851, - 139852, - 139853, - 139854, - 'Legendary Equipment', - 139830, - 139828, - 139829, - 139827, - 139825, - 139826, - 139821, - 139804, - 139819, - 139824, - 139823, - 139822, - 'Consumables', - 140749, - 139419, - 140760, - 139428, - 139177, - 139420, - 138883, - 139376, - 138418, - 138412, - 139670 - }, -} -function addon:GetData(key) - key=key or "none" - return data[key] or fake -end - - diff --git a/MatchMaker.lua b/MatchMaker.lua index 001b5ef..81430fb 100644 --- a/MatchMaker.lua +++ b/MatchMaker.lua @@ -25,7 +25,6 @@ local GARRISON_CURRENCY=GARRISON_CURRENCY local GARRISON_SHIP_OIL_CURRENCY=GARRISON_SHIP_OIL_CURRENCY local LE_FOLLOWER_TYPE_GARRISON_6_0=_G.LE_FOLLOWER_TYPE_GARRISON_6_0 -- 1 local LE_FOLLOWER_TYPE_SHIPYARD_6_2=_G.LE_FOLLOWER_TYPE_SHIPYARD_6_2 -- 2 -local LE_FOLLOWER_TYPE_GARRISON_7_0=_G.LE_FOLLOWER_TYPE_GARRISON_7_0 -- 4 local dbg local useCap=false local currentCap=100 @@ -220,7 +219,6 @@ local function MatchMaker(self,mission,party,includeBusy,onlyBest) local filterOut=filters[class] or filters.other filters.skipMaxed=self:GetBoolean("IGP") local followerType=mission.followerTypeID - local hallMission=followerType==LE_FOLLOWER_TYPE_GARRISON_7_0 if followerType==LE_FOLLOWER_TYPE_SHIPYARD_6_2 then filters.skipMaxed=false end @@ -238,11 +236,7 @@ local function MatchMaker(self,mission,party,includeBusy,onlyBest) if self:IsFollowerAvailableForMission(followerID,filters.skipBusy) then if P:AddFollower(followerID) then local score,chance=self:FollowerScore(mission,followerID) - if hallMission and self:GetHeroData(followerID,'isTroop') then - tinsert(troops,format("%s@%s@%s",score,followerID,self:GetAnyData(missionTypeID,followerID,'fullname'))) - else - tinsert(scores,format("%s@%s@%s",score,followerID,self:GetAnyData(missionTypeID,followerID,'fullname'))) - end + tinsert(scores,format("%s@%s@%s",score,followerID,self:GetAnyData(missionTypeID,followerID,'fullname'))) P:RemoveFollower(followerID) end end @@ -288,26 +282,7 @@ local function MatchMaker(self,mission,party,includeBusy,onlyBest) --@end-debug@ end if mission.numFollowers > 1 then - if missionTypeID== LE_FOLLOWER_TYPE_GARRISON_7_0 then - local nf=#scores - local nt=#troops - local total=#GHFMissions.availableMissions - local maxtroops=0 - if total==1 then - AddMoreFollowers(self,mission,scores) - AddMoreFollowers(self,mission,troops) - else - local mm=math.floor((nt+nt)/3) - if mm==1 then - maxtroops=0 - else - maxtroops=1 - end - AddMoreFollowers(self,mission,troops,false,maxtroops) - end - else - AddMoreFollowers(self,mission,scores) - end + AddMoreFollowers(self,mission,scores) end end if P:FreeSlots() > 0 then diff --git a/MissionCache.lua b/MissionCache.lua index f28116b..9216dc3 100644 --- a/MissionCache.lua +++ b/MissionCache.lua @@ -14,7 +14,6 @@ local GARRISON_SHIP_OIL_CURRENCY=GARRISON_SHIP_OIL_CURRENCY local GARRISON_FOLLOWER_MAX_LEVEL=GARRISON_FOLLOWER_MAX_LEVEL local LE_FOLLOWER_TYPE_GARRISON_6_0=_G.LE_FOLLOWER_TYPE_GARRISON_6_0 local LE_FOLLOWER_TYPE_SHIPYARD_6_2=_G.LE_FOLLOWER_TYPE_SHIPYARD_6_2 -local LE_FOLLOWER_TYPE_GARRISON_7_0=_G.LE_FOLLOWER_TYPE_GARRISON_7_0 local GMF=GMF local GSF=GSF local GMFMissions=GMFMissions @@ -122,12 +121,6 @@ function module:GetMission(id,noretry) elseif type=="p" then mission=GMFMissions.inProgressMissions[ix] if mission and mission.missionID==id then return mission end - elseif type=="ha" then - mission=GHFMissions.availableMissions[ix] - if mission and mission.missionID==id then return mission end - elseif type=="hp" then - mission=GHFMissions.inProgressMissions[ix] - if mission and mission.missionID==id then return mission end elseif type=="s" then mission=GSFMissions.missions[ix] if mission and mission.missionID==id then return mission end @@ -138,10 +131,6 @@ function module:GetMission(id,noretry) scan(GMFMissions.availableMissions,'a') scan(GMFMissions.inProgressMissions,'p') scan(GSFMissions.missions,'s') - if GHFMissions and not ns.ignoreHall then - scan(GHFMissions.availableMissions,'ha') - scan(GHFMissions.inProgressMissions,'hp') - end return self:GetMission(id,true) end function module:AddExtraData(mission) @@ -258,7 +247,7 @@ print("Iterator called, list is",list) end,list,0 end function module:OnAllGarrisonMissions(func,inProgress,missionType) - local m=(missionType and missionType==LE_FOLLOWER_TYPE_GARRISON_7_0) and GHFMissions or GMFMissions + local m=GMFMissions local list=inProgress and m.inProgressMissions or m.availableMissions if type(list)=='table' then local tmp=new() @@ -473,11 +462,6 @@ classes[LE_FOLLOWER_TYPE_SHIPYARD_6_2]={ newMissionType('itemLevel',L['Item Tokens'],'INV_Bracer_Cloth_Reputation_C_01',false,false,nil,0), newMissionType('other',L['Other rewards'],'INV_Box_02',false,false,nil,0), } -classes[LE_FOLLOWER_TYPE_GARRISON_7_0]={ - newMissionType('xp',L['Follower experience'],'XPBonus_icon',false,false,nil,0), - newMissionType('gold',BONUS_ROLL_REWARD_MONEY,'inv_misc_coin_01',false,false,nil,0), - newMissionType('other',L['Other rewards'],'INV_Box_02',false,false,nil,0), -} function addon:GetRewardClasses(followerType) followerType=followerType or LE_FOLLOWER_TYPE_GARRISON_6_0 return classes[followerType] diff --git a/MissionCompletion.lua b/MissionCompletion.lua index fa03197..25f80fc 100644 --- a/MissionCompletion.lua +++ b/MissionCompletion.lua @@ -5,16 +5,13 @@ local shipyard local _G=_G local GMF=GMF local GSF=GSF -local GHF=GHF local GMFMissions=GarrisonMissionFrameMissions local GSFMissions=GarrisonMissionFrameMissions -local GHFMissions=GarrisonMissionFrameMissions local GARRISON_CURRENCY=GARRISON_CURRENCY local GARRISON_SHIP_OIL_CURRENCY=_G.GARRISON_SHIP_OIL_CURRENCY local SEAL_CURRENCY=994 local LE_FOLLOWER_TYPE_GARRISON_6_0=_G.LE_FOLLOWER_TYPE_GARRISON_6_0 -- 1 local LE_FOLLOWER_TYPE_SHIPYARD_6_2=_G.LE_FOLLOWER_TYPE_SHIPYARD_6_2 -- 2 -local LE_FOLLOWER_TYPE_GARRISON_7_0=_G.LE_FOLLOWER_TYPE_GARRISON_7_0 -- 4 local pairs=pairs local format=format local strsplit=strsplit @@ -93,7 +90,6 @@ function module:MissionsCleanup() -- Re-enable "view" button fmissions.CompleteDialog.BorderFrame.ViewButton:SetEnabled(true) module:OpenLastTab() - if panel==GHF then return end f:UpdateMissions() f:CheckCompleteMissions() end @@ -120,11 +116,6 @@ function module:CloseReport() print "Garr close mission" --@end-debug@ GMF:CloseMissionComplete() - elseif GHF and GHF:IsVisible() then - --@debug@ - print "Hall close mission" - --@end-debug@ - GHF:CloseMissionComplete() end addon:OpenMissionsTab() addon:RefreshParties() -- 1.7.9.5