Changed: Removed some semicolons in Lua when useless
This commit is contained in:
parent
b86637ad56
commit
7d23cd6f52
6 changed files with 55 additions and 55 deletions
|
@ -32,7 +32,7 @@ end
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------
|
||||||
function bgdownloader:setIcon(icon)
|
function bgdownloader:setIcon(icon)
|
||||||
local bm = self:getProgressGroup():find("bm");
|
local bm = self:getProgressGroup():find("bm")
|
||||||
if icon == "" then
|
if icon == "" then
|
||||||
bm.active = false
|
bm.active = false
|
||||||
else
|
else
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------
|
||||||
-- create the game namespace without reseting if already created in an other file.
|
-- create the game namespace without reseting if already created in an other file.
|
||||||
if (game==nil) then
|
if (game==nil) then
|
||||||
game= {};
|
game = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
@ -12,14 +12,14 @@ end
|
||||||
-- called to construct guild flags background in the modal window
|
-- called to construct guild flags background in the modal window
|
||||||
function game:bcCreateGuildInitFlags()
|
function game:bcCreateGuildInitFlags()
|
||||||
|
|
||||||
local ui = getUICaller();
|
local ui = getUICaller()
|
||||||
|
|
||||||
for i = 0,14 do
|
for i = 0,14 do
|
||||||
local uiBack = getUI(getUIId(ui) .. ':back' .. i);
|
local uiBack = getUI(getUIId(ui) .. ':back' .. i)
|
||||||
uiBack.image1.back = i+1;
|
uiBack.image1.back = i+1
|
||||||
uiBack.image1.symbol = 0;
|
uiBack.image1.symbol = 0
|
||||||
uiBack.image1.color1 = runExpr('makeRGB(255,255,255)');
|
uiBack.image1.color1 = runExpr('makeRGB(255,255,255)')
|
||||||
uiBack.image1.color2 = runExpr('makeRGB(0,0,0)');
|
uiBack.image1.color2 = runExpr('makeRGB(0,0,0)')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -28,37 +28,37 @@ end
|
||||||
-- trap some parts should be deprecated ... try to clean it up
|
-- trap some parts should be deprecated ... try to clean it up
|
||||||
function game:bcMissionsUpdate()
|
function game:bcMissionsUpdate()
|
||||||
|
|
||||||
local mt = getDbProp('UI:TEMP:MISSION:MISSION_TYPE');
|
local mt = getDbProp('UI:TEMP:MISSION:MISSION_TYPE')
|
||||||
|
|
||||||
-- init bot_chat_missions title
|
-- init bot_chat_missions title
|
||||||
local title = 'uiBotChatMissions';
|
local title = 'uiBotChatMissions'
|
||||||
if (mt == 3) then title = 'uiBotChatZCCharges';
|
if (mt == 3) then title = 'uiBotChatZCCharges'
|
||||||
elseif (mt == 4) then title = 'uiBotChatBuilding';
|
elseif (mt == 4) then title = 'uiBotChatBuilding'
|
||||||
elseif (mt == 5) then title = 'uiBotChatRMBuy';
|
elseif (mt == 5) then title = 'uiBotChatRMBuy'
|
||||||
elseif (mt == 6) then title = 'uiBotChatRMUpgrade';
|
elseif (mt == 6) then title = 'uiBotChatRMUpgrade'
|
||||||
end
|
end
|
||||||
local ui = getUI('ui:interface:bot_chat_missions');
|
local ui = getUI('ui:interface:bot_chat_missions')
|
||||||
ui.title = title;
|
ui.title = title
|
||||||
|
|
||||||
-- init desc
|
-- init desc
|
||||||
title = 'uiSelectMission';
|
title = 'uiSelectMission'
|
||||||
if (mt == 3) then title = 'uiSelectZCCharge';
|
if (mt == 3) then title = 'uiSelectZCCharge'
|
||||||
elseif (mt == 4) then title = 'uiSelectBuilding';
|
elseif (mt == 4) then title = 'uiSelectBuilding'
|
||||||
elseif (mt == 5) then title = 'uiSelectRMBuy';
|
elseif (mt == 5) then title = 'uiSelectRMBuy'
|
||||||
elseif (mt == 6) then title = 'uiSelectRMUpgrade';
|
elseif (mt == 6) then title = 'uiSelectRMUpgrade'
|
||||||
end
|
end
|
||||||
ui.header_opened.mission_title.hardtext = title;
|
ui.header_opened.mission_title.hardtext = title
|
||||||
|
|
||||||
ui.header_opened.zc_duty.active = (mt == 3);
|
ui.header_opened.zc_duty.active = (mt == 3)
|
||||||
ui.header_opened.xp_guild.active = ((mt == 5) or (mt == 6));
|
ui.header_opened.xp_guild.active = ((mt == 5) or (mt == 6))
|
||||||
|
|
||||||
-- init bot_chat_accept_mission title
|
-- init bot_chat_accept_mission title
|
||||||
title = 'uiAcceptMission';
|
title = 'uiAcceptMission'
|
||||||
if (mt == 3) then title = 'uiAcceptZCCharge';
|
if (mt == 3) then title = 'uiAcceptZCCharge'
|
||||||
elseif (mt == 4) then title = 'uiAcceptBuilding';
|
elseif (mt == 4) then title = 'uiAcceptBuilding'
|
||||||
elseif (mt == 5) then title = 'uiAcceptRMBuy';
|
elseif (mt == 5) then title = 'uiAcceptRMBuy'
|
||||||
elseif (mt == 6) then title = 'uiAcceptRMUpgrade';
|
elseif (mt == 6) then title = 'uiAcceptRMUpgrade'
|
||||||
end
|
end
|
||||||
ui = getUI('ui:interface:bot_chat_accept_mission');
|
ui = getUI('ui:interface:bot_chat_accept_mission')
|
||||||
ui.title = title;
|
ui.title = title;
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,36 +3,36 @@
|
||||||
------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------
|
||||||
-- create the game namespace without reseting if already created in an other file.
|
-- create the game namespace without reseting if already created in an other file.
|
||||||
if (help==nil) then
|
if (help==nil) then
|
||||||
help= {};
|
help = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------
|
||||||
--
|
--
|
||||||
function help:closeCSBrowserHeader()
|
function help:closeCSBrowserHeader()
|
||||||
local ui = getUI('ui:interface:cs_browser');
|
local ui = getUI('ui:interface:cs_browser')
|
||||||
|
|
||||||
-- save size
|
-- save size
|
||||||
ui_cs_browser_h = ui.h;
|
ui_cs_browser_h = ui.h
|
||||||
ui_cs_browser_w = ui.w;
|
ui_cs_browser_w = ui.w
|
||||||
|
|
||||||
-- reduce window size
|
-- reduce window size
|
||||||
ui.pop_min_h = 32;
|
ui.pop_min_h = 32
|
||||||
ui.h = 0;
|
ui.h = 0
|
||||||
ui.w = 216;
|
ui.w = 216
|
||||||
end
|
end
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------
|
||||||
--
|
--
|
||||||
function help:openCSBrowserHeader()
|
function help:openCSBrowserHeader()
|
||||||
local ui = getUI('ui:interface:cs_browser');
|
local ui = getUI('ui:interface:cs_browser')
|
||||||
ui.pop_min_h = 96;
|
ui.pop_min_h = 96
|
||||||
|
|
||||||
-- set size from saved values
|
-- set size from saved values
|
||||||
if (ui_cs_browser_h ~= nil) then
|
if (ui_cs_browser_h ~= nil) then
|
||||||
ui.h = ui_cs_browser_h;
|
ui.h = ui_cs_browser_h
|
||||||
end
|
end
|
||||||
|
|
||||||
if (ui_cs_browser_w ~= nil) then
|
if (ui_cs_browser_w ~= nil) then
|
||||||
ui.w = ui_cs_browser_w;
|
ui.w = ui_cs_browser_w
|
||||||
end
|
end
|
||||||
end
|
end
|
|
@ -109,7 +109,7 @@ function game.RingAccessPointFilter:validate()
|
||||||
if config.Local == 1 then
|
if config.Local == 1 then
|
||||||
ucUrl = ucstring(NicoMagicURL) -- for test in local mode
|
ucUrl = ucstring(NicoMagicURL) -- for test in local mode
|
||||||
else
|
else
|
||||||
ucUrl = getDynString(game.NpcWebPage.UrlTextId);
|
ucUrl = getDynString(game.NpcWebPage.UrlTextId)
|
||||||
end
|
end
|
||||||
debugInfo(tostring(ucUrl))
|
debugInfo(tostring(ucUrl))
|
||||||
local utf8Url = ucUrl:toUtf8()
|
local utf8Url = ucUrl:toUtf8()
|
||||||
|
|
|
@ -2,39 +2,39 @@
|
||||||
------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------
|
||||||
-- create the game namespace without reseting if already created in an other file.
|
-- create the game namespace without reseting if already created in an other file.
|
||||||
if (game==nil) then
|
if (game==nil) then
|
||||||
game= {};
|
game = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------
|
||||||
--
|
--
|
||||||
function game:getMilkoTooltipWithKey(prop, tooltip, tooltip_pushed, name, param)
|
function game:getMilkoTooltipWithKey(prop, tooltip, tooltip_pushed, name, param)
|
||||||
local tt;
|
local tt
|
||||||
|
|
||||||
-- Check if button is toggled and choose the good tooltip
|
-- Check if button is toggled and choose the good tooltip
|
||||||
if (prop ~= '' and tooltip_pushed ~= '') then
|
if (prop ~= '' and tooltip_pushed ~= '') then
|
||||||
local db = getDbProp(prop);
|
local db = getDbProp(prop)
|
||||||
if (db == 1) then
|
if (db == 1) then
|
||||||
tt = tooltip_pushed;
|
tt = tooltip_pushed
|
||||||
else
|
else
|
||||||
tt = tooltip;
|
tt = tooltip
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
tt = tooltip;
|
tt = tooltip;
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Get key shortcut
|
-- Get key shortcut
|
||||||
local text = i18n.get(tt);
|
local text = i18n.get(tt)
|
||||||
local key = runExpr('getKey(\'' .. name .. '\',\'' .. param .. '\',1)');
|
local key = runExpr('getKey(\'' .. name .. '\',\'' .. param .. '\',1)')
|
||||||
|
|
||||||
if (key ~= nil and key ~= '') then
|
if (key ~= nil and key ~= '') then
|
||||||
key = ' @{2F2F}(' .. key .. ')';
|
key = ' @{2F2F}(' .. key .. ')'
|
||||||
text = concatUCString(text, key);
|
text = concatUCString(text, key)
|
||||||
end
|
end
|
||||||
|
|
||||||
setContextHelpText(text);
|
setContextHelpText(text)
|
||||||
end
|
end
|
||||||
|
|
||||||
function game:taskbarDisableTooltip(ui)
|
function game:taskbarDisableTooltip(ui)
|
||||||
local uiGroup = getUI(ui);
|
local uiGroup = getUI(ui)
|
||||||
disableContextHelpForControl(uiGroup);
|
disableContextHelpForControl(uiGroup)
|
||||||
end
|
end
|
|
@ -180,7 +180,7 @@ function webig:doRemoveDbSheetQuantity(sheet_list, ctrl)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--assert(nil, "RELOADABLE SCRIPT");
|
--assert(nil, "RELOADABLE SCRIPT")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue