diff --git a/src/cmds/reload.lua b/src/cmds/reload.lua index ee00df8..e05e8b8 100644 --- a/src/cmds/reload.lua +++ b/src/cmds/reload.lua @@ -7,6 +7,7 @@ return { end local path = 'src.'..cat..'.'..sub + C.api:off(package.loaded[path]) package.loaded[path] = nil local err, m = pcall(require, path) diff --git a/src/cmds/rub.lua b/src/cmds/rub.lua index 4a5f5aa..20e4675 100644 --- a/src/cmds/rub.lua +++ b/src/cmds/rub.lua @@ -23,6 +23,15 @@ function rub:course(wants) Name = 'Российский рубль', Value = '1' }) + local uah = table.findV(resp.Valute, {CharCode = 'UAH'}) + table.insert(resp.Valute, { + ID = 'R02000', + NumCode = '200', + CharCode = 'SHT', + Nominal = 1, + Name = 'Штаны', + Value = ('%f'):format(tonumber(uah.Value:gsub(',', '.'), nil) / uah.Nominal * 40) + }) wants = type(wants) == 'table' and wants or {} local r, founds = {}, {} diff --git a/src/events/ready.lua b/src/events/ready.lua index feac38a..41a5356 100644 --- a/src/events/ready.lua +++ b/src/events/ready.lua @@ -5,14 +5,20 @@ end function table.find(t, w) - local i - for k,v in pairs(t) do - if v == w then - i = k - break - end + for _,v in pairs(t) do + if v == w then return v end + end +end + +function table.findV(t, w) + local b + for _,v in pairs(t) do + for k,x in pairs(w) do + if x ~= v[k] then b=1; break end + end + if b then b = nil + else return v end end - return i end function dump(t, d)