From 638cce5081fc569dec07b1e42b83c344488d78e4 Mon Sep 17 00:00:00 2001 From: AndreFaramir Date: Tue, 10 Apr 2012 22:04:41 -0300 Subject: [PATCH] some fixes and utils --- modules/core_lib/core_lib.otmod | 1 + modules/core_lib/string.lua | 21 +++++++++++++++++++++ modules/game_npctrade/npctrade.lua | 1 + modules/game_npctrade/npctrade.otui | 3 --- 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 modules/core_lib/string.lua diff --git a/modules/core_lib/core_lib.otmod b/modules/core_lib/core_lib.otmod index 70d166e1..0845338d 100644 --- a/modules/core_lib/core_lib.otmod +++ b/modules/core_lib/core_lib.otmod @@ -23,6 +23,7 @@ Module dofile 'settings' dofile 'keyboard' dofile 'mouse' + dofile 'string' dofile 'ui/effects' dofile 'ui/radiogroup' diff --git a/modules/core_lib/string.lua b/modules/core_lib/string.lua new file mode 100644 index 00000000..41000e78 --- /dev/null +++ b/modules/core_lib/string.lua @@ -0,0 +1,21 @@ +string.explode = function (str, sep, limit) + if(type(sep) ~= 'string' or tostring(str):len() == 0 or sep:len() == 0) then + return {} + end + + local i, pos, tmp, t = 0, 1, "", {} + for s, e in function() return string.find(str, sep, pos) end do + tmp = str:sub(pos, s - 1):trim() + table.insert(t, tmp) + pos = e + 1 + + i = i + 1 + if(limit ~= nil and i == limit) then + break + end + end + + tmp = str:sub(pos):trim() + table.insert(t, tmp) + return t +end \ No newline at end of file diff --git a/modules/game_npctrade/npctrade.lua b/modules/game_npctrade/npctrade.lua index 71b228ed..117a6bb7 100644 --- a/modules/game_npctrade/npctrade.lua +++ b/modules/game_npctrade/npctrade.lua @@ -109,6 +109,7 @@ function NPCTrade.setList(radioTabs, selected, deselected) NPCTrade.resetSetup() NPCTrade.refreshItemsPanel() + NPCTrade.refreshFilters() end function NPCTrade.resetSetup() diff --git a/modules/game_npctrade/npctrade.otui b/modules/game_npctrade/npctrade.otui index 41482927..a6e04712 100644 --- a/modules/game_npctrade/npctrade.otui +++ b/modules/game_npctrade/npctrade.otui @@ -23,7 +23,6 @@ NPCItemBox < UICheckBox Label id: nameLabel phantom: true - text: cavalo anchors.top: prev.bottom anchors.horizontalCenter: parent.horizontalCenter text-auto-resize: true @@ -32,7 +31,6 @@ NPCItemBox < UICheckBox Label id: weightLabel phantom: true - text: 8.00 oz anchors.top: prev.bottom anchors.horizontalCenter: parent.horizontalCenter text-auto-resize: true @@ -41,7 +39,6 @@ NPCItemBox < UICheckBox Label id: priceLabel phantom: true - text: 200 gold anchors.top: prev.bottom anchors.horizontalCenter: parent.horizontalCenter text-auto-resize: true