diff --git a/data/kh/aaa_lirria/config.xml b/data/kh/aaa_lirria/config.xml index 12029510..26108044 100644 --- a/data/kh/aaa_lirria/config.xml +++ b/data/kh/aaa_lirria/config.xml @@ -2130,21 +2130,21 @@ This MUST follow the Enum MISSION_DESC::TIconId + value="UI:VARIABLES:USER:ChaScore2" /> + value="UI:VARIABLES:USER:ChaScore3" /> + value="UI:VARIABLES:USER:ChaScore4" /> diff --git a/data/ryz/ryz_zzz_bazaar/info_player.lua b/data/kh/aaa_lirria/info_player.lua similarity index 100% rename from data/ryz/ryz_zzz_bazaar/info_player.lua rename to data/kh/aaa_lirria/info_player.lua diff --git a/data/ryz/ryz_zzz_bazaar/interaction.xml b/data/kh/aaa_lirria/interaction.xml similarity index 99% rename from data/ryz/ryz_zzz_bazaar/interaction.xml rename to data/kh/aaa_lirria/interaction.xml index c3134dad..eb2f7ea3 100644 --- a/data/ryz/ryz_zzz_bazaar/interaction.xml +++ b/data/kh/aaa_lirria/interaction.xml @@ -373,7 +373,7 @@ posref="TL TL" color="214 56 7 255" text="uiHP" - val="%target_hp" /> + val="%target_ChaScore1" /> - + - + - + @@ -756,9 +756,9 @@ + color1="%sta_color" value1="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_ChaScore2" range1="UI:CONST:127" + color2="%sap_color" value2="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_ChaScore3" range2="UI:CONST:127" + color3="%hp_color" value3="SERVER:EXECUTE_PHRASE:LINK:#index:TARGET_ChaScore1" range3="UI:CONST:127" /> diff --git a/data/ryz/ryz_zzz_bazaar/player.lua b/data/kh/aaa_lirria/player.lua similarity index 92% rename from data/ryz/ryz_zzz_bazaar/player.lua rename to data/kh/aaa_lirria/player.lua index dcf54f4c..dadd25e5 100644 --- a/data/ryz/ryz_zzz_bazaar/player.lua +++ b/data/kh/aaa_lirria/player.lua @@ -47,57 +47,57 @@ end -- Update player bars in function of what we wants to display (we can hide each one of the 3 bars : sap,stamina and focus) function game:updatePlayerBars() - local dispSap = getDbProp('UI:SAVE:PLAYER:DISP_SAP'); - local dispSta = getDbProp('UI:SAVE:PLAYER:DISP_STA'); - local dispFoc = getDbProp('UI:SAVE:PLAYER:DISP_FOC'); + local dispChaScore3 = getDbProp('UI:SAVE:PLAYER:DISP_ChaScore3'); + local dispChaScore2 = getDbProp('UI:SAVE:PLAYER:DISP_ChaScore2'); + local dispChaScore4 = getDbProp('UI:SAVE:PLAYER:DISP_ChaScore4'); local ui = getUI('ui:interface:player:content'); -- active ui in function of what is displayed - ui.b_sap.active = (dispSap == 1); - ui.jsap.active = (dispSap == 1); + ui.b_ChaScore3.active = (dispChaScore3 == 1); + ui.jChaScore3.active = (dispChaScore3 == 1); - ui.b_sta.active = (dispSta == 1); - ui.jsta.active = (dispSta == 1); + ui.b_ChaScore2.active = (dispChaScore2 == 1); + ui.jChaScore2.active = (dispChaScore2 == 1); - ui.b_foc.active = (dispFoc == 1); - ui.jfoc.active = (dispFoc == 1); + ui.b_ChaScore4.active = (dispChaScore4 == 1); + ui.jChaScore4.active = (dispChaScore4 == 1); -- choose good y-position local totalBarDisp = dispSap + dispSta + dispFoc; if (totalBarDisp == 3) then - ui.b_sap.y = -20; - ui.b_sta.y = -35; - ui.b_foc.y = -50; + ui.b_ChaScore3.y = -20; + ui.b_ChaScore2.y = -35; + ui.b_ChaScore4.y = -50; ui.current_action.y = -65; elseif (totalBarDisp == 2) then - if (dispSap == 0) then - ui.b_sta.y = -20; + if (dispChaScore3 == 0) then + ui.b_ChaScore2.y = -20; + ui.b_ChaScore4.y = -35; + end + + if (dispChaScore2 == 0) then + ui.b_ChaScore3.y = -20; ui.b_foc.y = -35; end - if (dispSta == 0) then - ui.b_sap.y = -20; - ui.b_foc.y = -35; - end - - if (dispFoc == 0) then - ui.b_sap.y = -20; - ui.b_sta.y = -35; + if (dispChaScore4 == 0) then + ui.b_ChaScore3.y = -20; + ui.b_ChaScore2.y = -35; end ui.current_action.y = -50; elseif (totalBarDisp == 1) then - ui.b_sta.y = -20; - ui.b_foc.y = -20; - ui.b_sta.y = -20; + ui.b_ChaScore2.y = -20; + ui.b_ChaScore4.y = -20; + ui.b_ChaScore2.y = -20; ui.current_action.y = -35; @@ -864,10 +864,10 @@ function game:updatePhraseTooltip(phrase) text = concatUCString(text, "@{CCCF}") end -- IMPORTANT : the following getters on 'phrase' take in account the 'total action malus' for the timebeing - self:setPhraseTooltipCarac(ttWin, "hp_cost", phrase:getHpCost()) - self:setPhraseTooltipCarac(ttWin, "sta_cost", phrase:getStaCost()) - self:setPhraseTooltipCarac(ttWin, "sap_cost", phrase:getSapCost()) - self:setPhraseTooltipCarac(ttWin, "focus_cost", phrase:getFocusCost()) + self:setPhraseTooltipCarac(ttWin, "ChaScore1_cost", phrase:getChaScore1Cost()) + self:setPhraseTooltipCarac(ttWin, "ChaScore3_cost", phrase:getChaScore3Cost()) + self:setPhraseTooltipCarac(ttWin, "ChaScore2_cost", phrase:getChaScore2Cost()) + self:setPhraseTooltipCarac(ttWin, "ChaScore4_cost", phrase:getChascore4Cost()) self:setPhraseTooltipCarac(ttWin, "cast_time", phrase:getCastTime(), concatUCString(string.format("%.1f", phrase:getCastTime()), i18n.get("uittSeconds"))) local castRange = phrase:getCastRange() if not phrase:isMagicPhrase() then @@ -935,10 +935,10 @@ function game:updateBuffItemTooltip(buffItem) local ttWin = getUI("ui:interface:buff_item_context_help") local text = buffItem:getName() - self:setPhraseTooltipCarac(ttWin, "hp_buff", buffItem:getHpBuff()) - self:setPhraseTooltipCarac(ttWin, "sta_buff", buffItem:getStaBuff()) - self:setPhraseTooltipCarac(ttWin, "sap_buff", buffItem:getSapBuff()) - self:setPhraseTooltipCarac(ttWin, "focus_buff", buffItem:getFocusBuff()) + self:setPhraseTooltipCarac(ttWin, "ChaScore1_buff", buffItem:getChaScore1Buff()) + self:setPhraseTooltipCarac(ttWin, "ChaScore2_buff", buffItem:getChaScore2Buff()) + self:setPhraseTooltipCarac(ttWin, "ChaScore3_buff", buffItem:getChaScore3Buff()) + self:setPhraseTooltipCarac(ttWin, "ChaScore4_buff", buffItem:getChaScore4Buff()) updateTooltipCoords() return text diff --git a/data/ryz/ryz_zzz_bazaar/player.xml b/data/kh/aaa_lirria/player.xml similarity index 99% rename from data/ryz/ryz_zzz_bazaar/player.xml rename to data/kh/aaa_lirria/player.xml index dc3d8598..8362a13c 100644 --- a/data/ryz/ryz_zzz_bazaar/player.xml +++ b/data/kh/aaa_lirria/player.xml @@ -199,17 +199,17 @@ + params="dblink=UI:SAVE:PLAYER:DISP_ChaScore3|value=not(@UI:SAVE:PLAYER:DISP_ChaScore3)" /> + params="dblink=UI:SAVE:PLAYER:DISP_ChaScore2|value=not(@UI:SAVE:PLAYER:DISP_ChaScore2)" /> + params="dblink=UI:SAVE:PLAYER:DISP_ChaScore4|value=not(@UI:SAVE:PLAYER:DISP_ChaScore4)" /> - - - - - + + + + @@ -169,10 +169,10 @@ - - - - + + + + @@ -183,7 +183,7 @@ - + @@ -233,9 +233,9 @@ - - - + + + @@ -329,7 +329,7 @@ - + @@ -472,4 +472,4 @@ - \ No newline at end of file + diff --git a/data/kh/kh_interfaces/game_config.xml b/data/kh/kh_interfaces/game_config.xml index b648eec9..2b06d392 100644 --- a/data/kh/kh_interfaces/game_config.xml +++ b/data/kh/kh_interfaces/game_config.xml @@ -2042,7 +2042,7 @@ x="0" y="-4" /> @@ -3548,25 +3548,25 @@ widget="boolbut" link="UI:SAVE:INSCENE:USER:GUILD_NAME" realtime="true" /> - - - - diff --git a/data/ryz/ryz_interfaces/launcher_bg.dds b/data/ryz/ryz_interfaces/launcher_bg.dds deleted file mode 100644 index 4e4e85f4..00000000 Binary files a/data/ryz/ryz_interfaces/launcher_bg.dds and /dev/null differ