Changes

Fixed errors breaking module.
Line 1: Line 1:  
local shipmodule = {}
 
local shipmodule = {}
 
local shipdb = require("Module:ShipDatabase")
 
local shipdb = require("Module:ShipDatabase")
shipdata = shipdb.KanmusuData
+
shipmodule = shipdb.KanmusuData
    
function shipmodule.KanmusuInfo(frame) -- Kanmusu Info Template
 
function shipmodule.KanmusuInfo(frame) -- Kanmusu Info Template
 
     local shipNum = frame.args[1]
 
     local shipNum = frame.args[1]
     local shipInfo = assert(shipdata[shipNum], "This KanMusu ID doesn't contains any data")
+
     local shipInfo = assert(shipmodule[shipNum], "This KanMusu ID doesn't contains any data")
   −
     local CardImg = '<div style="text-align: center;">[[File:KanMusu' .. shipNum .. 'Card.png|' .. shipdata[shipNum]["name"][3] .. 'Card]]</div>'
+
     local CardImg = '<div style="text-align: center;">[[File:KanMusu' .. shipNum .. 'Card.png|' .. shipmodule[shipNum]["name"][3] .. 'Card]]</div>'
     local CardDmgImg = '<div style="text-align: center;">[[File:KanMusu' .. shipNum .. 'CardDmg.png|' .. shipdata[shipNum]["name"][3] .. 'Damaged Card]]</div>'
+
     local CardDmgImg = '<div style="text-align: center;">[[File:KanMusu' .. shipNum .. 'CardDmg.png|' .. shipmodule[shipNum]["name"][3] .. 'Damaged Card]]</div>'
     local BannerImg = '<div style="text-align: center; width: 100%;">[[File:KanMusu' .. shipNum .. 'Banner.png|' .. shipdata[shipNum]["name"][3] .. 'Banner|class=imageCenter]]</div>'
+
     local BannerImg = '<div style="text-align: center; width: 100%;">[[File:KanMusu' .. shipNum .. 'Banner.png|' .. shipmodule[shipNum]["name"][3] .. 'Banner|class=imageCenter]]</div>'
     local BannerDmgImg = '<div style="text-align: center; width: 100%;">[[File:KanMusu' .. shipNum .. 'BannerDmg.png|' .. shipdata[shipNum]["name"][3] .. 'Damaged Banner|class=imageCenter]]</div>'
+
     local BannerDmgImg = '<div style="text-align: center; width: 100%;">[[File:KanMusu' .. shipNum .. 'BannerDmg.png|' .. shipmodule[shipNum]["name"][3] .. 'Damaged Banner|class=imageCenter]]</div>'
    
     local Cards = '<td rowspan="10" style="text-align: center;">' .. frame:extensionTag('slideshow', CardImg .. CardDmgImg, {sequence = 'forward', transition = 'fade', refresh = '5000'}) .. '</td>'
 
     local Cards = '<td rowspan="10" style="text-align: center;">' .. frame:extensionTag('slideshow', CardImg .. CardDmgImg, {sequence = 'forward', transition = 'fade', refresh = '5000'}) .. '</td>'
Line 16: Line 16:     
     local row1 = '<tr>' .. Cards .. '<th style="text-align: center;">' .. shipNum .. '</th>' .. Banners .. '</tr>'
 
     local row1 = '<tr>' .. Cards .. '<th style="text-align: center;">' .. shipNum .. '</th>' .. Banners .. '</tr>'
     local JaName = '<ruby lang="ja" xml:lang="ja"><rb>' .. shipdata[shipNum]["name"][1] .. '</rb><rp> (</rp><rt>' .. shipdata[shipNum]["name"][2] .. '</rt><rp>) </rp></ruby>'
+
     local JaName = '<ruby lang="ja" xml:lang="ja"><rb>' .. shipmodule[shipNum]["name"][1] .. '</rb><rp> (</rp><rt>' .. shipmodule[shipNum]["name"][2] .. '</rt><rp>) </rp></ruby>'
   −
     local row2 = '<tr><th colspan="2">' .. JaName .. '</th><th colspan="2">' .. shipdata[shipNum]["name"][3] .. '</th></tr>'
+
     local row2 = '<tr><th colspan="2">' .. JaName .. '</th><th colspan="2">' .. shipmodule[shipNum]["name"][3] .. '</th></tr>'
     local row3 = '<tr><td colspan="4" style="text-align: center;">' .. shipdata[shipNum]["class"] .. shipdata[shipNum]["type"] .. '</td></tr>'
