Changes

Module:ShipData (view source)

Revision as of 04:51, 14 November 2017

794 bytes added , 6 years ago

no edit summary

Line 162: Line 162:

return Ship:create_from_reference(self._card_reference, self):card()

end

−

api_id = self:api_id()

+

local api_id, simple_naming = self:api_id(), self:simple_naming()

−

if api_id then

+

if not api_id and not self:type() then

−

return Formatting:ship_card(api_id, self:unique_name(), self:type(), self._card_extension)

+

return Formatting:ship_card(nil, self:unique_name(), nil, self._card_extension, true)

+

elseif api_id or simple_naming then

+

return Formatting:ship_card(api_id, self:unique_name(), self:type(), self._card_extension, simple_naming)

end

−

~~return self._card~~

end

Line 176: Line 177:

return Ship:create_from_reference(self._card_damaged_reference, self):card_damaged()

end

−

api_id = self:api_id()

+

local api_id, simple_naming = self:api_id(), self:simple_naming()

−

if api_id then

+

if not api_id and not self:type() then

−

return Formatting:ship_card_damaged(api_id, self:unique_name(), self:type(), self._card_damaged_extension)

+

return Formatting:ship_card_damaged(nil, self:unique_name(), nil, self._card_damaged_extension, true)

+

elseif api_id or simple_naming then

+

return Formatting:ship_card_damaged(api_id, self:unique_name(), self:type(), self._card_damaged_extension, simple_naming)

end

−

~~return self._card_damaged~~

end

Line 190: Line 192:

return Ship:create_from_reference(self._battle_card_reference, self):battle_card()

end

−

api_id = self:api_id()

+

local api_id, simple_naming = self:api_id(), self:simple_naming()

−

if api_id then

+

if not api_id and not self:type() then

−

return Formatting:ship_battle_card(api_id, self:unique_name(), self:type(), self._battle_card_extension)

+

return Formatting:ship_battle_card(nil, self:unique_name(), nil, self._battle_card_extension, true)

+

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

−

~~return self._battle_card~~

end

Line 208: Line 211:

return Ship:create_from_reference(self._battle_card_damaged_reference, self):battle_card_damaged()

end

−

api_id = self:api_id()

+

local api_id, simple_naming = self:api_id(), self:simple_naming()

−

if api_id then

+

if not api_id and not self:type() then

−

return Formatting:ship_battle_card_damaged(api_id, self:unique_name(), self:type(), self._battle_card_damaged_extension)

+

return Formatting:ship_battle_card_damaged(nil, self:unique_name(), nil, self._battle_card_damaged_extension, true)

+

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

−

~~return self._battle_card_damaged~~

end

がか

cssedit, gkautomate

6,926

edits