Changes

no edit summary
Line 7: Line 7:     
function p.formatShipDropTable(tableInfo)
 
function p.formatShipDropTable(tableInfo)
     local order = {"1","2","3","4","5","6"}
+
     local order = {"1","2","3","4","5","6","7"}
     local worldOrder = {"World1", "World2", "World3", "World4", "World5", "World6"}
+
     local worldOrder = {"World1", "World2", "World3", "World4", "World5", "World6","World7"}
 
     local html = ""
 
     local html = ""
 
     html = html .. "<tr><td>[[" .. tableInfo["ShipName"] .. "]]</td>"
 
     html = html .. "<tr><td>[[" .. tableInfo["ShipName"] .. "]]</td>"
Line 30: Line 30:  
             end
 
             end
 
         end
 
         end
     end  
+
     end
 
     html = html .. "<td style='borders:none;background-color: #dddcb1'></td>"
 
     html = html .. "<td style='borders:none;background-color: #dddcb1'></td>"
 
     html = html .. "<td>" .. tableInfo["Remarks"] .. "</td>"
 
     html = html .. "<td>" .. tableInfo["Remarks"] .. "</td>"
Line 46: Line 46:  
     html = html .. '<table class="wikitable sortable" style="text-align: center; width:100%; margin-bottom: 0;">'
 
     html = html .. '<table class="wikitable sortable" style="text-align: center; width:100%; margin-bottom: 0;">'
 
     html = html .. '<tr><th colspan="1" rowspan="2" style="width:10%;"> Ship Name</th><th colspan="1" rowspan="2" style="width:2%;"> Rarity</th><th colspan="1" rowspan="2" style="width:3%;"> No.</th><th class="unsortable" colspan="1" rowspan="167" style="background-color: #dddcb1; width:.8%;"></th>'
 
     html = html .. '<tr><th colspan="1" rowspan="2" style="width:10%;"> Ship Name</th><th colspan="1" rowspan="2" style="width:2%;"> Rarity</th><th colspan="1" rowspan="2" style="width:3%;"> No.</th><th class="unsortable" colspan="1" rowspan="167" style="background-color: #dddcb1; width:.8%;"></th>'
     html = html .. '<th colspan="6" rowspan="1" style="width:12.5%;"> [[World 1]]</th><th class="unsortable" colspan="1" rowspan="167" style="background-color: #dddcb1; width:.8%;"></th><th colspan="5" rowspan="1" style="width:12.5%;"> [[World 2]]</th><th class="unsortable" colspan="1" rowspan="167" style="background-color: #dddcb1; width:.8%;"></th><th colspan="5" rowspan="1" style="width:12.5%;"> [[World 3]]</th><th class="unsortable" colspan="1" rowspan="167" style="background-color: #dddcb1; width:.8%;"></th><th colspan="5" rowspan="1" style="width:11%;"> [[World 4]]</th><th class="unsortable" colspan="1" rowspan="167" style="background-color: #dddcb1; width:.8%;"></th><th colspan="5" rowspan="1" style="width:12.5%;"> [[World 5]]</th><th class="unsortable" colspan="1" rowspan="167" style="background-color: #dddcb1; width:.8%;"></th><th colspan="5" rowspan="1" style="width:10%;"> [[World 6]]</th><th class="unsortable" colspan="1" rowspan="167" style="background-color: #dddcb1; width:.8%;"></th><th colspan="1" rowspan="2" style="width:14%;"> Remarks</th></tr>'