+
     local row3 = '<tr><td colspan="4" style="text-align: center;">' .. shipmodule[shipNum]["class"] .. shipmodule[shipNum]["type"] .. '</td></tr>'
 
     local row4 = '<tr><td colspan="4"><hr style="border: 0; height: 1px; background-image: linear-gradient(to right, rgba(0,0,0,0), rgba(0,0,0,0.75), rgba(0,0,0,0));" /></td></tr>'
 
     local row4 = '<tr><td colspan="4"><hr style="border: 0; height: 1px; background-image: linear-gradient(to right, rgba(0,0,0,0), rgba(0,0,0,0.75), rgba(0,0,0,0));" /></td></tr>'
   Line 25: Line 25:  
     local statBox = '<td style="{{border-radius|4px 12px 12px 4px}} padding-left: 5px; padding-right: 5px; border: 1px solid #a3965c; text-align: left; vertical-align: baseline;">'
 
     local statBox = '<td style="{{border-radius|4px 12px 12px 4px}} padding-left: 5px; padding-right: 5px; border: 1px solid #a3965c; text-align: left; vertical-align: baseline;">'
   −
     local HPinfo = statLabel .. 'HP [[File:IcoHP.png|HP]]</th>' .. statBox .. shipdata[shipNum]["hp"] .. '</td>'
+
     local HPinfo = statLabel .. 'HP [[File:IcoHP.png|HP]]</th>' .. statBox .. shipmodule[shipNum]["hp"] .. '</td>'
     local FPinfo = statLabel .. 'ATK [[File:IcoAtk.png|Firepower]]</th>' .. statBox .. shipdata[shipNum]["fp"][1] .. '→' .. shipdata[shipNum]["fp"][2] .. '</td>'
+
     local FPinfo = statLabel .. 'ATK [[File:IcoAtk.png|Firepower]]</th>' .. statBox .. shipmodule[shipNum]["fp"][1] .. '→' .. shipmodule[shipNum]["fp"][2] .. '</td>'
    
     local row5 = '<tr>' .. HPinfo .. FPinfo .. '</tr>'
 
     local row5 = '<tr>' .. HPinfo .. FPinfo .. '</tr>'
   −
     local Armorinfo = statLabel .. 'DEF [[File:IcoArmor.png|Armor]]</th>' .. statBox .. shipdata[shipNum]["armor"][1] .. '→' .. shipdata[shipNum]["armor"][2] .. '</td>'
+
     local Armorinfo = statLabel .. 'DEF [[File:IcoArmor.png|Armor]]</th>' .. statBox .. shipmodule[shipNum]["armor"][1] .. '→' .. shipmodule[shipNum]["armor"][2] .. '</td>'
 
     local Torpedoinfo = statLabel .. 'TORP [[File:IcoTorpedo.png|Torpedo]]</th>' .. statBox
 
     local Torpedoinfo = statLabel .. 'TORP [[File:IcoTorpedo.png|Torpedo]]</th>' .. statBox
     if shipdata[shipNum]["torpedo"] == 0 then
+
     if shipmodule[shipNum]["torpedo"] == 0 then
         Torpedoinfo = Torpedoinfo .. shipdata[shipNum]["torpedo"]
+
         Torpedoinfo = Torpedoinfo .. shipmodule[shipNum]["torpedo"]
 
     else
 
     else
         Torpedoinfo = Torpedoinfo .. shipdata[shipNum]["torpedo"][1] .. '→' .. shipdata[shipNum]["torpedo"][2]
+
         Torpedoinfo = Torpedoinfo .. shipmodule[shipNum]["torpedo"][1] .. '→' .. shipmodule[shipNum]["torpedo"][2]
 
     end
 
     end
    
     local row6 = '<tr>' .. Armorinfo .. Torpedoinfo .. '</tr>'
 
     local row6 = '<tr>' .. Armorinfo .. Torpedoinfo .. '</tr>'
   −
     local Evasioninfo = statLabel .. 'EVA [[File:IcoEvasion.png|Evasion]]</th>' .. statBox .. shipdata[shipNum]["evasion"][1] .. '→' .. shipdata[shipNum]["evasion"][2] .. '</td>'
+
     local Evasioninfo = statLabel .. 'EVA [[File:IcoEvasion.png|Evasion]]</th>' .. statBox .. shipmodule[shipNum]["evasion"][1] .. '→' .. shipmodule[shipNum]["evasion"][2] .. '</td>'
 
     local AAinfo = statLabel .. 'AA [[File:IcoAA.png|Anti-Air]]</th>' .. statBox
 
     local AAinfo = statLabel .. 'AA [[File:IcoAA.png|Anti-Air]]</th>' .. statBox
     if shipdata[shipNum]["aa"] == 0 then
