| Line 10: |
Line 10: |
| | local EquipmentGraphicKai = require("Module:EquipmentGraphicKai") | | local EquipmentGraphicKai = require("Module:EquipmentGraphicKai") |
| | local EquipmentCollection = require("Module:Data/Equipment") | | local EquipmentCollection = require("Module:Data/Equipment") |
| | + | local ItemCollection = require('Module:Collection/Items') |
| | -- local AllEquipmentCollection = require("Module:Collection/EquipmentByApiId") | | -- local AllEquipmentCollection = require("Module:Collection/EquipmentByApiId") |
| | local Development = require("Module:Development") | | local Development = require("Module:Development") |
| Line 49: |
Line 50: |
| | equipment = true | | equipment = true |
| | return U.imap(EquipmentCollection, function(e) return e._name end) | | return U.imap(EquipmentCollection, function(e) return e._name end) |
| | + | end, |
| | + | item = function() |
| | + | item = true |
| | + | return U.imap(ItemCollection, function(e) return e._name end) |
| | end, | | end, |
| | --[[ | | --[[ |
| Line 151: |
Line 156: |
| | card = function(obj) | | card = function(obj) |
| | if not obj or not obj.lua_name then | | if not obj or not obj.lua_name then |
| − | return ' ' | + | if equipment then --attempted to stop equipment from being filtered out, as equip cards weren't showing up. Don't know if this only works for equip and if I broke the original funtion's intention. This may not work at filtering out errors -chocolatecravinghobo |
| | + | else |
| | + | return ' ' |
| | + | end |
| | end | | end |
| | if obj.hp then | | if obj.hp then |
| Line 413: |
Line 421: |
| | for _, e in ipairs(enumerating_function()) do | | for _, e in ipairs(enumerating_function()) do |
| | local ship | | local ship |
| − | if equipment then | + | if equipment or item then |
| | ship = Equipment(e) | | ship = Equipment(e) |
| | else | | else |