Line 1: |
Line 1: |
| local EnemyShip = require('Module:EnemyShip') | | local EnemyShip = require('Module:EnemyShip') |
| local Formatting = require('Module:Formatting') | | local Formatting = require('Module:Formatting') |
| + | local getArgs = require('Module:GetArgs') |
| | | |
| local EnemyShipCard = { | | local EnemyShipCard = { |
Line 11: |
Line 12: |
| ship = args.ship | | ship = args.ship |
| end | | end |
− | return Formatting:format_image{ship:battle_card(), size = args.size or self._battle_card_size, link = args.link, caption = args.caption} | + | return Formatting:format_image{ship:battle_card(), size = args.size or self._battle_card_size, link = ship:base_name(), caption = ship:name()} |
| end | | end |
| | | |
| function EnemyShipCard:create_ship(args) | | function EnemyShipCard:create_ship(args) |
− | return EnemyShip(args.name, args.model) | + | return EnemyShip(args[1], args[2]) |
| end | | end |
| | | |
− | function EnemyShipCard(frame) | + | function EnemyShipCard:BattleCard(args) |
| + | local ship = self:create_ship(args) |
| + | return EnemyShipCard:battle_card(ship, args) |
| + | end |
| + | |
| + | function EnemyShipCard.getFrame(frame) |
| local args = getArgs{frame = frame:getParent()} | | local args = getArgs{frame = frame:getParent()} |
− | local ship = self:create_ship(args)
| + | return EnemyShipCard:BattleCard(args) |
− | return self:battle_card(ship, args) | |
| end | | end |
− |
| + | |
| return EnemyShipCard | | return EnemyShipCard |