+
     if shipmodule[shipNum]["aa"] == 0 then
         AAinfo = AAinfo .. shipdata[shipNum]["aa"]
+
         AAinfo = AAinfo .. shipmodule[shipNum]["aa"]
 
     else
 
     else
         AAinfo = AAinfo .. shipdata[shipNum]["aa"][1] .. '→' .. shipdata[shipNum]["aa"][2]
+
         AAinfo = AAinfo .. shipmodule[shipNum]["aa"][1] .. '→' .. shipmodule[shipNum]["aa"][2]
 
     end
 
     end
   Line 51: Line 51:     
     local aircraftTotal = 0
 
     local aircraftTotal = 0
     if shipdata[shipNum]["aircraft"] ~= "" then
+
     if shipmodule[shipNum]["aircraft"] ~= "" then
 
     local aircraftslot = {0, 0, 0, 0}
 
     local aircraftslot = {0, 0, 0, 0}
 
         for i = 1, 4, 1 do
 
         for i = 1, 4, 1 do
             if shipdata[shipNum]["aircraft"][i] ~= nil then
+
             if shipmodule[shipNum]["aircraft"][i] ~= nil then
             aircraftslot[i] = shipdata[shipNum]["aircraft"][i]
+
             aircraftslot[i] = shipmodule[shipNum]["aircraft"][i]
 
         else
 
         else
 
               aircraftslot[i] = 0
 
               aircraftslot[i] = 0
Line 66: Line 66:  
     local Planeinfo = statLabel .. 'PLA [[File:IcoAircraft.png|Aircraft]]</th>' .. statBox .. aircraftTotal .. '</td>'
 
     local Planeinfo = statLabel .. 'PLA [[File:IcoAircraft.png|Aircraft]]</th>' .. statBox .. aircraftTotal .. '</td>'
 
     local ASWinfo = statLabel .. 'ASW [[File:IcoASW.png|Anti-Submarine Warfare]]</th>' .. statBox
 
     local ASWinfo = statLabel .. 'ASW [[File:IcoASW.png|Anti-Submarine Warfare]]</th>' .. statBox
     if shipdata[shipNum]["asw"] == 0 then
+
     if shipmodule[shipNum]["asw"] == 0 then
         ASWinfo = ASWinfo .. shipdata[shipNum]["asw"]
+
         ASWinfo = ASWinfo .. shipmodule[shipNum]["asw"]
 
     else
 
     else
         ASWinfo = ASWinfo .. shipdata[shipNum]["asw"][1] .. '→' .. shipdata[shipNum]["asw"][2]
+
         ASWinfo = ASWinfo .. shipmodule[shipNum]["asw"][1] .. '→' .. shipmodule[shipNum]["asw"][2]
 
     end
 
     end
    
     local row8 = '<tr>' .. Planeinfo .. ASWinfo .. '</tr>'
 
     local row8 = '<tr>' .. Planeinfo .. ASWinfo .. '</tr>'
   −
     local Speedinfo = statLabel .. 'SPD [[File:IcoSpeed.png|Speed]]</th>' .. statBox .. shipdata[shipNum]["spd"] .. '</td>'
+
     local Speedinfo = statLabel .. 'SPD [[File:IcoSpeed.png|Speed]]</th>' .. statBox .. shipmodule[shipNum]["spd"] .. '</td>'
     local LOSinfo = statLabel .. 'LOS [[File:IcoLOS.png|Line of Sight]]</th>' .. statBox .. shipdata[shipNum]["los"][1] .. '→' .. shipdata[shipNum]["los"][2] .. '</td>'
+
     local LOSinfo = statLabel .. 'LOS [[File:IcoLOS.png|Line of Sight]]</th>' .. statBox .. shipmodule[shipNum]["los"][1] .. '→' .. shipmodule[shipNum]["los"][2] .. '</td>'
    
     local row9 = '<tr>' .. Speedinfo .. LOSinfo .. '</tr>'
 
     local row9 = '<tr>' .. Speedinfo .. LOSinfo .. '</tr>'
   −
     local Rangeinfo = statLabel .. 'RGE [[File:IcoRange.png|Range]]</th>' .. statBox .. shipdata[shipNum]["range"] .. '</td>'
+
     local Rangeinfo = statLabel .. 'RGE [[File:IcoRange.png|Range]]</th>' .. statBox .. shipmodule[shipNum]["range"] .. '</td>'
     local Luckinfo = statLabel .. 'LUK [[File:IcoLuck.png|Luck]]</th>' .. statBox .. shipdata[shipNum]["luck"][1] .. '→' .. shipdata[shipNum]["luck"][2] .. '</td>'
