Line 1: |
Line 1: |
| + | -- [[Category:Todo]]: have Module:Logger to expose syntax warnings, similarly to Module:DropList (use it there as well). |
| + | |
| local getArgs = require("Module:GetArgs") | | local getArgs = require("Module:GetArgs") |
− | local format = require("Module:StringOperations").format | + | local Utils = require("Module:Core") |
− | local find = require("Module:Utils").find | + | local format = Utils.format |
| local BaseData = require("Module:BaseData") | | local BaseData = require("Module:BaseData") |
| | | |
Line 9: |
Line 11: |
| split = "^%s*(.+)%s*->%s*(.+)%s*$", | | split = "^%s*(.+)%s*->%s*(.+)%s*$", |
| comma_list = "[^,]+", | | comma_list = "[^,]+", |
− | node_and_color = "^%s*(%a)%s*/%s*(%S+)%s*$", | + | node_and_colors = "^%s*([%a%d]+)%s*/%s*(%S+)%s*$", |
− | node = "^%s*([%a%d])%s*$", | + | node = "^%s*([%a%d]+)%s*$", |
| digit_node = "^%s*%d%s*$", | | digit_node = "^%s*%d%s*$", |
| }, | | }, |
Line 23: |
Line 25: |
| |- class="mw-customtoggle-${id}" style="cursor:pointer;" | | |- class="mw-customtoggle-${id}" style="cursor:pointer;" |
| !colspan="3"|${title} | | !colspan="3"|${title} |
− | |- class="mw-collapsible mw-collapsed" id="mw-customcollapsible-${id}" | + | |- class="mw-collapsible ${collapsed}" id="mw-customcollapsible-${id}" |
| !colspan="2"|Nodes||Rules | | !colspan="2"|Nodes||Rules |
| ${rows} | | ${rows} |
| |}]], | | |}]], |
| | | |
− | _row_start_template = [[|- class="mw-collapsible mw-collapsed" id="mw-customcollapsible-${id}" | + | _row_start_template = [[|- class="mw-collapsible ${collapsed}" id="mw-customcollapsible-${id}" |
| |rowspan="${rowspan}" style="text-align:center;vertical-align:middle;width:50px;"|${from}]], | | |rowspan="${rowspan}" style="text-align:center;vertical-align:middle;width:50px;"|${from}]], |
| | | |
− | _row_separator_template = [[|- class="mw-collapsible mw-collapsed" id="mw-customcollapsible-${id}" | + | _row_separator_template = [[|- class="mw-collapsible ${collapsed}" id="mw-customcollapsible-${id}" |
| ]], | | ]], |
| | | |
− | _row_template = [[${separator}|class="mw-collapsible mw-collapsed" id="mw-customcollapsible-${id}" style="text-align:center;width:50px;"|${to}${rules}]], | + | _row_template = [[${separator}|class="mw-collapsible ${collapsed}" id="mw-customcollapsible-${id}" style="text-align:center;width:50px;"|${to}${rules}]], |
| | | |
| _rules = "\n|rowspan=\"${span}\" style=\"padding:10px;\"|\n${rules}", | | _rules = "\n|rowspan=\"${span}\" style=\"padding:10px;\"|\n${rules}", |
| | | |
| -- .kcRoute is defined in MediaWiki:Common.css | | -- .kcRoute is defined in MediaWiki:Common.css |
− | _node_template = [[<div class="kcRoute" style="vertical-align:middle"><div class="kcRouteNode" style="background:${color};">${label}</div></div>]], | + | _node_template = [[<div class="maproute" style="vertical-align:middle"><div class="${class}" style="${style}">${label}</div></div>]], |
| + | |
| + | _node_color1 = [[background: ${color};]], |
| + | |
| + | _node_color2 = [[background: linear-gradient(90deg, ${color1} 50%, ${color2} 50%)]], |
| + | |
| + | _node_color3 = [[background: linear-gradient(-30deg, transparent 60%, ${color1} 60%) 0% 100%, linear-gradient(30deg, transparent 60%, ${color2} 60%) 100% 100%, linear-gradient(${color3}, ${color3}) 0% 100%, linear-gradient(${color3}, ${color3}) 100% 100%, linear-gradient(${color1}, ${color1}) 0% 0%, linear-gradient(${color2}, ${color2}) 100% 0%; background-repeat: no-repeat; background-size: 50% 50%;]], |
| + | |
| + | _node_color4 = [[background: linear-gradient(${color1}, ${color1}) 0% 0%, linear-gradient(${color2}, ${color2}) 100% 0%, linear-gradient(${color3}, ${color3}) 100% 100%, linear-gradient(${color4}, ${color4}) 0% 100%; background-size: 50% 50%; background-repeat: no-repeat;]], |
| | | |
| _node_colors = { | | _node_colors = { |
Line 47: |
Line 57: |
| storm = "#EA80FC", -- Purple A100 | | storm = "#EA80FC", -- Purple A100 |
| empty = "#40C4FF", -- Light Blue A200 | | empty = "#40C4FF", -- Light Blue A200 |
| + | night = "#7E57C2", -- Deep Purple 400 |
| + | nightday_night = { "battle", "night", "night", "night" }, |
| + | night_battle_empty = { "night", "battle", "empty" }, |
| + | ambush = { "battle", "orange", "battle", "orange" }, |
| }, | | }, |
| | | |
Line 55: |
Line 69: |
| end | | end |
| | | |
− | function MapBranchingTable:log(str) | + | function MapBranchingTable:parse_node(node_string) |
− | if not self._vars.log then | + | local node, colors = node_string:match(self._grammar.node_and_colors) |
− | self._vars.log = "" | + | if not node then |
| + | node = node_string:match(self._grammar.node) |
| + | else |
| + | colors = mw.text.split(colors, "%s*/%s*") |
| end | | end |
− | self._vars.log = self._vars.log .. str .. "\n" | + | return node, colors |
| end | | end |
| | | |
Line 65: |
Line 82: |
| self._vars = { | | self._vars = { |
| id = args.id or args.title and make_id_from_title(args.title) or self._id, | | id = args.id or args.title and make_id_from_title(args.title) or self._id, |
− | -- id = args.id or args.title and make_id_from_title(args.title) or remiLib.timeHash(args) or self._id,
| |
| title = args.title or self._title, | | title = args.title or self._title, |
| width = args.width or self._width, | | width = args.width or self._width, |
| branching = { index = {} }, | | branching = { index = {} }, |
| + | collapsed = args.expand and "" or "mw-collapsed", |
| } | | } |
| local branching = self._vars.branching | | local branching = self._vars.branching |
Line 75: |
Line 92: |
| local from_node, to_nodes = route:match(self._grammar.split) | | local from_node, to_nodes = route:match(self._grammar.split) |
| if from_node and to_nodes then | | if from_node and to_nodes then |
− | local from_node_, from_node_color = from_node:match(self._grammar.node_and_color) | + | local from_node_colors |
− | from_node = from_node_color and from_node_ or from_node:match(self._grammar.node) | + | from_node, from_node_colors = self:parse_node(from_node) |
| local first_node = nil | | local first_node = nil |
| for to_node in string.gmatch(to_nodes, self._grammar.comma_list) do | | for to_node in string.gmatch(to_nodes, self._grammar.comma_list) do |
− | local to_node_, to_node_color = to_node:match(self._grammar.node_and_color) | + | local to_node_colors |
− | to_node = to_node_color and to_node_ or to_node:match(self._grammar.node) | + | to_node, to_node_colors = self:parse_node(to_node) |
| if from_node and to_node then | | if from_node and to_node then |
− | if not find(branching.index, from_node) then | + | Utils.insertNew(branching.index, from_node) |
− | table.insert(branching.index, from_node)
| |
− | end
| |
| if not branching[from_node] then | | if not branching[from_node] then |
− | branching[from_node] = { color = from_node_color, index = {} } | + | branching[from_node] = { |
| + | colors = from_node_colors, |
| + | index = {}, |
| + | indexes = { index = {}, groups = {} } |
| + | } |
| end | | end |
| if not first_node then | | if not first_node then |
| first_node = to_node | | first_node = to_node |
− | branching[from_node][to_node] = { color = to_node_color, rules = rules, span = 1 } | + | branching[from_node][to_node] = { |
| + | colors = to_node_colors, |
| + | rules = rules, |
| + | span = 1 |
| + | } |
| + | if not branching[from_node].indexes.groups[first_node] then |
| + | table.insert(branching[from_node].indexes.index, first_node) |
| + | branching[from_node].indexes.groups[first_node] = { first_node } |
| + | end |
| else | | else |
| branching[from_node][first_node].span = branching[from_node][first_node].span + 1 | | branching[from_node][first_node].span = branching[from_node][first_node].span + 1 |
− | branching[from_node][to_node] = { color = to_node_color } | + | branching[from_node][to_node] = { colors = to_node_colors } |
− | end
| + | if branching[from_node].indexes.groups[first_node] then |
− | if not find(branching[from_node].index, to_node) then
| + | Utils.insertNew(branching[from_node].indexes.groups[first_node], to_node) |
− | table.insert(branching[from_node].index, to_node)
| + | end |
| end | | end |
| end | | end |
Line 103: |
Line 130: |
| end | | end |
| end | | end |
− | table.sort(branching.index) | + | local sorting |
| + | if args.order then |
| + | local order_nodes = mw.text.split(args.order, "%s*,%s*") |
| + | sorting = function(a, b) |
| + | local ai = Utils.ifind(order_nodes, a) |
| + | local bi = Utils.ifind(order_nodes, b) |
| + | if ai and bi then |
| + | return ai < bi |
| + | else |
| + | return a < b |
| + | end |
| + | end |
| + | else |
| + | sorting = function(a, b) |
| + | return a < b |
| + | end |
| + | end |
| + | table.sort(branching.index, sorting) |
| for _, from in ipairs(branching.index) do | | for _, from in ipairs(branching.index) do |
− | table.sort(branching[from].index) | + | table.sort(branching[from].indexes.index, sorting) |
| + | for _, first_node in ipairs(branching[from].indexes.index) do |
| + | for _, node in ipairs(branching[from].indexes.groups[first_node]) do |
| + | table.insert(branching[from].index, node) |
| + | end |
| + | end |
| end | | end |
| end | | end |
| | | |
− | function MapBranchingTable:format_node(label, color) | + | function MapBranchingTable:format_color(color) |
| + | return self._node_colors[color] or color or self._node_colors.battle |
| + | end |
| + | |
| + | function MapBranchingTable:format_node(label, colors) |
| + | local style |
| + | if label:match(self._grammar.digit_node) then |
| + | style = format{self._node_color1, color = self._node_colors.grey} |
| + | elseif not colors or #colors == 0 then |
| + | style = format{self._node_color1, color = self._node_colors.battle} |
| + | elseif #colors == 1 then |
| + | if type(self._node_colors[colors[1]]) == "table" then |
| + | return self:format_node(label, self._node_colors[colors[1]]) |
| + | end |
| + | style = format{self._node_color1, color = self:format_color(colors[1])} |
| + | elseif #colors == 2 then |
| + | style = format{ |
| + | self._node_color2, |
| + | color1 = self:format_color(colors[1]), |
| + | color2 = self:format_color(colors[2]), |
| + | } |
| + | elseif #colors == 3 then |
| + | style = format{ |
| + | self._node_color3, |
| + | color1 = self:format_color(colors[1]), |
| + | color2 = self:format_color(colors[2]), |
| + | color3 = self:format_color(colors[3]), |
| + | } |
| + | elseif #colors >= 4 then |
| + | style = format{ |
| + | self._node_color4, |
| + | color1 = self:format_color(colors[1]), |
| + | color2 = self:format_color(colors[2]), |
| + | color3 = self:format_color(colors[3]), |
| + | color4 = self:format_color(colors[4]), |
| + | } |
| + | end |
| return label == "0" and self._start or format{ | | return label == "0" and self._start or format{ |
| self._node_template, | | self._node_template, |
| label = label, | | label = label, |
− | color = label:match(self._grammar.digit_node) | + | class = #label > 1 and "mapnodewide" or "mapnode", |
− | and self._node_colors.grey
| + | style = style |
− | or self._node_colors[color]
| |
− | or color
| |
− | or self._node_colors.battle
| |
| } | | } |
| end | | end |
Line 128: |
Line 210: |
| self._row_start_template, | | self._row_start_template, |
| rowspan = #branching[from_node].index, | | rowspan = #branching[from_node].index, |
− | from = self:format_node(from_node, branching[from_node].color), | + | from = self:format_node(from_node, branching[from_node].colors), |
| id = self._vars.id, | | id = self._vars.id, |
| + | collapsed = self._vars.collapsed, |
| }) | | }) |
| local first = true | | local first = true |
Line 135: |
Line 218: |
| table.insert(rows, format{ | | table.insert(rows, format{ |
| self._row_template, | | self._row_template, |
− | separator = first and "" or format{self._row_separator_template, id = self._vars.id}, | + | separator = first and "" or format{ |
− | to = self:format_node(to_node, branching[from_node][to_node].color), | + | self._row_separator_template, |
| + | id = self._vars.id, |
| + | collapsed = self._vars.collapsed, |
| + | }, |
| + | to = self:format_node(to_node, branching[from_node][to_node].colors), |
| rules = branching[from_node][to_node].rules and format{ | | rules = branching[from_node][to_node].rules and format{ |
| self._rules, | | self._rules, |
Line 143: |
Line 230: |
| } or "", | | } or "", |
| id = self._vars.id, | | id = self._vars.id, |
| + | collapsed = self._vars.collapsed, |
| }) | | }) |
| first = false | | first = false |
Line 160: |
Line 248: |
| end | | end |
| | | |
− | --[[
| + | Utils.registerTableTests(MapBranchingTable, { |
− | MapBranchingTable.t = MapBranchingTable.Table(nil, {
| + | { |
− | ["0 -> 1"] = "Fixed route", | + | ["0 -> 1"] = "Fixed route", |
− | ["1 -> A, B/battle, C/empty"] = "Random",
| + | ["1 -> C/empty, D"] = "Random", |
− | ["title"] = "A Custom Title",
| + | ["1 -> A, B/battle, X/empty"] = "Random", |
− | "?",
| + | ["C -> F, G/battle/empty"] = "...", |
| + | ["B -> D/red/green/blue, E/red/green/blue/yellow"] = "...", |
| + | ["X -> Y/nightday_night, Z/night_battle_empty"] = "...", |
| + | ["Z1 -> Z2, Z3"] = "...", |
| + | ["ZZ1 -> ZZ2, ZZ3"] = "...", |
| + | ["title"] = "A Custom Title", |
| + | ["order"] = "C, A, 1, B", |
| + | "?", |
| + | } |
| }) | | }) |
− | --print(p.t) | + | -- p.run_table_tests() |
− | --print(p._vars.log)
| |
− | ]]--
| |
| | | |
| return MapBranchingTable | | return MapBranchingTable |