Exiles/coa-details
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

- Warlock mana from Life Tap won't show up any more under mana regen, this makes easy to see Soul Shard gain.

Browse Source 
- Due to a framework update, typing the value on a slider shouldn't round the value up.
This commit is contained in:
Tercio
2018-01-26 14:07:43 -02:00
parent 984db015fc
commit 6036cfcdb6
5 changed files with 59 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/DF/cooltip.lua
+10 -6
View File
@@ -1623,7 +1623,7 @@ function DF:CreateCoolTip()
end
end
if (CoolTip.OptionsTable.FixedHeight) then
frame1:SetHeight (CoolTip.OptionsTable.FixedHeight)
else
@@ -1683,6 +1683,7 @@ function DF:CreateCoolTip()
frame1:ClearAllPoints()
local anchor = CoolTip.OptionsTable.Anchor or CoolTip.Host
frame1:SetPoint (CoolTip.OptionsTable.MyAnchor, anchor, CoolTip.OptionsTable.RelativeAnchor, 0 + moveX + CoolTip.OptionsTable.WidthAnchorMod, 10 + CoolTip.OptionsTable.HeightAnchorMod + moveY)
if (not x_mod) then
@@ -1850,12 +1851,12 @@ function DF:CreateCoolTip()
function CoolTip:SetHost (frame, myPoint, hisPoint, x, y)
--> check data integrity
if (type (frame) ~= "table" or not frame.GetObjectType) then
print ("host need to be a frame")
print ("host needs to be a frame")
return --> error
end
CoolTip.Host = frame
CoolTip.frame1:SetFrameLevel (frame:GetFrameLevel()+1)
--> defaults
@@ -2964,6 +2965,11 @@ function DF:CreateCoolTip()
CoolTip:SetColor ("main", host.CoolTip.MainColor or "transparent")
CoolTip:SetColor ("sec", host.CoolTip.SubColor or "transparent")
local okay, errortext = pcall (host.CoolTip.BuildFunc, host, host.CoolTip and host.CoolTip.FixedValue) --resetting anchors
if (not okay) then
print ("Cooltip Injected Fucntion Error:", errortext)
end
CoolTip:SetOwner (host, host.CoolTip.MyAnchor, host.CoolTip.HisAnchor, host.CoolTip.X, host.CoolTip.Y)
local options = host.CoolTip.Options
@@ -2976,15 +2982,13 @@ function DF:CreateCoolTip()
end
end
host.CoolTip.BuildFunc()
if (CoolTip.Indexes == 0) then
if (host.CoolTip.Default) then
CoolTip:SetType ("tooltip")
CoolTip:AddLine (host.CoolTip.Default, nil, 1, "white")
end
end
CoolTip:ShowCooltip()
if (fromClick) then
Libs/DF/fw.lua
+1 -1
View File
@@ -1,5 +1,5 @@
local dversion = 63
local dversion = 65
local major, minor = "DetailsFramework-1.0", dversion
local DF, oldminor = LibStub:NewLibrary (major, minor)
Libs/DF/slider.lua
+34 -13
View File
@@ -583,6 +583,25 @@ local DFSliderMetaFunctions = _G [DF.GlobalWidgetControlNames ["slider"]]
self:SetScript ("OnUpdate", on_update)
end)
local do_precision = function (text)
if (type (text) == "string" and text:find ("%.")) then
local left, right = strsplit (".", text)
left = tonumber (left)
right = tonumber (right)
if (left and right) then
local newString = tostring (left) .. "." .. tostring (right)
local newNumber = tonumber (newString)
if (newNumber) then
return newNumber
end
end
end
return tonumber (text)
end
function DFSliderMetaFunctions:TypeValue()
if (not self.isSwitch) then
@@ -601,24 +620,20 @@ local DFSliderMetaFunctions = _G [DF.GlobalWidgetControlNames ["slider"]]
editbox:ClearFocus()
editbox:Hide()
editbox:GetParent().MyObject.typing_value = false
editbox:GetParent().MyObject.value = tonumber (editbox:GetText())
editbox:GetParent().MyObject.value = tonumber (editbox:GetText()) --do_precision (editbox:GetText())
end)
editbox:SetScript ("OnEscapePressed", function()
editbox:ClearFocus()
editbox:Hide()
editbox:GetParent().MyObject.typing_value = false
editbox:GetParent().MyObject.value = tonumber (self.typing_value_started)
editbox:GetParent().MyObject.value = self.typing_value_started --do_precision (self.typing_value_started)
end)
editbox:SetScript ("OnTextChanged", function()
editbox:GetParent().MyObject.typing_can_change = true
editbox:GetParent().MyObject.value = tonumber (editbox:GetText())
editbox:GetParent().MyObject.value = tonumber (editbox:GetText()) --do_precision
editbox:GetParent().MyObject.typing_can_change = false
-- esse self fica como o primeiro a ser alterado
--print ("text changed", self:GetName())
--print ()
end)
DFSliderMetaFunctions.editbox_typevalue = editbox
@@ -703,14 +718,14 @@ local DFSliderMetaFunctions = _G [DF.GlobalWidgetControlNames ["slider"]]
if (slider.MyObject.useDecimals) then
amt = slider:GetValue()
else
amt = _math_floor (slider:GetValue())
amt = do_precision (slider:GetValue())
end
if (slider.MyObject.typing_value and not slider.MyObject.typing_can_change) then
slider.MyObject:SetValue (slider.MyObject.typing_value_started)
return
end
table_insert (slider.MyObject.previous_value, 1, amt)
table_remove (slider.MyObject.previous_value, 4)
@@ -910,7 +925,7 @@ function DF:NewSwitch (parent, container, name, member, w, h, ltext, rtext, defa
if (not container) then
container = parent
end
--> defaults
ltext = ltext or "OFF"
rtext = rtext or "ON"
@@ -1096,11 +1111,18 @@ function DF:NewSlider (parent, container, name, member, w, h, min, max, step, de
--> default members:
SliderObject.lockdown = false
SliderObject.container = container
SliderObject.useDecimals = isDecemal or false
SliderObject.slider = CreateFrame ("slider", name, parent)
SliderObject.widget = SliderObject.slider
SliderObject.useDecimals = isDecemal or false
if (SliderObject.useDecimals) then
SliderObject.slider:SetValueStep (0.01)
else
SliderObject.slider:SetValueStep (step)
end
if (not APISliderFunctions) then
APISliderFunctions = true
local idx = getmetatable (SliderObject.slider).__index
@@ -1119,7 +1141,6 @@ function DF:NewSlider (parent, container, name, member, w, h, min, max, step, de
SliderObject.slider:SetHeight (h)
SliderObject.slider:SetOrientation ("horizontal")
SliderObject.slider:SetMinMaxValues (min, max)
SliderObject.slider:SetValueStep (step)
SliderObject.slider:SetValue (defaultv)
SliderObject.ivalue = defaultv
boot.lua
+4 -5
View File
File diff suppressed because one or more lines are too long
core/parser.lua
+10 -2
View File
@@ -163,6 +163,9 @@
local SPELLID_PALADIN_GBOM_AURA = 203528
local SPELLID_PALADIN_GBOM_DAMAGE = 205729
--> ignore warlock life tap, since it's bugged
local SPELLID_WARLOCK_LIFETAP = 1454
local SPELLNAME_SHAMAN_SLASH = GetSpellInfo (195222)
local SPELLNAME_PALADIN_GBOM = GetSpellInfo (203528)
@@ -2631,6 +2634,11 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
elseif (not alvo_name) then
return
end
--> ignore warlock life tap
if (spellid == SPELLID_WARLOCK_LIFETAP) then
return
end
------------------------------------------------------------------------------------------------
--> check if is energy or resource
@@ -2655,8 +2663,8 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
--Player-3208-0A085522,"Licelystiri-Nemesis",0x511,0x0,
--Player-3208-0A085522,"Licelystiri-Nemesis",0x511,0x0,
--162243,"Demon's Bite",0x1,Player-3208-0A085522,0000000000000000,233158,242700,3555,662,17,70,100,0,1030.46,3134.93,660,28,0,17,100
------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------
--> get actors
--> main actor