from retail

This commit is contained in:
Bunny67
2021-03-07 15:37:49 +03:00
parent 64f04c387a
commit b3be159906
4 changed files with 47 additions and 25 deletions
+12 -12
View File
@@ -1911,25 +1911,25 @@ local function createScanFunc(trigger)
if use_tooltip and trigger.tooltip_operator and trigger.tooltip then
if trigger.tooltip_operator == "==" then
local ret2 = [[
if not matchData.tooltip or not matchData.tooltip == %q then
if not matchData.tooltip or not matchData.tooltip == %s then
return false
end
]]
ret = ret .. ret2:format(trigger.tooltip)
ret = ret .. ret2:format(Private.QuotedString(trigger.tooltip))
elseif trigger.tooltip_operator == "find('%s')" then
local ret2 = [[
if not matchData.tooltip or not matchData.tooltip:find(%q) then
if not matchData.tooltip or not matchData.tooltip:find(%s, 1, true) then
return false
end
]]
ret = ret .. ret2:format(trigger.tooltip)
ret = ret .. ret2:format(Private.QuotedString(trigger.tooltip))
elseif trigger.tooltip_operator == "match('%s')" then
local ret2 = [[
if not matchData.tooltip or not matchData.tooltip:match(%q) then
if not matchData.tooltip or not matchData.tooltip:match(%s) then
return false
end
]]
ret = ret .. ret2:format(trigger.tooltip)
ret = ret .. ret2:format(Private.QuotedString(trigger.tooltip))
end
end
@@ -1946,25 +1946,25 @@ local function createScanFunc(trigger)
if trigger.useNamePattern and trigger.namePattern_operator and trigger.namePattern_name then
if trigger.namePattern_operator == "==" then
local ret2 = [[
if not matchData.name == %q then
if not matchData.name == %s then
return false
end
]]
ret = ret .. ret2:format(trigger.namePattern_name)
ret = ret .. ret2:format(Private.QuotedString(trigger.namePattern_name))
elseif trigger.namePattern_operator == "find('%s')" then
local ret2 = [[
if not matchData.name:find(%q) then
if not matchData.name:find(%s, 1, true) then
return false
end
]]
ret = ret .. ret2:format(trigger.namePattern_name)
ret = ret .. ret2:format(Private.QuotedString(trigger.namePattern_name))
elseif trigger.namePattern_operator == "match('%s')" then
local ret2 = [[
if not matchData.name:match(%q) then
if not matchData.name:match(%s) then
return false
end
]]
ret = ret .. ret2:format(trigger.namePattern_name)
ret = ret .. ret2:format(Private.QuotedString(trigger.namePattern_name))
end
end