Changes

no edit summary
Line 9: Line 9:  
local Combat2 = require("Module:Combat2")
 
local Combat2 = require("Module:Combat2")
 
local EquipmentCardKai = require("Module:EquipmentCardKai")
 
local EquipmentCardKai = require("Module:EquipmentCardKai")
 +
local EquipmentCollection = require("Module:Collection/Equipment")
    
local frame = nil
 
local frame = nil
Line 47: Line 48:  
     enemy = function()
 
     enemy = function()
 
         return ShipIterator.enemyForms
 
         return ShipIterator.enemyForms
 +
    end,
 +
 +
    equipment = function()
 +
        return U.imap(EquipmentCollection, function(e) return e._name end)
 
     end,
 
     end,
   Line 238: Line 243:  
         sequence_position = sequence_position + 1
 
         sequence_position = sequence_position + 1
 
         ship = Ship(ship_key)
 
         ship = Ship(ship_key)
         shipCapabilities = ShipCapabilities{ ship = ship }
+
         if ship:id() then
 +
            shipCapabilities = ShipCapabilities{ ship = ship }
 +
        else
 +
            ship = Equipment(key)
 +
        end
 
     elseif prefix2 == "!!" then
 
     elseif prefix2 == "!!" then
 
         local key = string.sub(arg, 3)
 
         local key = string.sub(arg, 3)
cssedit, gkautomate
7,064

edits