+
     local Luckinfo = statLabel .. 'LUK [[File:IcoLuck.png|Luck]]</th>' .. statBox .. shipmodule[shipNum]["luck"][1] .. '→' .. shipmodule[shipNum]["luck"][2] .. '</td>'
    
     local row10 = '<tr>' .. Rangeinfo .. Luckinfo .. '</tr>'
 
     local row10 = '<tr>' .. Rangeinfo .. Luckinfo .. '</tr>'
Line 94: Line 94:  
     local constrdata = ''
 
     local constrdata = ''
   −
     if shipdata[shipNum]["remodellv"] ~= nil and shipdata[shipNum]["remodellv"] ~= "" then
+
     if shipmodule[shipNum]["remodellv"] ~= nil and shipmodule[shipNum]["remodellv"] ~= "" then
 
         constrheader = 'Remodel Level'
 
         constrheader = 'Remodel Level'
         constrdata = shipdata[shipNum]["remodellv"]
+
         constrdata = shipmodule[shipNum]["remodellv"]
 
     else
 
     else
 
         constrheader = 'Build Time'
 
         constrheader = 'Build Time'
         if shipdata[shipNum]["buildtime"] == nil or shipdata[shipNum]["buildtime"] == "" then
+
         if shipmodule[shipNum]["buildtime"] == nil or shipmodule[shipNum]["buildtime"] == "" then
 
             constrdata = 'Not Buildable'
 
             constrdata = 'Not Buildable'
 
         else
 
         else
             constrdata = shipdata[shipNum]["buildtime"]
+
             constrdata = shipmodule[shipNum]["buildtime"]
 
         end
 
         end
 
     end
 
     end
Line 109: Line 109:  
     local remodelammo = '[[File:IcoAmmo.png|18px|Ammo]]'
 
     local remodelammo = '[[File:IcoAmmo.png|18px|Ammo]]'
 
     local remodelinfo = ''
 
     local remodelinfo = ''
     if shipdata[shipNum]["remodelreq"] ~= "" then
+
     if shipmodule[shipNum]["remodelreq"] ~= "" then
         remodelsteel = remodelsteel .. ' ' .. shipdata[shipNum]["remodelreq"][1]
+
         remodelsteel = remodelsteel .. ' ' .. shipmodule[shipNum]["remodelreq"][1]
         remodelammo = remodelammo .. ' ' .. shipdata[shipNum]["remodelreq"][2]
+
         remodelammo = remodelammo .. ' ' .. shipmodule[shipNum]["remodelreq"][2]
 
         remodelinfo = remodelsteel .. ' ' .. remodelammo
 
         remodelinfo = remodelsteel .. ' ' .. remodelammo
 
     end
 
     end
Line 122: Line 122:  
     end
 
     end
   −
     local consfuel = '[[File:IcoFuel.png|18px|Fuel]] ' .. shipdata[shipNum]["consumption"][1]
+
     local consfuel = '[[File:IcoFuel.png|18px|Fuel]] ' .. shipmodule[shipNum]["consumption"][1]
     local consammo = '[[File:IcoAmmo.png|18px|Ammo]] ' .. shipdata[shipNum]["consumption"][2]
+
     local consammo = '[[File:IcoAmmo.png|18px|Ammo]] ' .. shipmodule[shipNum]["consumption"][2]
    
     local row12 = '<tr>' .. RscHeader .. 'Consumption</th>' .. RscData .. consfuel .. ' ' .. consammo .. '</td>'
 
     local row12 = '<tr>' .. RscHeader .. 'Consumption</th>' .. RscData .. consfuel .. ' ' .. consammo .. '</td>'
   −
     local scrapfuel = '[[File:IcoFuel.png|18px|Fuel]] ' .. shipdata[shipNum]["dismantle"][1]
+
     local scrapfuel = '[[File:IcoFuel.png|18px|Fuel]] ' .. shipmodule[shipNum]["dismantle"][1]
     local scrapammo = '[[File:IcoAmmo.png|18px|Ammo]] ' .. shipdata[shipNum]["dismantle"][2]
+
     local scrapammo = '[[File:IcoAmmo.png|18px|Ammo]] ' .. shipmodule[shipNum]["dismantle"][2]
     local scrapsteel = '[[File:IcoSteel.png|18px|Steel]] ' .. shipdata[shipNum]["dismantle"][3]
+
     local scrapsteel = '[[File:IcoSteel.png|18px|Steel]] ' .. shipmodule[shipNum]["dismantle"][3]
     local scrapbauxite = '[[File:IcoBauxite.png|18px|Bauxite]] ' .. shipdata[shipNum]["dismantle"][4]
