Module:ItemsTable: Difference between revisions

Module:ItemsTable (view source)

Revision as of 15:51, 22 October 2022

8 bytes added , 22 October 2022

Update for v1.1

Auron956

Interface administrators, Administrators

17,101

edits

@@ Line 18: / Line 18: @@
 local Shared = require('Module:Shared')
-local ItemData = mw.loadData('Module:Items/data')
+local GameData = require('Module:GameData')
 local Items = require('Module:Items')
 local Icons = require('Module:Icons')
@@ Line 24: / Line 24: @@
 local UseTables = require('Module:Items/UseTables')
-local itemCount = Shared.tableCount(ItemData.Items) - 1
+local itemCount = Shared.tableCount(GameData.rawData.items) - 1
 function p.getItemsTable(frame)
    local itemList = {}
-   local i = 0
+   for i, item in ipairs(GameData.rawData.items) do
-  while i < itemCount do
-    local item = Items.getItemByID(i)
      table.insert(itemList, '\r\n|-\r\n|')
      table.insert(itemList, UseTables.getItemUses(item.name))
-    i = i + 1
    end
    return table.concat(itemList)
@@ Line 41: / Line 38: @@
 function p.getItemsTableAlt(startID)
    local itemList = {}
-   local i = startID
+   local endID = startID + 125
-  local iend = i + 125
+   for i, item in ipairs(GameData.rawData.items) do
-   while i < iend do
+     if i > endID then
-     local item = Items.getItemByID(i)
+        break
-    if item == nil then
+    elseif i >= startID and i <= endID then
-      break
+        local iCat = item.category ~= nil and item.category or ''
+        local itemRow = {'\r\n|-'}
+        table.insert(itemRow, '\r\n|'..Icons.Icon({item.name, type='item', notext=true, size=50}))
+        table.insert(itemRow, '||'..Icons.Icon({item.name, type='item', noicon=true})..'||'..(i)..'||'..iCat..'||'..item.type)
+        table.insert(itemRow, '|| '..Items._getItemStat(item, 'completionReq'))
+        table.insert(itemRow, '||data-sort-value="'..math.floor(item.sellsFor)..'"|'..Icons.GP(math.floor(item.sellsFor)))
+        table.insert(itemRow, '||style="text-align:right;"|'..SourceTables._getItemSources(item))
+        table.insert(itemRow, '||style="text-align:right;"|'..UseTables._getItemUses(item, false))
+        table.insert(itemList, table.concat(itemRow))
      end
-    local iCat = item.category ~= nil and item.category or ''
-    local itemRow = {'\r\n|-'}
-    table.insert(itemRow, '\r\n|'..Icons.Icon({item.name, type='item', notext=true, size=50}))
-    table.insert(itemRow, '||'..Icons.Icon({item.name, type='item', noicon=true})..'||'..(i)..'||'..iCat..'||'..item.type)
-    table.insert(itemRow, '|| '..Items._getItemStat(item, 'completionReq'))
-    table.insert(itemRow, '||data-sort-value="'..math.floor(item.sellsFor)..'"|'..Icons.GP(math.floor(item.sellsFor)))
-    table.insert(itemRow, '||style="text-align:right;"|'..SourceTables._getItemSources(item))
-    table.insert(itemRow, '||style="text-align:right;"|'..UseTables._getItemUses(item, false))
-    table.insert(itemList, table.concat(itemRow))
-    i = i + 1
    end
    return table.concat(itemList, '')