Changes

Fix stats, add No. before id, fix ship class ordering, fix ship class rows
Line 8: Line 8:  
|-
 
|-
 
| colspan="2" style="text-align: center; background-color: ${back};${extra_style};"|<p style="font-size:25px">'''${name}'''</p>
 
| colspan="2" style="text-align: center; background-color: ${back};${extra_style};"|<p style="font-size:25px">'''${name}'''</p>
<p style="font-size:20px">'''${id} ${japanese_name}'''</p>
+
<p style="font-size:20px">'''No.${id} ${japanese_name}'''</p>
 
|-
 
|-
 
| colspan="2" style="text-align: center; background-color: whitesmoke;"|<p>'''${icon} ${eq_type}, ${rarity}'''</p>
 
| colspan="2" style="text-align: center; background-color: whitesmoke;"|<p>'''${icon} ${eq_type}, ${rarity}'''</p>
Line 24: Line 24:  
2,
 
2,
 
3,
 
3,
 +
--
 +
21,
 
4,
 
4,
 +
--
 
5,
 
5,
 
6,
 
6,
7,
+
--
 
8,
 
8,
 
9,
 
9,
 +
--
 
10,
 
10,
 +
7,
 +
--
 
11,
 
11,
 +
18,
 +
--
 
13,
 
13,
 
14,
 
14,
 +
--
 +
20,
 
16,
 
16,
 +
--
 
17,
 
17,
18,
   
19,
 
19,
20,
  −
21,
   
}
 
}
 
}
 
}
Line 72: Line 80:     
function EquipmentInfoKai:rarity(equipment)
 
function EquipmentInfoKai:rarity(equipment)
return Formatting:format_rarity(equipment:rarity())
+
return Formatting:format_equipment_rarity(equipment:rarity())
 
end
 
end
    
function EquipmentInfoKai:effects(equipment)
 
function EquipmentInfoKai:effects(equipment)
 
return Formatting:format_stat_bonuses{
 
return Formatting:format_stat_bonuses{
firepower = Formatting:format_stat(equipment:firepower()),  
+
firepower = equipment:firepower(),  
bombing = Formatting:format_stat(equipment:bombing()),  
+
bombing = equipment:bombing(),  
torpedo = Formatting:format_stat(equipment:torpedo()),  
+
torpedo = equipment:torpedo(),  
aa = Formatting:format_stat(equipment:aa()),  
+
aa = equipment:aa(),  
armor = Formatting:format_stat(equipment:armor()),  
+
armor = equipment:armor(),  
asw = Formatting:format_stat(equipment:asw()),  
+
asw = equipment:asw(),  
shelling_accuracy = Formatting:format_stat(equipment:shelling_accuracy()),
+
shelling_accuracy = equipment:shelling_accuracy(),
torpedo_accuracy = Formatting:format_stat(equipment:torpedo_accuracy()),
+
torpedo_accuracy = equipment:torpedo_accuracy(),
los = Formatting:format_stat(equipment:los()),
+
los = equipment:los(),
 
speed = Formatting:format_speed(equipment:speed()),
 
speed = Formatting:format_speed(equipment:speed()),
luck = Formatting:format_stat(equipment:luck()),
+
luck = equipment:luck(),
 
range = Formatting:format_range(equipment:range()),
 
range = Formatting:format_range(equipment:range()),
 
special = equipment:special(),
 
special = equipment:special(),
Line 104: Line 112:  
local result = {}
 
local result = {}
 
for index, ship_type in ipairs(self._shown_ship_types) do
 
for index, ship_type in ipairs(self._shown_ship_types) do
if index % 2 == 0 then
+
if index % 2 == 1 then
 
table.insert(result, self._row_starter)
 
table.insert(result, self._row_starter)
 
end
 
end
Anonymous user