diff --git a/GarrisonCommander-Broker/ldb.lua b/GarrisonCommander-Broker/ldb.lua
index 68787ba..31c90e6 100644
--- a/GarrisonCommander-Broker/ldb.lua
+++ b/GarrisonCommander-Broker/ldb.lua
@@ -334,7 +334,7 @@ function addon:OnInitialized()
--self:RegisterEvent("SHIPMENT_CRAFTER_REAGENT_UPDATE",print)
self:AddLabel(GARRISON_NUM_COMPLETED_MISSIONS)
self:AddToggle("OLDINT",false,L["Use old interface"],L["Uses the old, more intrusive interface"])
- self:AddToggle("SHOWNEXT",false,L["Show next toon"],L["Show the next toon whicg will complete a mission"])
+ self:AddToggle("SHOWNEXT",false,L["Show next toon"],L["Show the next toon which will complete a mission"])
self:AddSlider("FREQUENCY",5,1,60,L["Update frequency"])
frequency=self:GetNumber("FREQUENCY",5)
self:ScheduleTimer("DelayedInit",5)
diff --git a/GarrisonCommander.lua b/GarrisonCommander.lua
index 36b9f4f..7397c4d 100644
--- a/GarrisonCommander.lua
+++ b/GarrisonCommander.lua
@@ -1843,7 +1843,7 @@ function addon:GetFollowerTexture(followerID,followerType)
print(rc,texPrefix)
if rc then
if texPrefix then
- shipconv.Portrait:SetAtlas(texPrefix)
+ shipconv.Portrait:SetAtlas(texPrefix.."-List")
print(shipconv.Portrait:GetTexture())
return shipconv.Portrait:GetTexture()
end
diff --git a/MissionControl.lua b/MissionControl.lua
index f2fd2a9..6238a3b 100644
--- a/MissionControl.lua
+++ b/MissionControl.lua
@@ -485,7 +485,7 @@ function module:GMCBuildChance()
else
GMC.ct:SetTextColor(C:Silver())
end
- GMC.cs = factory:Slider(GMC.cf,0,100,settings.minimumChance,L['Minumum requested success'])
+ GMC.cs = factory:Slider(GMC.cf,0,100,settings.minimumChance,L['Minumum needed chance'])
GMC.cs:SetPoint('BOTTOM', 10, 0)
GMC.cs:SetScript('OnValueChanged', function(self, value)
local value = math.floor(value)
diff --git a/ShipYard.lua b/ShipYard.lua
index 24e4efa..0af1581 100644
--- a/ShipYard.lua
+++ b/ShipYard.lua
@@ -21,16 +21,7 @@ function sprint(nome,this,...)
end
function module:OnInitialize()
self:SafeSecureHook("GarrisonFollowerButton_UpdateCounters")
---@debug@
- print("ShipYard Loaded")
- self:SafeSecureHook("GarrisonShipyardMapMission_SetTooltip")
self:SafeSecureHook(GSF,"OnClickMission","HookedGSF_OnClickMission")
- self:SafeHookScript(GSF,"OnShow","Setup",true)
- self:SafeHookScript(GSF.MissionTab.MissionList.CompleteDialog,"OnShow",function(... ) sprint("CompleteDialog",...) end,true)
- self:SafeHookScript(GSF.MissionTab,"OnShow",function(... ) sprint("MissionTab",...) end,true)
- self:SafeHookScript(GSF.FollowerTab,"OnShow",function(... ) sprint("FollowerTab",...) end,true)
- --GarrisonShipyardFrameFollowersListScrollFrameButton1
- --GarrisonShipyardMapMission1
local ref=GSFMissions.CompleteDialog.BorderFrame.ViewButton
print(ref)
local bt = CreateFrame('BUTTON','GCQuickShipMissionCompletionButton', ref, 'UIPanelButtonTemplate')
@@ -39,9 +30,22 @@ function module:OnInitialize()
bt:SetText(L["Garrison Comander Quick Mission Completion"])
bt:SetPoint("CENTER",0,-50)
addon:ActivateButton(bt,"MissionComplete",L["Complete all missions without confirmation"])
+--@debug@
+ print("ShipYard Loaded")
+ self:SafeSecureHook("GarrisonShipyardMapMission_SetTooltip")
+ self:SafeSecureHook("GarrisonShipyardMap_UpdateMissions")
+ self:SafeHookScript(GSF,"OnShow","Setup",true)
+ self:SafeHookScript(GSF.MissionTab.MissionList.CompleteDialog,"OnShow",function(... ) sprint("CompleteDialog",...) end,true)
+ self:SafeHookScript(GSF.MissionTab,"OnShow",function(... ) sprint("MissionTab",...) end,true)
+ self:SafeHookScript(GSF.FollowerTab,"OnShow",function(... ) sprint("FollowerTab",...) end,true)
+ --GarrisonShipyardFrameFollowersListScrollFrameButton1
+ --GarrisonShipyardMapMission1
--@end-debug@
end
-
+function module:HookedGarrisonShipyardMap_UpdateMissions()
+ local self = GarrisonShipyardFrame.MissionTab.MissionList
+ print("Could manage",#self.missions)
+end
function module:HookedGSF_OnClickMission(this,missionInfo)
self:FillMissionPage(missionInfo)
end
diff --git a/Widgets.lua b/Widgets.lua
index 0a6ebf0..add3961 100644
--- a/Widgets.lua
+++ b/Widgets.lua
@@ -132,16 +132,15 @@ local function GMCList()
end
function m:AddFollowerIcon(followerType,icon,text)
local l=self:AddIconText(icon,text)
- if followerType==LE_FOLLOWER_TYPE_GARRISON_6_0 then
- l:SetImageSize(24,24)
- else
+ if followerType==LE_FOLLOWER_TYPE_SHIPYARD_6_2 then
local left,right,top,bottom
left=0
- right=0.5
+ right=0.6
top=0
- bottom=0.5
+ bottom=0.6
l:SetImage(icon,left,right,top,bottom)
- l:SetImageSize(36,36)
+ l:SetImageSize(24,24)
+ l:SetHeight(26)
end
end
function m:AddIconText(icon,text,qt)
@@ -155,6 +154,7 @@ local function GMCList()
end
l:SetImage(icon)
l:SetImageSize(24,24)
+ l:SetHeight(26)
l:SetFullWidth(true)
obj:AddChild(l)
if (obj.scrollbar and obj.scrollbar:IsShown()) then
diff --git a/appo b/appo
new file mode 100644
index 0000000..5aa0b31
--- /dev/null
+++ b/appo
@@ -0,0 +1,97 @@
+/home/giovanni/workspaces/wowaddons/GarrisonCommander
+8<------------------------------------------------------
+L['%s |4follower:followers with %s']=true
+L['(Ignores low bias ones)']=true
+L['Adds a list of other useful followers to tooltip']=true
+L['Allowed Rewards']=true
+L['Allows a lower success percentage for resource missions. Use /gac gui to change percentage. Default is 80%']=true
+L['Applied when maximise result is enabled. Default is 80%']=true
+L['Building Final report']=true
+L['Click to toggle Garrison Mission Frame']=true
+L['Complete all missions without confirmation']=true
+L['Consider again']=true
+L['Disable if you dont want the full Garrison Commander Header.']=true
+L['Disables automatic population of mission page screen. You can also press control while clicking to disable it for a single mission']=true
+L['Disabling this will give you the interface from 1.1.8, given or taken. Need to reload interface']=true
+L['Do not show follower icon on plots']=true
+L["Don't ask for confirmation"]=true
+L['Duration Time']=true
+L['Enhance tooltip']=true
+L['Epic followers are NOT sent alone on xp only missions']=true
+L['Expiration Time']=true
+L['Follower']=true
+L['Followers status ']=true
+L['GCMPSWITCH']=true
+L['Garrison Comander Quick Mission Completion']=true
+L['Garrison Commander Mission Control']=true
+L['Global approx. xp reward']=true
+L['Global success chance']=true
+L['Gold incremented!']=true
+L['Hide followers']=true
+L['If checked, clicking an upgrade icon will consume the item and upgrade the follower\n|cFFFF0000NO QUESTION ASKED|r']=true
+L['Ignore "maxed"']=true
+L['Ignore epic for xp missions.']=true
+L['Ignore for all missions']=true
+L['Ignore for this mission']=true
+L['Ignore rare missions']=true
+L['Left Click to see available missions']=true
+L['Level 100 epic followers are not used for xp only missions.']=true
+L['Makes main mission panel movable']=true
+L['Maximize result']=true
+L['Maximum mission duration.']=true
+L['Minimum mission duration.']=true
+L['Minimun chance success under which ignore missions']=true
+L['Minum needed chance']=true
+L['Minumum requested success']=true
+L['Mission awaiting']=true
+L['Mission shown for follower']=true
+L['Mission time reduced!']=true
+L['Must reload interface to apply']=true
+L['No follower gained xp']=true
+L['No mission prefill']=true
+L['Nothing to report']=true
+L['Number of followers']=true
+L['Only first %1$d missions with over %2$d%% chance of success are shown']=true
+L['Only meaningful upgrades are shown']=true
+L['Original concept and interface by %s']=true
+L['Original method']=true
+L['Original sort restores original sorting method, whatever it was (If you have another addon sorting mission, it should kick in again)']=true
+L['Other useful followers']=true
+L['Processing mission %d of %d']=true
+L['Resource incremented!']=true
+L['Reward type']=true
+L['Right click to open ignore menu']=true
+L['Show Garrison Commander menu']=true
+L['Show next toon']=true
+L['Show the next toon whicg will complete a mission']=true
+L['Show upgrade options']=true
+L['Show weapon/armor level']=true
+L['Show xp to next level']=true
+L['Some follower']=true
+L['Sort missions by:']=true
+L['Submit all your mission at once. No question asked.']=true
+L['Success Chance']=true
+L['Time to next reset']=true
+L['To go: %d']=true
+L['Toggles Garrison Commander Menu Header on/off']=true
+L['Unchecking this will allow you to set specific success chance for each reward type']=true
+L['Unlock Panel']=true
+L['Update frequency']=true
+L['Upgrading to |cff00ff00%d|r']=true
+L['Use GC Interface']=true
+L['Use big screen']=true
+L['Use old interface']=true
+L['Uses the old, more intrusive interface']=true
+L['When checked, show on each follower button missing xp to next level']=true
+L['When checked, show on each follower button weapon and armor level for maxed followers']=true
+L['Xp incremented!']=true
+L['You are using an Alpha version of Garrison Commander. Please post bugs on Curse if you find them']=true
+L['You are wasting |cffff0000%d|cffffd200 point(s)!!!']=true
+L['You can also send mission one by one clicking on each button.']=true
+L['You can open the menu clicking on the icon in top right corner']=true
+L['You have ignored followers']=true
+L['You never performed this mission']=true
+L['You performed this mission %d times with a win ratio of']=true
+L['Your garrison cache size was increased to %d']=true
+8<------------------------------------------------------
+Total of 93 keys