+
     local scrapbauxite = '[[File:IcoBauxite.png|18px|Bauxite]] ' .. shipmodule[shipNum]["dismantle"][4]
 
     local scrapinfo = scrapfuel .. ' ' .. scrapammo .. ' ' .. scrapsteel .. ' ' .. scrapbauxite
 
     local scrapinfo = scrapfuel .. ' ' .. scrapammo .. ' ' .. scrapsteel .. ' ' .. scrapbauxite
 
     local row12 = row12 .. RscHeader .. 'Dismantle</th>' .. RscData .. scrapinfo .. '</td></tr>'
 
     local row12 = row12 .. RscHeader .. 'Dismantle</th>' .. RscData .. scrapinfo .. '</td></tr>'
   −
     local modFP = '[[File:IcoAtkRemodel.png|25px|Firepower]] ' .. shipdata[shipNum]["modernization"][1]
+
     local modFP = '[[File:IcoAtkRemodel.png|25px|Firepower]] ' .. shipmodule[shipNum]["modernization"][1]
     local modTorp = '[[File:IcoTorpedoRemodel.png|25px|Torpedo]] ' .. shipdata[shipNum]["modernization"][2]
+
     local modTorp = '[[File:IcoTorpedoRemodel.png|25px|Torpedo]] ' .. shipmodule[shipNum]["modernization"][2]
     local modAA = '[[File:IcoAARemodel.png|25px|Anti-Air]] ' .. shipdata[shipNum]["modernization"][3]
+
     local modAA = '[[File:IcoAARemodel.png|25px|Anti-Air]] ' .. shipmodule[shipNum]["modernization"][3]
     local modArmor = '[[File:IcoArmorRemodel.png|25px|Armor]] ' .. shipdata[shipNum]["modernization"][4]
+
     local modArmor = '[[File:IcoArmorRemodel.png|25px|Armor]] ' .. shipmodule[shipNum]["modernization"][4]
 
     local modLuck = ''
 
     local modLuck = ''
     if shipdata[shipNum]["modernization"][5] ~= nil and shipdata[shipNum]["modernization"][5] ~= "" then
+
     if shipmodule[shipNum]["modernization"][5] ~= nil and shipmodule[shipNum]["modernization"][5] ~= "" then
         modLuck = '[[File:IcoLuck|18px|Luck]] ' .. shipdata[shipNum]["modernization"][5]
+
         modLuck = '[[File:IcoLuck|18px|Luck]] ' .. shipmodule[shipNum]["modernization"][5]
 
     end
 
     end
   Line 152: Line 152:  
     local voiceactor = ''
 
     local voiceactor = ''
 
     local cat = '[[Category:Ships]]'
 
     local cat = '[[Category:Ships]]'
     if shipdata[shipNum]["artist"] ~= "Unknown" and shipdata[shipNum]["artist"] ~= "" then
+
     if shipmodule[shipNum]["artist"] ~= "Unknown" and shipmodule[shipNum]["artist"] ~= "" then
         illustrator = '[[:Category:' .. shipdata[shipNum]["artist"] .. shipdata[shipNum]["artist"] .. ']]'
+
         illustrator = '[[:Category:' .. shipmodule[shipNum]["artist"] .. '|<span lang="ja">' .. shipmodule[shipNum]["artist"] .. '</span>]]'
         cat = cat .. '[[Category:' .. shipdata[shipNum]["artist"] .. ']]'
+
         cat = cat .. '[[Category:' .. shipmodule[shipNum]["artist"] .. ']]'
 
     else
 
     else
 
         illustrator = 'Unknown'
 
         illustrator = 'Unknown'
 
     end
 
     end
     if shipdata[shipNum]["seiyuu"] ~= "Unknown" and shipdata[shipNum]["seiyuu"] ~= "" then
+
     if shipmodule[shipNum]["seiyuu"] ~= "Unknown" and shipmodule[shipNum]["seiyuu"] ~= "" then
         voiceactor = '[[:Category:' .. shipdata[shipNum]["seiyuu"] .. '|' .. shipdata[shipNum]["seiyuu"] .. ']]'
+
         voiceactor = '[[:Category:' .. shipmodule[shipNum]["seiyuu"] .. '|' .. shipmodule[shipNum]["seiyuu"] .. ']]'
         cat = cat .. '[[Category:' .. shipdata[shipNum]["seiyuu"] .. ']]'
+
         cat = cat .. '[[Category:' .. shipmodule[shipNum]["seiyuu"] .. ']]'
 
     else
 
     else
 
         voiceactor = 'Unknown'
 
         voiceactor = 'Unknown'
