• Welcome to the Kancolle Wiki!
  • If you have any questions regarding site content, account registration, etc., please visit the KanColle Wiki Discord

Changes

Jump to navigation Jump to search
"Reversible to (remodel)" cell width/colspan fixed. Swapped ordering of ammo&steel in Remodel Req, to maintain ammo before steel consistency. Souya hardcode fix. Some small futureproofing.
Line 280: Line 280:  
     remodelinfo =
 
     remodelinfo =
 
       string.format(
 
       string.format(
       "[[File:IcoSteel.png|18px|Steel]] %d [[File:IcoAmmo.png|18px|Ammo]] %d",
+
       "[[File:IcoAmmo.png|18px|Ammo]] %d [[File:IcoSteel.png|18px|Steel]] %d",
       ship.remodelreq[1],
+
       ship.remodelreq[2],
       ship.remodelreq[2]
+
       ship.remodelreq[1]
 
     )
 
     )
 
     if ship.remodelbp then
 
     if ship.remodelbp then
Line 305: Line 305:  
           string.format("[[File:Item Icon Action Report.png|25px|Action Report|link=Action Report]] %d", ship.remodelar)
 
           string.format("[[File:Item Icon Action Report.png|25px|Action Report|link=Action Report]] %d", ship.remodelar)
 
     end
 
     end
     if ship.remodeldevmat or ship.remodelconmat or ship.remodelgunmat or ship.remodelairmat then
+
     if ship.remodeldevmat or ship.remodelconmat or ship.remodelgunmat or ship.remodelairmat or ship.remodelarmmat or ship.remodelboiler then
 
       remodelinfo = remodelinfo .. "<br>"
 
       remodelinfo = remodelinfo .. "<br>"
 
     end
 
     end
Line 423: Line 423:     
local function renderReversion(ship) --Copy paste mess by Chocolatecravinghobo. Shows information/cost for models that remodel/revert to a previous remodel
 
local function renderReversion(ship) --Copy paste mess by Chocolatecravinghobo. Shows information/cost for models that remodel/revert to a previous remodel
 +
  --- Souya hardcode fix
 +
  if ship["reversionto"] == "Souya " then
 +
ship.reversionto = ship.reversionto .. "(AGS)"
 +
  end
 +
 
 
   local reversionHeader = ""
 
   local reversionHeader = ""
 
   local reversionStyle = ""
 
   local reversionStyle = ""
 
   local reversionHeader =
 
   local reversionHeader =
       '<th style="width: 75%; white-space: nowrap; {{border-radius|12px 12px 12px 12px}} background-color: #3baef5; color: #ffffff; vertical-align: baseline;"> Reversible to ' .. ship.reversionto .. "</th>"
+
       '<th colspan="4" style="width: 75%; white-space: nowrap; {{border-radius|12px 12px 12px 12px}} background-color: #3baef5; color: #ffffff; vertical-align: baseline;"> Reversible to ' .. ship.reversionto .. "</th>"
 
   local reversionStyle = '<td style="white-space: nowrap; text-align: center; vertical-align: baseline;">'
 
   local reversionStyle = '<td style="white-space: nowrap; text-align: center; vertical-align: baseline;">'
 
   local RscHeader =
 
   local RscHeader =
Line 442: Line 447:  
     reversioninfo =
 
     reversioninfo =
 
       string.format(
 
       string.format(
       "[[File:IcoSteel.png|18px|Steel]] %d [[File:IcoAmmo.png|18px|Ammo]] %d",
+
       "[[File:IcoAmmo.png|18px|Ammo]] %d [[File:IcoSteel.png|18px|Steel]] %d",
       ship.reversionreq[1],
+
       ship.reversionreq[2],
       ship.reversionreq[2]
+
       ship.reversionreq[1]
 
     )
 
     )
 
     if ship.reversionbp then
 
     if ship.reversionbp then
Line 467: Line 472:  
           string.format("[[File:Item Icon Action Report.png|25px|Action Report|link=Action Report]] %d", ship.reversionar)
 
           string.format("[[File:Item Icon Action Report.png|25px|Action Report|link=Action Report]] %d", ship.reversionar)
 
     end
 
     end
     if ship.reversiondevmat or ship.reversionconmat or ship.reversiongunmat or ship.reversionairmat then
+
     if ship.reversiondevmat or ship.reversionconmat or ship.reversiongunmat or ship.reversionairmat or ship.reversionarmmat or ship.reversionboiler then
 
       reversioninfo = reversioninfo .. "<br>"
 
       reversioninfo = reversioninfo .. "<br>"
 
     end
 
     end
Line 606: Line 611:  
   data.remodelairmat = trueIsOne(ship._remodel_airmat)
 
   data.remodelairmat = trueIsOne(ship._remodel_airmat)
 
   data.remodelarmmat = trueIsOne(ship._remodel_armament)
 
   data.remodelarmmat = trueIsOne(ship._remodel_armament)
 +
  data.remodelboiler = trueIsOne(ship._remodel_boiler)
 
   data.remodeldevmat = trueIsOne(ship._remodel_development_material)
 
   data.remodeldevmat = trueIsOne(ship._remodel_development_material)
 
   data.remodelconmat = trueIsOne(ship._remodel_construction_material)
 
   data.remodelconmat = trueIsOne(ship._remodel_construction_material)
  data.remodelboiler = trueIsOne(ship._remodel_boiler)
   
    
 
    
 
   data.reversible = trueIsOne(ship._reversible)
 
   data.reversible = trueIsOne(ship._reversible)
 
   data.reversionto = ship:remodel_to() or ""
 
   data.reversionto = ship:remodel_to() or ""
 
   data.reversionto = data.reversionto:gsub("/", " ")
 
   data.reversionto = data.reversionto:gsub("/", " ")
 +
  data.reversionbp = trueIsOne(ship._remodel_to_blueprint)
 
   data.reversionlv = ship:remodel_to_level() or ""
 
   data.reversionlv = ship:remodel_to_level() or ""
 
   data.reversionreq = not ship._remodel_to_steel and not ship._remodel_to_ammo and '' or {ship._remodel_to_steel or 0, ship._remodel_to_ammo or 0}
 
   data.reversionreq = not ship._remodel_to_steel and not ship._remodel_to_ammo and '' or {ship._remodel_to_steel or 0, ship._remodel_to_ammo or 0}
 
   data.reversionbp = trueIsOne(ship._remodel_to_blueprint)
 
   data.reversionbp = trueIsOne(ship._remodel_to_blueprint)
 
   data.reversioncatapult = trueIsOne(ship._remodel_to_catapult)
 
   data.reversioncatapult = trueIsOne(ship._remodel_to_catapult)
 +
  data.reversionar = trueIsOne(ship._remodel_to_report)
 +
  data.reversiongunmat = trueIsOne(ship._remodel_to_gunmat)
 +
  data.reversionairmat = trueIsOne(ship._remodel_to_airmat)
 +
  data.reversionarmmat = trueIsOne(ship._remodel_to_armament)
 +
  data.remodelboiler = trueIsOne(ship._remodel_to_boiler)
 
   data.reversiondevmat = trueIsOne(ship._remodel_to_development_material)
 
   data.reversiondevmat = trueIsOne(ship._remodel_to_development_material)
 
   data.reversionconmat = trueIsOne(ship._remodel_to_construction_material)
 
   data.reversionconmat = trueIsOne(ship._remodel_to_construction_material)
advmod, cssedit, janitor, Moderators, prechecked, Widget editors
6,940

edits

Navigation menu