Module:ShipDropTable - Revision history

Jigaraphale at 11:15, 23 January 2023

2023-01-23T11:15:08Z

2022-11-01T16:31:52Z

✔️

2022-05-10T07:14:57Z

Updated for world 7-4. I think.

2021-11-01T13:55:15Z

2021-11-01T12:55:03Z

2021-11-01T12:44:06Z

2021-11-01T12:42:35Z

2021-11-01T12:41:07Z

2021-11-01T12:39:52Z

2021-10-31T19:11:07Z

@@ Line 8: / Line 8: @@
    {world = 2, maps = 5},
    {world = 3, maps = 5},
-   {world = 7, maps = 4},
+   {world = 7, maps = 5},
    {world = 4, maps = 5},
    {world = 5, maps = 5},

@@ Line 30: / Line 30: @@
      for map = 1, e.maps do
        local drop = shipDropData[string.format("%d-%d", e.world, map)]
-       table.insert(result, string.format("<td%s>%s</td>", drop and ' style="background-color:#c8e6c9"' or "", drop and Formatting:tooltip2("✓", drop, "; ") or ""))
+       table.insert(result, string.format("<td%s>%s</td>", drop and ' style="background-color:#c8e6c9"' or "", drop and Formatting:tooltip2("✔️", drop, "; ") or ""))
      end
    end

@@ Line 8: / Line 8: @@
    {world = 2, maps = 5},
    {world = 3, maps = 5},
-   {world = 7, maps = 3},
+   {world = 7, maps = 4},
    {world = 4, maps = 5},
    {world = 5, maps = 5},

@@ Line 8: / Line 8: @@
    {world = 2, maps = 5},
    {world = 3, maps = 5},
    {world = 4, maps = 5},
    {world = 5, maps = 5},
    {world = 6, maps = 5},
+}

@@ Line 12: / Line 12: @@
    {world = 6, maps = 5},
    {world = 7, maps = 3}
+}
@@ Line 30: / Line 19: @@
    local result = {
      string.format(
-       [=[<tr><td>[[%s]]</td><td style="%s">%s</td><td>[[%s]]</td><td>%s</td>]=],
+       [=[<tr><td>[[%s]]</td><td%s>%s</td><td>[[%s]]</td><td>%s</td>]=],
        shipName,
-       rarityStyles[ship:back()] or "",
+       ship:back() and string.format(' style="background-color:%s;color:black"', Formatting:format_ship_back(ship:back())) or "",
        Formatting:format_ship_rarity(ship:back()),
        Formatting:format_ship_code(ship:type()),
@@ Line 60: / Line 49: @@
      table.insert(result, string.format([=[<th colspan="%s">[[World %s]]</th>]=], e.maps, e.world))
    end
-   table.insert(result, [[<th rowspan="2">Remarks</th>]])
+   table.insert(result, [[<th rowspan="2">Remarks</th></tr><tr>]])
    for _, e in ipairs(worlds) do
      for map = 1, e.maps do

@@ Line 1: / Line 1: @@
 local U = require("Module:Core")
 local Ship = require("Module:Ship")
 local Formatting = require("Module:Formatting")
@@ Line 52: / Line 51: @@
 local function render(frame)
-   local args = U.getTemplateArgs(frame)
+   local args = frame.args
    local result = {[[<div style="overflow-x:auto"><table class="wikitable sortable" style="text-align:center;width:100%">]]}
    table.insert(result, "<tr>")
@@ Line 77: / Line 76: @@
 end
-return { returnShipDrop = render } -- View(render, {"Nagato", "Yamato"})
+return { returnShipDrop = render }

← Older revision		Revision as of 12:41, 1 November 2021
Line 76:		Line 76:
	end		end

−	return View(render, {"Nagato", "Yamato"})	+	return { returnShipDrop = render } -- View(render, {"Nagato", "Yamato"})

@@ Line 49: / Line 49: @@
      html = html .. '<tr><th style="width:2.5%;"> [[1-1 | 1]]</th><th style="width:2.5%;"> [[1-2 | 2]]</th><th style="width:2.5%;"> [[1-3 | 3]]</th><th style="width:2.5%;"> [[1-4 | 4]]</th><th style="width:2.5%;"> [[1-5 | 5]]</th><th style="width:2.5%;"> [[1-6 | 6]]</th>'
      html = html .. '<th style="width:2.5%;"> [[2-1 | 1]]</th><th style="width:2.5%;"> [[2-2 | 2]]</th><th style="width:2.5%;"> [[2-3 | 3]]</th><th style="width:2.5%;"> [[2-4 | 4]]</th><th style="width:2.5%;"> [[2-5 | 5]]</th>'
-     html = html .. '<th style="width:2.5%;"> [[3-3 | 1]]</th><th style="width:2.5%;"> [[3-2 | 2]]</th><th style="width:2.5%;"> [[3-3 | 3]]</th><th style="width:2.5%;"> [[3-4 | 4]]</th><th style="width:2.5%;"> [[3-5 | 5]]</th>'
+     html = html .. '<th style="width:2.5%;"> [[3-1 | 1]]</th><th style="width:2.5%;"> [[3-2 | 2]]</th><th style="width:2.5%;"> [[3-3 | 3]]</th><th style="width:2.5%;"> [[3-4 | 4]]</th><th style="width:2.5%;"> [[3-5 | 5]]</th>'
      html = html .. '<th style="width:2.5%;"> [[4-1 | 1]]</th><th style="width:2.5%;"> [[4-2 | 2]]</th><th style="width:2.5%;"> [[4-3 | 3]]</th><th style="width:2.5%;"> [[4-4 | 4]]</th><th style="width:2.5%;"> [[4-5 | 5]]</th>'
      html = html .. '<th style="width:2.5%;"> [[5-1 | 1]]</th><th style="width:2.5%;"> [[5-2| 2]]</th><th style="width:2.5%;"> [[5-3 | 3]]</th><th style="width:2.5%;"> [[5-4 | 4]]</th><th style="width:2.5%;"> [[5-5 | 5]]</th>'