Line 169: Line 169:  
     local planeStyle = '<td style="white-space: nowrap; text-align: center; vertical-align: top;">'
 
     local planeStyle = '<td style="white-space: nowrap; text-align: center; vertical-align: top;">'
 
     local equipStyle = ''
 
     local equipStyle = ''
     if shipdata[shipNum]["aircraft"] ~= "" then
+
     if shipmodule[shipNum]["aircraft"] ~= "" then
 
         equipHeader1 = '<th style="white-space: nowrap; {{border-radius|12px 4px 4px 12px}} background-color: #efe6d7; color: #a3965c;">Aircraft</th>'
 
         equipHeader1 = '<th style="white-space: nowrap; {{border-radius|12px 4px 4px 12px}} background-color: #efe6d7; color: #a3965c;">Aircraft</th>'
 
         equipHeader2 = '<th colspan="3" style="white-space: nowrap; {{border-radius|4px 12px 12px 4px}} background-color: #efe6d7; color: #a3965c; vertical-align: baseline;">Equipment</th>'
 
         equipHeader2 = '<th colspan="3" style="white-space: nowrap; {{border-radius|4px 12px 12px 4px}} background-color: #efe6d7; color: #a3965c; vertical-align: baseline;">Equipment</th>'
Line 181: Line 181:  
     local equip = {'<tr>', '<tr>', '<tr>', '<tr>'}
 
     local equip = {'<tr>', '<tr>', '<tr>', '<tr>'}
 
     for i = 1, 4, 1 do
 
     for i = 1, 4, 1 do
         if shipdata[shipNum]["aircraft"] ~= "" then
+
         if shipmodule[shipNum]["aircraft"] ~= "" then
         if shipdata[shipNum]["aircraft"][i] ~= nil then
+
         if shipmodule[shipNum]["aircraft"][i] ~= nil then
         equip[i] = equip[i] .. planeStyle .. shipdata[shipNum]["aircraft"][i] .. '</td>' .. equipStyle
+
         equip[i] = equip[i] .. planeStyle .. shipmodule[shipNum]["aircraft"][i] .. '</td>' .. equipStyle
 
     else
 
     else
 
     equip[i] = equip[i] .. planeStyle .. '</td>' .. equipStyle
 
     equip[i] = equip[i] .. planeStyle .. '</td>' .. equipStyle
 
     end
 
     end
             if shipdata[shipNum]["equip"] ~= "" then
+
             if shipmodule[shipNum]["equip"] ~= "" then
                 if shipdata[shipNum]["equip"][i] == "" or shipdata[shipNum]["equip"][i] == "Unequipped" then
+
                 if shipmodule[shipNum]["equip"][i] == "" or shipmodule[shipNum]["equip"][i] == "Unequipped" then
 
                     equip[i] = equip[i] .. '-Unequipped-</td></tr>'
 
                     equip[i] = equip[i] .. '-Unequipped-</td></tr>'
                 elseif shipdata[shipNum]["equip"][i] == nil then
+
                 elseif shipmodule[shipNum]["equip"][i] == nil then
 
                     equip[i] = equip[i] .. '\'\'-Locked-\'\'</td></tr>'
 
                     equip[i] = equip[i] .. '\'\'-Locked-\'\'</td></tr>'
 
                 else
 
                 else
                     equip[i] = equip[i] .. '[[' .. shipdata[shipNum]["equip"][i] .. ']]</td></tr>'
+
                     equip[i] = equip[i] .. '[[' .. shipmodule[shipNum]["equip"][i] .. ']]</td></tr>'
 
                 end
 
                 end
 
             else
 
             else
Line 200: Line 200:  
         else
 
         else
 
             equip[i] = equip[i] .. equipStyle
 
             equip[i] = equip[i] .. equipStyle
             if shipdata[shipNum]["equip"] ~= "" then
+
             if shipmodule[shipNum]["equip"] ~= "" then
                 if shipdata[shipNum]["equip"][i] == "" or shipdata[shipNum]["equip"][i] == "Unequipped" then
+
                 if shipmodule[shipNum]["equip"][i] == "" or shipmodule[shipNum]["equip"][i] == "Unequipped" then
 
                     equip[i] = equip[i] .. '-Unequipped-</td></tr>'
 
                     equip[i] = equip[i] .. '-Unequipped-</td></tr>'
                 elseif shipdata[shipNum]["equip"][i] == nil then
