Line 2: |
Line 2: |
| | | |
| local Ship = require('Module:Ship') | | local Ship = require('Module:Ship') |
| + | local ShipBattleCardKai = require('Module:ShipBattleCardKai') |
| local ShipCardKai = require('Module:ShipCardKai') | | local ShipCardKai = require('Module:ShipCardKai') |
| local Equipment = require('Module:Equipment') | | local Equipment = require('Module:Equipment') |
| | | |
| local Formatting = require('Module:Formatting') | | local Formatting = require('Module:Formatting') |
− | local format = require('Module:StringInterpolation').format | + | local format = require('Module:Core').format |
| | | |
| local Functions = require('Module:NanaminFunctions') | | local Functions = require('Module:NanaminFunctions') |
Line 107: |
Line 108: |
| ship_card = ship and ship:name() or "Invalid Ship Name" | | ship_card = ship and ship:name() or "Invalid Ship Name" |
| elseif ship and ship:name() then | | elseif ship and ship:name() then |
− | ship_card = ShipCardKai:card{ship = ship, size = self._size, link = ship:link(), caption = ship:name()} | + | ship_card = ShipCardKai:get{ship = ship, size = self._size, link = ship:link(), caption = ship:name()} |
| else | | else |
| ship_card = Formatting:format_image{self._blank, size = self._size} | | ship_card = Formatting:format_image{self._blank, size = self._size} |
Line 148: |
Line 149: |
| function NanaminFleetKai:build_table() | | function NanaminFleetKai:build_table() |
| local i = 1 | | local i = 1 |
− | while i < #self._items do | + | while i <= #self._items do |
| if type(self._items[i]) == "string" then | | if type(self._items[i]) == "string" then |
| self:add_header(self._items[i]) | | self:add_header(self._items[i]) |
Line 212: |
Line 213: |
| for i = 1, #drops do | | for i = 1, #drops do |
| local ship = Ship(drops[i], "") | | local ship = Ship(drops[i], "") |
− | local card = ShipCardKai:battle_card{ship = ship, link = ship:link(), caption = ship:name()} | + | local card = ShipBattleCardKai:get{ship = ship, link = ship:link(), caption = ship:name()} |
| if self._args["text_only"] then | | if self._args["text_only"] then |
| card = ship:name() | | card = ship:name() |