From 921a88062ed6f236593017b268f9000e40bf083a Mon Sep 17 00:00:00 2001 From: deed Date: Fri, 14 Oct 2016 18:29:29 +0200 Subject: [PATCH] mise a jour des data clients v3 --- data/kh/kh_interfaces/config.xml | 2 + data/kh/kh_interfaces/game_config.xml | 8 +- data/kh/kh_interfaces/guild.xml | 2 +- data/kh/kh_interfaces/help.xml | 101 ++++---- data/kh/kh_interfaces/info_player.lua | 2 +- data/kh/kh_interfaces/macros.xml | 12 +- data/kh/kh_interfaces/player.xml | 2 +- data/kh/kh_interfaces/reset.xml | 8 +- data/kh/kh_interfaces/widgets.xml | 278 ++++++++++++++++++++-- data/ryz/ryz_zzz_bazaar/bg_downloader.lua | 2 +- data/ryz/ryz_zzz_bazaar/bot_chat_v4.lua | 58 ++--- 11 files changed, 369 insertions(+), 106 deletions(-) diff --git a/data/kh/kh_interfaces/config.xml b/data/kh/kh_interfaces/config.xml index 036f2585..ff606e67 100644 --- a/data/kh/kh_interfaces/config.xml +++ b/data/kh/kh_interfaces/config.xml @@ -1916,6 +1916,8 @@ This MUST follow the Enum MISSION_DESC::TIconId value="basic.ttf" /> --> + + case_mode="%case_normal" /> @@ -199,7 +199,7 @@ x="-15" y="10" posref="BM BM" - text_y="-2" + text_y="-0" onclick_l="proc" params_l="active_hardware_cursor" hardtext="uiYes" /> @@ -208,7 +208,7 @@ y="0" posparent="active_ok" posref="BR BL" - text_y="-2" + text_y="-0" onclick_l="proc" params_l="close_hardware_cursor" hardtext="uiNo" /> @@ -316,7 +316,7 @@ x="0" y="6" posref="BM BM" - text_y="-2" + text_y="-0" onclick_l="proc" params_l="universe_chanel_warning_close" hardtext="uittOK" /> @@ -356,9 +356,9 @@ @@ -463,9 +464,9 @@ @@ -863,10 +864,8 @@ - + value="https://app.khaganat.net/ams/" /> - - - - - - + + + + + + + + + @@ -2809,7 +2830,7 @@ global_color_normal="true" global_color_over="true" global_color_pushed="true" - text_y="-2" + text_y="-0" fontsize="10" shadow="true" case_mode="%case_upper" @@ -2868,21 +2889,21 @@ x="4" y="0" posref="TL TL" - text_y="-2" + text_y="-0" onclick_l="proc" params_l="proc_stat_report_yes" hardtext="uiYes" /> - - + + + + + - \ No newline at end of file + diff --git a/data/kh/kh_interfaces/player.xml b/data/kh/kh_interfaces/player.xml index f630ba8b..34ae3afa 100644 --- a/data/kh/kh_interfaces/player.xml +++ b/data/kh/kh_interfaces/player.xml @@ -218,7 +218,7 @@ - + diff --git a/data/kh/kh_interfaces/reset.xml b/data/kh/kh_interfaces/reset.xml index 986fec14..c82ba211 100644 --- a/data/kh/kh_interfaces/reset.xml +++ b/data/kh/kh_interfaces/reset.xml @@ -91,7 +91,11 @@ - + + + + + @@ -321,14 +325,12 @@ - - diff --git a/data/kh/kh_interfaces/widgets.xml b/data/kh/kh_interfaces/widgets.xml index 9aa7b020..cca61af5 100644 --- a/data/kh/kh_interfaces/widgets.xml +++ b/data/kh/kh_interfaces/widgets.xml @@ -1702,7 +1702,7 @@ color_grayed="255 255 255 64" shadow_color_grayed="0 0 0 255" highlight_over="255 255 255 150" - case_mode="%case_first_word_letter_up"> + case_mode="%case_normal"> @@ -1767,7 +1767,7 @@ name="uiOpen" handler="item_text_display" params="ui:interface:edit_custom" /> - + @@ -1991,7 +1991,7 @@ posparent="box1" posref="MR MR" x="-3" - y="-2" + y="0" color="135 243 28 255" shadow="true" fontsize="10" @@ -2004,7 +2004,7 @@ posparent="box1" posref="MR MR" x="-3" - y="-3" + y="0" color="192 192 192 255" shadow="true" fontsize="10" @@ -2619,7 +2619,7 @@ + + + + + + + + + + + diff --git a/data/ryz/ryz_zzz_bazaar/bg_downloader.lua b/data/ryz/ryz_zzz_bazaar/bg_downloader.lua index c2569b30..161012d9 100644 --- a/data/ryz/ryz_zzz_bazaar/bg_downloader.lua +++ b/data/ryz/ryz_zzz_bazaar/bg_downloader.lua @@ -32,7 +32,7 @@ end ------------------------------------------------------------------------------------------------------------ function bgdownloader:setIcon(icon) - local bm = self:getProgressGroup():find("bm"); + local bm = self:getProgressGroup():find("bm") if icon == "" then bm.active = false else diff --git a/data/ryz/ryz_zzz_bazaar/bot_chat_v4.lua b/data/ryz/ryz_zzz_bazaar/bot_chat_v4.lua index 2b9d8fb3..f0b3ec91 100644 --- a/data/ryz/ryz_zzz_bazaar/bot_chat_v4.lua +++ b/data/ryz/ryz_zzz_bazaar/bot_chat_v4.lua @@ -4,7 +4,7 @@ ------------------------------------------------------------------------------------------------------------ -- create the game namespace without reseting if already created in an other file. if (game==nil) then - game= {}; + game = {} end @@ -12,14 +12,14 @@ end -- called to construct guild flags background in the modal window function game:bcCreateGuildInitFlags() - local ui = getUICaller(); + local ui = getUICaller() for i = 0,14 do - local uiBack = getUI(getUIId(ui) .. ':back' .. i); - uiBack.image1.back = i+1; - uiBack.image1.symbol = 0; - uiBack.image1.color1 = runExpr('makeRGB(255,255,255)'); - uiBack.image1.color2 = runExpr('makeRGB(0,0,0)'); + local uiBack = getUI(getUIId(ui) .. ':back' .. i) + uiBack.image1.back = i+1 + uiBack.image1.symbol = 0 + uiBack.image1.color1 = runExpr('makeRGB(255,255,255)') + uiBack.image1.color2 = runExpr('makeRGB(0,0,0)') end end @@ -28,37 +28,37 @@ end -- trap some parts should be deprecated ... try to clean it up function game:bcMissionsUpdate() - local mt = getDbProp('UI:TEMP:MISSION:MISSION_TYPE'); + local mt = getDbProp('UI:TEMP:MISSION:MISSION_TYPE') -- init bot_chat_missions title - local title = 'uiBotChatMissions'; - if (mt == 3) then title = 'uiBotChatZCCharges'; - elseif (mt == 4) then title = 'uiBotChatBuilding'; - elseif (mt == 5) then title = 'uiBotChatRMBuy'; - elseif (mt == 6) then title = 'uiBotChatRMUpgrade'; + local title = 'uiBotChatMissions' + if (mt == 3) then title = 'uiBotChatZCCharges' + elseif (mt == 4) then title = 'uiBotChatBuilding' + elseif (mt == 5) then title = 'uiBotChatRMBuy' + elseif (mt == 6) then title = 'uiBotChatRMUpgrade' end - local ui = getUI('ui:interface:bot_chat_missions'); - ui.title = title; + local ui = getUI('ui:interface:bot_chat_missions') + ui.title = title -- init desc - title = 'uiSelectMission'; - if (mt == 3) then title = 'uiSelectZCCharge'; - elseif (mt == 4) then title = 'uiSelectBuilding'; - elseif (mt == 5) then title = 'uiSelectRMBuy'; - elseif (mt == 6) then title = 'uiSelectRMUpgrade'; + title = 'uiSelectMission' + if (mt == 3) then title = 'uiSelectZCCharge' + elseif (mt == 4) then title = 'uiSelectBuilding' + elseif (mt == 5) then title = 'uiSelectRMBuy' + elseif (mt == 6) then title = 'uiSelectRMUpgrade' 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.xp_guild.active = ((mt == 5) or (mt == 6)); + ui.header_opened.zc_duty.active = (mt == 3) + ui.header_opened.xp_guild.active = ((mt == 5) or (mt == 6)) -- init bot_chat_accept_mission title - title = 'uiAcceptMission'; - if (mt == 3) then title = 'uiAcceptZCCharge'; - elseif (mt == 4) then title = 'uiAcceptBuilding'; - elseif (mt == 5) then title = 'uiAcceptRMBuy'; - elseif (mt == 6) then title = 'uiAcceptRMUpgrade'; + title = 'uiAcceptMission' + if (mt == 3) then title = 'uiAcceptZCCharge' + elseif (mt == 4) then title = 'uiAcceptBuilding' + elseif (mt == 5) then title = 'uiAcceptRMBuy' + elseif (mt == 6) then title = 'uiAcceptRMUpgrade' end - ui = getUI('ui:interface:bot_chat_accept_mission'); + ui = getUI('ui:interface:bot_chat_accept_mission') ui.title = title; end