+
                 elseif shipmodule[shipNum]["equip"][i] == nil then
 
                     equip[i] = equip[i] .. '\'\'Locked\'\'</td></tr>'
 
                     equip[i] = equip[i] .. '\'\'Locked\'\'</td></tr>'
 
                 else
 
                 else
                     equip[i] = equip[i] .. '[[' .. shipdata[shipNum]["equip"][i] .. ']]</td></tr>'
+
                     equip[i] = equip[i] .. '[[' .. shipmodule[shipNum]["equip"][i] .. ']]</td></tr>'
 
                 end
 
                 end
 
             else
 
             else
Line 215: Line 215:  
     local DetailTable = '<table style="width: 100%">' .. equipHeader .. equip[1] .. equip[2] .. equip[3] .. equip[4] .. row11 .. row12 .. row13 .. row14 .. '</table>'
 
     local DetailTable = '<table style="width: 100%">' .. equipHeader .. equip[1] .. equip[2] .. equip[3] .. equip[4] .. row11 .. row12 .. row13 .. row14 .. '</table>'
   −
     cat = cat .. '[[Category:' .. shipdata[shipNum]["class"] .. ']][[Category:' .. shipdata[shipNum]["type"] .. ']]'
+
     cat = cat .. '[[Category:' .. shipmodule[shipNum]["class"] .. ']][[Category:' .. shipmodule[shipNum]["type"] .. ']]'
 
      
 
      
 
     local shipInfoBox = '<div style="display: inline-block; vertical-align: top;"><table style="{{border-radius|10px 10px 10px 10px}} border: 1px solid #aaaaaa; min-width: 495px">'
 
     local shipInfoBox = '<div style="display: inline-block; vertical-align: top;"><table style="{{border-radius|10px 10px 10px 10px}} border: 1px solid #aaaaaa; min-width: 495px">'
Line 248: Line 248:  
     for num, id in pairs(IDList) do
 
     for num, id in pairs(IDList) do
 
         if shipType ~= nil then
 
         if shipType ~= nil then
             if shipType == shipdata[id]["type"] then
+
             if shipType == shipmodule[id]["type"] then
 
                 shipListTable = shipListTable .. shipmodule.KanmusuListEntry(id)
 
                 shipListTable = shipListTable .. shipmodule.KanmusuListEntry(id)
 
             end
 
             end
Line 262: Line 262:  
     local strings = '<tr>'
 
     local strings = '<tr>'
 
     local aircraftTotal = 0
 
     local aircraftTotal = 0
     if shipdata[id]["aircraft"] ~= "" then
+
     if shipmodule[id]["aircraft"] ~= "" then
 
     local aircraftslot = {0, 0, 0, 0}
 
     local aircraftslot = {0, 0, 0, 0}
 
         for i = 1, 4, 1 do
 
         for i = 1, 4, 1 do
             if shipdata[id]["aircraft"][i] ~= nil then
+
             if shipmodule[id]["aircraft"][i] ~= nil then
                 aircraftslot[i] = shipdata[id]["aircraft"][i]
+
                 aircraftslot[i] = shipmodule[id]["aircraft"][i]
 
             else
 
             else
 
                 aircraftslot[i] = 0
 
                 aircraftslot[i] = 0
Line 277: Line 277:     
     strings = strings .. '<td style="text-align: center;">' .. id .. '</td>'
 
     strings = strings .. '<td style="text-align: center;">' .. id .. '</td>'
     strings = strings .. '<td style="text-align: center;">[[' .. shipdata[id]["name"][3] .. ']]</td>'
+
     strings = strings .. '<td style="text-align: center;">[[' .. shipmodule[id]["name"][3] .. ']]</td>'
     strings = strings .. '<td style="text-align: center;">' .. shipdata[id]["class"] .. '</td>'
+
     strings = strings .. '<td style="text-align: center;">' .. shipmodule[id]["class"] .. '</td>'
     strings = strings .. '<td style="text-align: center;">' .. shipdata[id]["type"] .. '</td>'
+
     strings = strings .. '<td style="text-align: center;">' .. shipmodule[id]["type"] .. '</td>'
     strings = strings .. '<td style="text-align: center; background-color: #f0bbbb;">' .. shipdata[id]["fp"][1] .. '</td>'
+
     strings = strings .. '<td style="text-align: center; background-color: #f0bbbb;">' .. shipmodule[id]["fp"][1] .. '</td>'
     if shipdata[id]["torpedo"] == 0 then
+
     if shipmodule[id]["torpedo"] == 0 then
         strings = strings .. '<td style="text-align: center; background-color: #99eefa;">' .. shipdata[id]["torpedo"] .. '</td>'
