Changes

no edit summary
Line 6: Line 6:  
local ShipData = BaseData()
 
local ShipData = BaseData()
   −
function ShipData:name()
+
function ShipData:name(raw)
 
if self._suffix then
 
if self._suffix then
return self:base_name() .. " " .. (self._display_suffix or self:suffix())
+
return self:base_name() .. " " .. (raw and self:suffix() or self:display_suffix())
 
else
 
else
 
return self:base_name()
 
return self:base_name()
Line 20: Line 20:  
function ShipData:suffix()
 
function ShipData:suffix()
 
return self._suffix
 
return self._suffix
 +
end
 +
 +
function ShipData:display_suffix()
 +
return self._display_suffix or self._suffix
 
end
 
end
   Line 94: Line 98:  
api_id = self:api_id()
 
api_id = self:api_id()
 
if api_id then
 
if api_id then
return Formatting:ship_card(api_id, self:name(), self:suffix(), self:type(), self._card_extension)
+
return Formatting:ship_card(api_id, self:name(true), self:type(), self._card_extension)
 
end
 
end
 
return self._card
 
return self._card
Line 105: Line 109:  
api_id = self:api_id()
 
api_id = self:api_id()
 
if api_id then
 
if api_id then
return Formatting:ship_card_damaged(api_id, self:name(), self:suffix(), self:type(), self._card_damaged_extension)
+
return Formatting:ship_card_damaged(api_id, self:name(true), self:type(), self._card_damaged_extension)
 
end
 
end
 
return self._card_damaged
 
return self._card_damaged
Line 116: Line 120:  
api_id = self:api_id()
 
api_id = self:api_id()
 
if api_id then
 
if api_id then
return Formatting:ship_battle_card(api_id, self:name(), self:suffix(), self:type(), self._battle_card_extension)
+
return Formatting:ship_battle_card(api_id, self:name(true), self:type(), self._battle_card_extension)
 
end
 
end
 
return self._battle_card
 
return self._battle_card
Line 127: Line 131:  
api_id = self:api_id()
 
api_id = self:api_id()
 
if api_id then
 
if api_id then
return Formatting:ship_battle_card_damaged(api_id, self:name(), self:suffix(), self:type(), self._battle_card_damaged_extension)
+
return Formatting:ship_battle_card_damaged(api_id, self:name(true), self:type(), self._battle_card_damaged_extension)
 
end
 
end
 
return self._battle_card_damaged
 
return self._battle_card_damaged
Line 138: Line 142:  
api_id = self:api_id()
 
api_id = self:api_id()
 
if api_id then
 
if api_id then
return Formatting:ship_cg(api_id, self:name(), self:suffix(), self:type(), self._cg_extension)
+
return Formatting:ship_cg(api_id, self:name(true), self:type(), self._cg_extension)
 
end
 
end
 
return self._cg
 
return self._cg
Line 149: Line 153:  
api_id = self:api_id()
 
api_id = self:api_id()
 
if api_id then
 
if api_id then
return Formatting:ship_cg_damaged(api_id, self:name(), self:suffix(), self:type(), self._cg_damaged_extension)
+
return Formatting:ship_cg_damaged(api_id, self:name(true), self:type(), self._cg_damaged_extension)
 
end
 
end
 
return self._cg_damaged
 
return self._cg_damaged
Anonymous user