| 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 31: |
Line 32: |
| | base_names = function() return require('Module:Collection/ShipsBase') end, | | base_names = function() return require('Module:Collection/ShipsBase') end, |
| | all_names = function() return require('Module:Collection/Ships') end, | | all_names = function() return require('Module:Collection/Ships') end, |
| − | all_names = function() return require('Module:Collection/Items') end,
| |
| − | all_names = function() return require('Module:Collection/Items') end,
| |
| | remodel_names = function() | | remodel_names = function() |
| | local all_names = require('Module:Collection/Ships') | | local all_names = require('Module:Collection/Ships') |
| Line 48: |
Line 47: |
| | end, | | end, |
| | enemy = function() return require('Module:Collection/EnemyShips') end, | | enemy = function() return require('Module:Collection/EnemyShips') end, |
| − | enemy = function() return require('Module:Collection/Items') end,
| |
| | equipment = function() | | equipment = function() |
| | 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 419: |
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 |