+
     html = html .. '<th colspan="6" rowspan="1" style="width:12.5%;"> [[World 1]]</th><th class="unsortable" colspan="1" rowspan="167" style="background-color: #dddcb1; width:.8%;"></th><th colspan="5" rowspan="1" style="width:12.5%;"> [[World 2]]</th><th class="unsortable" colspan="1" rowspan="167" style="background-color: #dddcb1; width:.8%;"></th><th colspan="5" rowspan="1" style="width:12.5%;"> [[World 3]]</th><th class="unsortable" colspan="1" rowspan="167" style="background-color: #dddcb1; width:.8%;"></th><th colspan="5" rowspan="1" style="width:11%;"> [[World 4]]</th><th class="unsortable" colspan="1" rowspan="167" style="background-color: #dddcb1; width:.8%;"></th><th colspan="5" rowspan="1" style="width:12.5%;"> [[World 5]]</th><th class="unsortable" colspan="1" rowspan="167" style="background-color: #dddcb1; width:.8%;"></th><th colspan="5" rowspan="1" style="width:10%;"> [[World 6]]</th><th class="unsortable" colspan="1" rowspan="167" style="background-color: #dddcb1; width:.8%;"></th><th colspan="3" rowspan="1" style="width:10%;"> [[World 7]]</th><th class="unsortable" colspan="1" rowspan="167" style="background-color: #dddcb1; width:.8%;"></th><th colspan="1" rowspan="2" style="width:14%;"> Remarks</th></tr>'
 
     html = html .. '<tr><th style="width:2.5%;"> [[World_1#Drops | 1]]</th><th style="width:2.5%;"> [[World_1#Drops_2 | 2]]</th><th style="width:2.5%;"> [[World_1#Drops_3 | 3]]</th><th style="width:2.5%;"> [[World_1#Drops_4 | 4]]</th><th style="width:2.5%;"> [[World_1#Drops_5 | 5]]</th><th style="width:2.5%;"> [[World_1#Drops_6 | 6]]</th>'
 
     html = html .. '<tr><th style="width:2.5%;"> [[World_1#Drops | 1]]</th><th style="width:2.5%;"> [[World_1#Drops_2 | 2]]</th><th style="width:2.5%;"> [[World_1#Drops_3 | 3]]</th><th style="width:2.5%;"> [[World_1#Drops_4 | 4]]</th><th style="width:2.5%;"> [[World_1#Drops_5 | 5]]</th><th style="width:2.5%;"> [[World_1#Drops_6 | 6]]</th>'
 
     html = html .. '<th style="width:2.5%;"> [[World_2#Drops | 1]]</th><th style="width:2.5%;"> [[World_2#Drops_2 | 2]]</th><th style="width:2.5%;"> [[World_2#Drops_3 | 3]]</th><th style="width:2.5%;"> [[World_2#Drops_4 | 4]]</th><th style="width:2.5%;"> [[World_2#Drops_5 | 5]]</th>'
 
     html = html .. '<th style="width:2.5%;"> [[World_2#Drops | 1]]</th><th style="width:2.5%;"> [[World_2#Drops_2 | 2]]</th><th style="width:2.5%;"> [[World_2#Drops_3 | 3]]</th><th style="width:2.5%;"> [[World_2#Drops_4 | 4]]</th><th style="width:2.5%;"> [[World_2#Drops_5 | 5]]</th>'
Line 52: Line 52:  
     html = html .. '<th style="width:2.5%;"> [[World_4#Drops | 1]]</th><th style="width:2.5%;"> [[World_4#Drops_2 | 2]]</th><th style="width:2.5%;"> [[World_4#Drops_3 | 3]]</th><th style="width:2.5%;"> [[World_4#Drops_4 | 4]]</th><th style="width:2.5%;"> [[World_4#Drops_5 | 5]]</th>'
 
     html = html .. '<th style="width:2.5%;"> [[World_4#Drops | 1]]</th><th style="width:2.5%;"> [[World_4#Drops_2 | 2]]</th><th style="width:2.5%;"> [[World_4#Drops_3 | 3]]</th><th style="width:2.5%;"> [[World_4#Drops_4 | 4]]</th><th style="width:2.5%;"> [[World_4#Drops_5 | 5]]</th>'
 
     html = html .. '<th style="width:2.5%;"> [[World_5#Drops | 1]]</th><th style="width:2.5%;"> [[World_5#Drops_2 | 2]]</th><th style="width:2.5%;"> [[World_5#Drops_3 | 3]]</th><th style="width:2.5%;"> [[World_5#Drops_4 | 4]]</th><th style="width:2.5%;"> [[World_5#Drops_5 | 5]]</th>'
 
     html = html .. '<th style="width:2.5%;"> [[World_5#Drops | 1]]</th><th style="width:2.5%;"> [[World_5#Drops_2 | 2]]</th><th style="width:2.5%;"> [[World_5#Drops_3 | 3]]</th><th style="width:2.5%;"> [[World_5#Drops_4 | 4]]</th><th style="width:2.5%;"> [[World_5#Drops_5 | 5]]</th>'
     html = html .. '<th style="width:2.5%;"> [[World_6#Drops | 1]]</th><th style="width:2.5%;"> [[World_6#Drops_2 | 2]]</th><th style="width:2.5%;"> [[World_6#Drops_3 | 3]]</th><th style="width:2.5%;"> [[World_6#Drops_4 | 4]]</th><th style="width:2.5%;"> [[World_6#Drops_5 | 5]]</th></tr>'
+
     html = html .. '<th style="width:2.5%;"> [[World_6#Drops | 1]]</th><th style="width:2.5%;"> [[World_6#Drops_2 | 2]]</th><th style="width:2.5%;"> [[World_6#Drops_3 | 3]]</th><th style="width:2.5%;"> [[World_6#Drops_4 | 4]]</th><th style="width:2.5%;"> [[World_6#Drops_5 | 5]]</th>'
 +
    html = html .. '<th style="width:2.5%;"> [[World_7#Drops | 1]]</th><th style="width:2.5%;"> [[World_7#Drops_2 | 2]]</th><th style="width:2.5%;"> [[World_7#Drops_3 | 3]]</th></tr>'
 
     if frame.args[1] ~= "all" then
 
     if frame.args[1] ~= "all" then
 
         for i,shipName in pairs(frame.args) do
 
         for i,shipName in pairs(frame.args) do
cssedit, gkautomate
7,064

edits