Line 192: |
Line 192: |
| return Ship:create_from_reference(self._battle_card_reference, self):battle_card() | | return Ship:create_from_reference(self._battle_card_reference, self):battle_card() |
| end | | end |
− | local api_id, simple_naming = self:api_id(), self:simple_naming() | + | api_id = self:api_id() |
− | if not api_id and not self:type() then | + | if api_id then |
− | return Formatting:ship_battle_card(nil, self:unique_name(), nil, self._battle_card_extension, true)
| + | return Formatting:ship_battle_card(api_id, self:unique_name(), self:type(), self._battle_card_extension) |
− | elseif api_id or simple_naming then
| |
− | return Formatting:ship_battle_card(api_id, self:unique_name(), self:type(), self._battle_card_extension, simple_naming) | |
| end | | end |
| + | return self._battle_card |
| end | | end |
| | | |
Line 211: |
Line 210: |
| return Ship:create_from_reference(self._battle_card_damaged_reference, self):battle_card_damaged() | | return Ship:create_from_reference(self._battle_card_damaged_reference, self):battle_card_damaged() |
| end | | end |
− | local api_id, simple_naming = self:api_id(), self:simple_naming() | + | api_id = self:api_id() |
− | if not api_id and not self:type() then | + | if api_id then |
− | return Formatting:ship_battle_card_damaged(nil, self:unique_name(), nil, self._battle_card_damaged_extension, true)
| + | return Formatting:ship_battle_card_damaged(api_id, self:unique_name(), self:type(), self._battle_card_damaged_extension) |
− | elseif api_id or simple_naming then
| |
− | return Formatting:ship_battle_card_damaged(api_id, self:unique_name(), self:type(), self._battle_card_damaged_extension, simple_naming) | |
| end | | end |
| + | return self._battle_card_damaged |
| end | | end |
| | | |