+
         strings = strings .. '<td style="text-align: center; background-color: #99eefa;">' .. shipmodule[id]["torpedo"] .. '</td>'
 
     else
 
     else
         strings = strings .. '<td style="text-align: center; background-color: #99eefa;">' .. shipdata[id]["torpedo"][1] .. '</td>'
+
         strings = strings .. '<td style="text-align: center; background-color: #99eefa;">' .. shipmodule[id]["torpedo"][1] .. '</td>'
 
     end
 
     end
     if shipdata[id]["aa"] == 0 then
+
     if shipmodule[id]["aa"] == 0 then
         strings = strings .. '<td style="text-align: center; background-color: #faccaa;">' .. shipdata[id]["aa"] .. '</td>'
+
         strings = strings .. '<td style="text-align: center; background-color: #faccaa;">' .. shipmodule[id]["aa"] .. '</td>'
 
     else
 
     else
         strings = strings .. '<td style="text-align: center; background-color: #faccaa;">' .. shipdata[id]["aa"][1] .. '</td>'
+
         strings = strings .. '<td style="text-align: center; background-color: #faccaa;">' .. shipmodule[id]["aa"][1] .. '</td>'
 
     end
 
     end
     if shipdata[id]["asw"] == 0 then
+
     if shipmodule[id]["asw"] == 0 then
         strings = strings .. '<td style="text-align: center; background-color: #fff5ee;">' .. shipdata[id]["asw"] .. '</td>'
+
         strings = strings .. '<td style="text-align: center; background-color: #fff5ee;">' .. shipmodule[id]["asw"] .. '</td>'
 
     else
 
     else
         strings = strings .. '<td style="text-align: center; background-color: #fff5ee;">' .. shipdata[id]["asw"][1] .. '</td>'
+
         strings = strings .. '<td style="text-align: center; background-color: #fff5ee;">' .. shipmodule[id]["asw"][1] .. '</td>'
 
     end
 
     end
     strings = strings .. '<td style="text-align: center; background-color: #afffee;">' .. shipdata[id]["los"][1] .. '</td>'
+
     strings = strings .. '<td style="text-align: center; background-color: #afffee;">' .. shipmodule[id]["los"][1] .. '</td>'
     strings = strings .. '<td style="text-align: center; background-color: #cbfbcb;">' .. shipdata[id]["luck"][1] .. '</td>'
+
     strings = strings .. '<td style="text-align: center; background-color: #cbfbcb;">' .. shipmodule[id]["luck"][1] .. '</td>'
     strings = strings .. '<td style="text-align: center; background-color: #ffe0eb;">' .. shipdata[id]["hp"] .. '</td>'
+
     strings = strings .. '<td style="text-align: center; background-color: #ffe0eb;">' .. shipmodule[id]["hp"] .. '</td>'
     strings = strings .. '<td style="text-align: center; background-color: #ffffaa;">' .. shipdata[id]["armor"][1] .. '</td>'
+
     strings = strings .. '<td style="text-align: center; background-color: #ffffaa;">' .. shipmodule[id]["armor"][1] .. '</td>'
     strings = strings .. '<td style="text-align: center; background-color: #eeccee;">' .. shipdata[id]["evasion"][1] .. '</td>'
+
     strings = strings .. '<td style="text-align: center; background-color: #eeccee;">' .. shipmodule[id]["evasion"][1] .. '</td>'
 
     strings = strings .. '<td style="text-align: center; background-color: #d9d9d9;">' .. aircraftTotal .. '</td>'
 
     strings = strings .. '<td style="text-align: center; background-color: #d9d9d9;">' .. aircraftTotal .. '</td>'
     strings = strings .. '<td style="text-align: center; background-color: #aaffff;">' .. shipdata[id]["spd"] .. '</td>'
+
     strings = strings .. '<td style="text-align: center; background-color: #aaffff;">' .. shipmodule[id]["spd"] .. '</td>'
     strings = strings .. '<td style="text-align: center;">' .. shipdata[id]["range"] .. '</td>'
+
     strings = strings .. '<td style="text-align: center;">' .. shipmodule[id]["range"] .. '</td>'
     strings = strings .. '<td style="text-align: center;">' .. shipdata[id]["consumption"][1] .. '</td>'
+
     strings = strings .. '<td style="text-align: center;">' .. shipmodule[id]["consumption"][1] .. '</td>'
     strings = strings .. '<td style="text-align: center;">' .. shipdata[id]["consumption"][2] .. '</td></tr>'
+
     strings = strings .. '<td style="text-align: center;">' .. shipmodule[id]["consumption"][2] .. '</td></tr>'
 
     return strings
 
     return strings
 
end
 
end
    
return shipmodule
 
return shipmodule
3,663

edits