diff --git a/data/ryz/ryz_ring/r2_core_user_component_manager.lua b/data/ryz/ryz_ring/r2_core_user_component_manager.lua
index 6769d503..4aa44548 100644
--- a/data/ryz/ryz_ring/r2_core_user_component_manager.lua
+++ b/data/ryz/ryz_ring/r2_core_user_component_manager.lua
@@ -1116,7 +1116,7 @@ function userComponentManager:export(list, refX, refY, refZ)
messageBox(i18n.get("uiR2EDInvalidName"))
return
end
- if string.find(form.ComponentFileName, '\.lua', -4) == nil then
+ if string.find(form.ComponentFileName, '.lua', -4) == nil then
form.ComponentFileName = form.ComponentFileName .. ".lua"
end
local refPosition = form.RefPosition
diff --git a/data/ryz/ryz_ring/r2_debug.lua b/data/ryz/ryz_ring/r2_debug.lua
index 6a63b547..78501dca 100644
--- a/data/ryz/ryz_ring/r2_debug.lua
+++ b/data/ryz/ryz_ring/r2_debug.lua
@@ -140,7 +140,8 @@ end
function assert(cond)
if not cond then
- rawDebugInfo(colorTag(255, 0, 255) .. "ASSERTION FAILED !! ")
+ -- rawDebugInfo(colorTag(255, 0, 255) .. "ASSERTION FAILED !! ")
+ rawDebugInfo("@{FOFF}ASSERTION FAILED !! ")
dumpCallStack(2);
error("")
end
diff --git a/data/ryz/ryz_ring/r2_features_default.lua b/data/ryz/ryz_ring/r2_features_default.lua
index d64113c9..70d12938 100644
--- a/data/ryz/ryz_ring/r2_features_default.lua
+++ b/data/ryz/ryz_ring/r2_features_default.lua
@@ -371,7 +371,7 @@ local registerFeature = function ()
--------------------
convertToWidgetValue =
function(value)
- local result = math.mod(math.floor(180 * value / math.pi), 360)
+ local result = math.fmod(math.floor(180 * value / math.pi), 360)
if result < 0 then result = 360 + result end
return result
end,
diff --git a/data/ryz/ryz_ring/r2_features_easter_egg.lua b/data/ryz/ryz_ring/r2_features_easter_egg.lua
index 3756d0ab..76b185f8 100644
--- a/data/ryz/ryz_ring/r2_features_easter_egg.lua
+++ b/data/ryz/ryz_ring/r2_features_easter_egg.lua
@@ -78,7 +78,7 @@ feature.Components.EasterEgg =
function(value)
local angle = value
if angle == nil then angle = 0 end
- local result = math.mod(math.floor(180 * angle / math.pi), 360)
+ local result = math.fmod(math.floor(180 * angle / math.pi), 360)
if result < 0 then result = 360 + result end
return result
end,
diff --git a/data/ryz/ryz_ring/r2_logic.lua b/data/ryz/ryz_ring/r2_logic.lua
index 1ee35d56..d50a15fa 100644
--- a/data/ryz/ryz_ring/r2_logic.lua
+++ b/data/ryz/ryz_ring/r2_logic.lua
@@ -1679,7 +1679,7 @@ Logic.translateChatSequences = function (context, hlComponent, behavior, rtNpcGr
event.Name = "activity_sequence_changed"
table.insert(context.RtAct.Events, event)
- local rtInitChatStep = r2.Translator.createAction("code", "oldChatStepVar = -1;\n" .. Logic.chatStepVar .." = 0;\n()setTimer(1, " ..Logic.chatTimerId .. ")\;\n")
+ local rtInitChatStep = r2.Translator.createAction("code", "oldChatStepVar = -1;\n" .. Logic.chatStepVar .." = 0;\n()setTimer(1, " ..Logic.chatTimerId .. ");\n")
rtInitChatStep.Name = "init_chat_step"
table.insert(context.RtAct.Actions, rtInitChatStep)
table.insert(event.ActionsId, rtInitChatStep.Id)
diff --git a/data/ryz/ryz_ring/r2_logic_entities.xml b/data/ryz/ryz_ring/r2_logic_entities.xml
index 218d281b..b126c6f0 100644
--- a/data/ryz/ryz_ring/r2_logic_entities.xml
+++ b/data/ryz/ryz_ring/r2_logic_entities.xml
@@ -318,7 +318,7 @@
on_change_params="r2.events:initFilterMenu()" color_text="255 255 0 255" />
+function AppZone:handle(cmd)
+ if cmd == 'show' then
+ self:setActive(true)
+ elseif cmd == 'hide' then
+ self:setActive(false)
+ elseif cmd == 'reload' then
+ self:reload()
+ elseif cmd == 'list' then
+ self:onButtonHome()
+ else
+ self:launchApp(cmd)
+ end
+end
diff --git a/data/ryz/ryz_zzz_bazaar/appzone.xml b/data/ryz/ryz_zzz_bazaar/appzone.xml
new file mode 100644
index 00000000..51bc0417
--- /dev/null
+++ b/data/ryz/ryz_zzz_bazaar/appzone.xml
@@ -0,0 +1,257 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/ryz/ryz_zzz_bazaar/compass.xml b/data/ryz/ryz_zzz_bazaar/compass.xml
index c2bd7a40..a88f49f4 100644
--- a/data/ryz/ryz_zzz_bazaar/compass.xml
+++ b/data/ryz/ryz_zzz_bazaar/compass.xml
@@ -8,7 +8,7 @@
+
+
+
+
+
+
+
-
@@ -645,7 +679,7 @@
id="dist"
posref="BM BM"
x="0"
- y="0"
+ y="2"
hardtext="uiRadarZoom0"
shadow="true"
color="255 255 255 255"
@@ -694,7 +728,7 @@
id="range"
posref="BM MM"
x="0"
- y="16"
+ y="20"
hardtext="uiRadarZoom0"
shadow="true"
color="255 255 255 255"
@@ -748,8 +782,8 @@
posref="BM BM"
x="0"
y="26"
- w="44"
- h="18" />
+ w="46"
+ h="25" />
+
+
+
@@ -44,6 +53,83 @@
onclick_l="proc"
params_l="inv_left_click_on_slot"
auto_grayed="false" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1501,9 +1866,66 @@
tooltip="uittHandSet"
tooltip_parent="win" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/ryz/ryz_zzz_bazaar/r2_triggers.xml b/data/ryz/ryz_zzz_bazaar/r2_triggers.xml
new file mode 100644
index 00000000..8647e779
--- /dev/null
+++ b/data/ryz/ryz_zzz_bazaar/r2_triggers.xml
@@ -0,0 +1,780 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/ryz/ryz_zzz_bazaar/taskbar.lua b/data/ryz/ryz_zzz_bazaar/taskbar.lua
index 7ac4c68d..9dc6035f 100644
--- a/data/ryz/ryz_zzz_bazaar/taskbar.lua
+++ b/data/ryz/ryz_zzz_bazaar/taskbar.lua
@@ -2,39 +2,39 @@
------------------------------------------------------------------------------------------------------------
-- create the game namespace without reseting if already created in an other file.
if (game==nil) then
- game= {};
+ game = {}
end
------------------------------------------------------------------------------------------------------------
--
function game:getMilkoTooltipWithKey(prop, tooltip, tooltip_pushed, name, param)
- local tt;
+ local tt
-- Check if button is toggled and choose the good tooltip
if (prop ~= '' and tooltip_pushed ~= '') then
- local db = getDbProp(prop);
+ local db = getDbProp(prop)
if (db == 1) then
- tt = tooltip_pushed;
+ tt = tooltip_pushed
else
- tt = tooltip;
+ tt = tooltip
end
else
tt = tooltip;
end
-- Get key shortcut
- local text = i18n.get(tt);
- local key = runExpr('getKey(\'' .. name .. '\',\'' .. param .. '\',1)');
+ local text = i18n.get(tt)
+ local key = runExpr('getKey(\'' .. name .. '\',\'' .. param .. '\',1)')
if (key ~= nil and key ~= '') then
- key = ' @{2F2F}(' .. key .. ')';
- text = concatUCString(text, key);
+ key = ' @{2F2F}(' .. key .. ')'
+ text = concatUCString(text, key)
end
- setContextHelpText(text);
+ setContextHelpText(text)
end
function game:taskbarDisableTooltip(ui)
- local uiGroup = getUI(ui);
- disableContextHelpForControl(uiGroup);
+ local uiGroup = getUI(ui)
+ disableContextHelpForControl(uiGroup)
end
\ No newline at end of file
diff --git a/data/ryz/ryz_zzz_bazaar/taskbar.xml b/data/ryz/ryz_zzz_bazaar/taskbar.xml
index 0c42103f..e497f25e 100644
--- a/data/ryz/ryz_zzz_bazaar/taskbar.xml
+++ b/data/ryz/ryz_zzz_bazaar/taskbar.xml
@@ -1091,7 +1091,10 @@