Module:WarLeagueDivisionOpsBVR - Revision history

NewZimiaGov at 02:05, 29 May 2026

2026-05-29T02:05:40Z

← Older revision		Revision as of 02:05, 29 May 2026
Line 759:		Line 759:
	local seed = tonumber(args.seed) or (di.year * 1000 + di.dayOfYear)		local seed = tonumber(args.seed) or (di.year * 1000 + di.dayOfYear)
	math.randomseed(seed)		math.randomseed(seed)

			-- Southern Strait-only display settings.
			-- rows = number of rows to DISPLAY.
			-- scanrows = number of original War League rows to scan before filtering.
			-- This preserves original Op-IDs because the original row index is still used.
			local displayLimit = rows
			local scanRows = rows
			if southernStraitOnly then
			scanRows = tonumber(args.scanrows or args.searchrows or args.sourcerows) or math.max(rows * 6, 120)
			end
			local displayed = 0

	local divFilter = tostring(args.division or ""):lower()		local divFilter = tostring(args.division or ""):lower()
	local divPool = {}		local divPool = {}

	~~local function addDivisionIfAllowed(d)~~		-- Important:
	~~if southernStraitOnly and not isSouthernStraitDivision(d) then~~		-- Southern Strait-only mode must NOT change the division pool.
	~~return~~		-- It should only hide non-Southern rows after the normal War League row
	~~end~~		-- has been generated. This preserves Op-ID, row index, operation type,
			-- and all deterministic row details.
	if divFilter ~= "" then		if divFilter ~= "" then
			for _, d in ipairs(DIVISIONS) do
	if d.name:lower():find(divFilter, 1, true) or d.code:lower():find(divFilter, 1, true) then		if d.name:lower():find(divFilter, 1, true) or d.code:lower():find(divFilter, 1, true) then
	~~table.insert(divPool, d)~~
	~~end~~
	~~else~~
	~~table.insert(divPool, d)~~
	~~end~~
	~~end~~

	~~for _, d in ipairs(DIVISIONS) do~~
	~~addDivisionIfAllowed(d)~~
	~~end~~

	~~-- If someone asks for a non-Southern division while zone=SouthernStrait,~~
	~~-- fall back to the valid Southern Strait security pool rather than printing nothing.~~
	~~if #divPool == 0 and southernStraitOnly then~~
	~~for _, d in ipairs(DIVISIONS) do~~
	~~if isSouthernStraitDivision(d) then~~
	table.insert(divPool, d)		table.insert(divPool, d)
	end		end
	end		end
	~~elseif~~ #divPool == 0 then		if #divPool == 0 then divPool = DIVISIONS end
			else
	divPool = DIVISIONS		divPool = DIVISIONS
	end		end
Line 811:		Line 808:
	)		)

	for i = 1, ~~rows~~ do		for i = 1, scanRows do
	local div = pickWeighted(divPool)		local div = pickWeighted(divPool)
	local cityName = pick(div.cities)		local cityName = pick(div.cities)

	-- Southern Strait-~~only mode: every War League~~ row must be ~~tied to a~~		-- Do NOT force Southern Strait cities here.
	-- ~~Haifan Bassaridian / Southern Strait node~~.		-- The row must be generated normally so Op-ID, division, operation type,
	~~if southernStraitOnly then~~		-- and force details match the ordinary War League page.
	~~cityName = pick(SOUTHERN_STRAIT_CITY_LIST)~~
	~~end~~

	-- Guardrail: Caledonian city => CKD.		-- Guardrail: Caledonian city => CKD.
Line 994:		Line 989:
	end		end

	local ~~notes~~ = ~~bulletList({ "Op-ID: " .. opId(di, div.code, i) })~~		local includeRow = true
	~~local style~~ = ~~rowColor~~(~~obs, comp, uScore~~)		if southernStraitOnly then
			includeRow = isHaifanBassaridiaCity(cityName)
			end

	table.insert(out, "\|-" .. style)		local notes = bulletList({ "Op-ID: " .. opId(di, div.code, i) })
	table.insert(out, string.format(		local style = rowColor(obs, comp, uScore)
	"\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s",
	di.text, divCell, cityCell, evDesc, urg,		if includeRow then
	opsAlertCell, opsImpactCell,		table.insert(out, "\|-" .. style)
	op.name, ground, naval, air, obs, bulletList({ comp, notes })		table.insert(out, string.format(
	))		"\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s \|\| %s",
			di.text, divCell, cityCell, evDesc, urg,
			opsAlertCell, opsImpactCell,
			op.name, ground, naval, air, obs, bulletList({ comp, notes })
			))

			displayed = displayed + 1
			if displayed >= displayLimit then
			break
	end		end
			end
			end

			if southernStraitOnly and displayed == 0 then
			table.insert(out, "\|-")
			table.insert(out, "\| colspan='13' style='text-align:center;' \| No Southern Strait / Haifan Bassaridian War League rows appeared in the scanned source rows. Increase scanrows.")
			end

	table.insert(out, "\|}")		table.insert(out, "\|}")

	if showLegend then		if showLegend then

NewZimiaGov at 23:46, 28 May 2026

2026-05-28T23:46:33Z

@@ Line 161: / Line 161: @@
 local function isHaifanBassaridiaCity(cityName)
      return HAIFAN_BASSARIDIA_CITIES[tostring(cityName or "")] == true
 end
@@ Line 714: / Line 747: @@
 --------------------------------------------------------------------------------
 function p.makeTable(frame)
-    local args = frame and frame.args or {}
+local args = frame and frame.args or {}
-    local di = getPSSCDate(args)
+local di = getPSSCDate(args)
-    local rows = tonumber(args.rows) or 36
+local rows = tonumber(args.rows) or 36
-    local showLegend = tostring(args.showlegend or "yes"):lower() ~= "no"
+local showLegend = tostring(args.showlegend or "yes"):lower() ~= "no"
-    local flagSize = tonumber(args.flagsize) or 20
+local flagSize = tonumber(args.flagsize) or 20
-    local eventMap, hasEvents = buildEventMapForToday(di)
+local southernStraitOnly = isSouthernStraitOnly(args)
      local eventMap, hasEvents = buildEventMapForToday(di)
@@ Line 726: / Line 760: @@
      math.randomseed(seed)
-    local divFilter = tostring(args.division or ""):lower()
+local divFilter = tostring(args.division or ""):lower()
-    local divPool = {}
+local divPool = {}
      if divFilter ~= "" then
-         for _, d in ipairs(DIVISIONS) do
+         if d.name:lower():find(divFilter, 1, true) or d.code:lower():find(divFilter, 1, true) then
-            if d.name:lower():find(divFilter, 1, true) or d.code:lower():find(divFilter, 1, true) then
+            table.insert(divPool, d)
          end
      else
-         divPool = DIVISIONS
+         table.insert(divPool, d)
      end
      local out = {}
@@ Line 757: / Line 811: @@
+     )
-    for i = 1, rows do
+for i = 1, rows do
-        local div = pickWeighted(divPool)
+    local div = pickWeighted(divPool)
-        local cityName = pick(div.cities)
+    local cityName = pick(div.cities)
 -- Guardrail: Caledonian city => CKD.

NewZimiaGov at 18:03, 28 May 2026

2026-05-28T18:03:34Z

← Older revision		Revision as of 18:03, 28 May 2026
Line 721:		Line 721:
	local eventMap, hasEvents = buildEventMapForToday(di)		local eventMap, hasEvents = buildEventMapForToday(di)

	local eventMap, hasEvents = buildEventMapForToday()		local eventMap, hasEvents = buildEventMapForToday(di)

	local seed = tonumber(args.seed) or (di.year * 1000 + di.dayOfYear)		local seed = tonumber(args.seed) or (di.year * 1000 + di.dayOfYear)

NewZimiaGov at 04:09, 28 May 2026

2026-05-28T04:09:15Z

Show changes

NewZimiaGov at 21:24, 24 May 2026

2026-05-24T21:24:49Z

Show changes

NewZimiaGov at 16:47, 26 April 2026

2026-04-26T16:47:35Z

← Older revision		Revision as of 16:47, 26 April 2026
Line 18:		Line 18:
	-- (A) PSSC DATE (same logic used by Module:BassaridianDailyEvents)		-- (A) PSSC DATE (same logic used by Module:BassaridianDailyEvents)
	--------------------------------------------------------------------------------		--------------------------------------------------------------------------------
	local function getPSSCDate()		local function getPSSCDate(args)
			args = args or {}

			local overrideYear = tonumber(args.year or args.psscyear)
			local overrideDay = tonumber(args.day or args.dayofyear)

			if overrideYear and overrideDay then
			if overrideDay < 1 then overrideDay = 1 end
			if overrideDay > 183 then overrideDay = 183 end

			local month, dayOfMonth
			if overrideDay <= 61 then
			month = 1
			dayOfMonth = overrideDay
			elseif overrideDay <= 122 then
			month = 2
			dayOfMonth = overrideDay - 61
			else
			month = 3
			dayOfMonth = overrideDay - 122
			end

			local dateString = string.format("%d/%d/%d PSSC", dayOfMonth, month, overrideYear)
			return {
			text = dateString,
			year = overrideYear,
			dayOfYear = overrideDay,
			month = month,
			dom = dayOfMonth
			}
			end

	local startDate = os.time({year = 1999, month = 8, day = 6})		local startDate = os.time({year = 1999, month = 8, day = 6})
	local secondsInDay = 86400		local secondsInDay = 86400
Line 30:		Line 61:
	local month, dayOfMonth		local month, dayOfMonth
	if dayOfYear <= 61 then		if dayOfYear <= 61 then
	month = 1; dayOfMonth = dayOfYear		month = 1
			dayOfMonth = dayOfYear
	elseif dayOfYear <= 122 then		elseif dayOfYear <= 122 then
	month = 2; dayOfMonth = dayOfYear - 61		month = 2
			dayOfMonth = dayOfYear - 61
	else		else
	month = 3; dayOfMonth = dayOfYear - 122		month = 3
			dayOfMonth = dayOfYear - 122
	end		end

Line 109:		Line 143:
	-- (E) INTEGRATE DAILY EVENTS (parse Module:BassaridianDailyEvents.makeTable())		-- (E) INTEGRATE DAILY EVENTS (parse Module:BassaridianDailyEvents.makeTable())
	--------------------------------------------------------------------------------		--------------------------------------------------------------------------------
	local function buildEventMapForToday()		local function buildEventMapForToday(di)
	local ok, daily = pcall(require, "Module:BassaridianDailyEvents")		local ok, daily = pcall(require, "Module:BassaridianDailyEvents")
	if not ok or not daily or type(daily.makeTable) ~= "function" then		if not ok or not daily or type(daily.makeTable) ~= "function" then
	return {}, false		return {}, false
	end		end
	local tbl = daily.makeTable() ~~-- rows: "\| date \|\| city \|\| event \|\| urgency"~~
			local tbl
			if di and di.year and di.dayOfYear then
			tbl = daily.makeTable({
			args = {
			year = tostring(di.year),
			day = tostring(di.dayOfYear)
			}
			})
			else
			tbl = daily.makeTable()
			end

	local eventMap = {}		local eventMap = {}
	for line in tostring(tbl):gmatch("[^\n]+") do		for line in tostring(tbl):gmatch("[^\n]+") do
Line 129:		Line 175:
	end		end
	end		end

	return eventMap, true		return eventMap, true
	end		end
Line 429:		Line 476:
	--------------------------------------------------------------------------------		--------------------------------------------------------------------------------
	function p.makeTable(frame)		function p.makeTable(frame)
	~~local di = getPSSCDate()~~
	local args = frame and frame.args or {}		local args = frame and frame.args or {}
			local di = getPSSCDate(args)
	local rows = tonumber(args.rows) or 36		local rows = tonumber(args.rows) or 36
	local showLegend = tostring(args.showlegend or "yes"):lower() ~= "no"		local showLegend = tostring(args.showlegend or "yes"):lower() ~= "no"
	local flagSize = tonumber(args.flagsize) or 20		local flagSize = tonumber(args.flagsize) or 20
			local eventMap, hasEvents = buildEventMapForToday(di)

	local eventMap, hasEvents = buildEventMapForToday()		local eventMap, hasEvents = buildEventMapForToday()

NewZimiaGov at 15:57, 25 April 2026

2026-04-25T15:57:34Z

← Older revision		Revision as of 15:57, 25 April 2026
Line 334:		Line 334:
	cities={"Bashkim","Ourid","Tonar"} },		cities={"Bashkim","Ourid","Tonar"} },

	{ name="Council of Kings Division", link="[[Council of Kings Division]]", code="CKD", weight=1,		{ name="Council of Kings Division", link="[[Council of Kings Division]]", code="CKD", weight=1,
	cities={"Fanghorn","Eikbu","Galvø","Sårensby","Slevik","Sjøsborg","Storesund","Notranskja","Kaledonija","Krlsgorod"} },		cities={
			"Fanghorn",
			"Eikbu",
			"Galvø",
			"Skøda",
			"Hamarrfell",
			"Sårensby",
			"Slevik",
			"Sjøsborg",
			"Storesund",
			"Notranskja",
			"Kaledonija",
			"Krlsgorod"
			} },
	}		}

NewZimiaGov at 19:39, 3 April 2026

2026-04-03T19:39:35Z

← Older revision		Revision as of 19:39, 3 April 2026
Line 95:		Line 95:
	["Eikbu"] = true,		["Eikbu"] = true,
	["Galvø"] = true,		["Galvø"] = true,
			["Skøda"] = true,
			["Hamarrfell"] = true,
	["Sårensby"] = true,		["Sårensby"] = true,
	["Slevik"] = true,		["Slevik"] = true,
Line 101:		Line 103:
	["Notranskja"] = true,		["Notranskja"] = true,
	["Kaledonija"] = true,		["Kaledonija"] = true,
	["Krlsgorod"] = true,		["Krlsgorod"] = true,
	}		}

Line 333:		Line 335:

	{ name="Council of Kings Division", link="[[Council of Kings Division]]", code="CKD", weight=1,		{ name="Council of Kings Division", link="[[Council of Kings Division]]", code="CKD", weight=1,
	cities={"Fanghorn","Eikbu","Galvø","Sårensby","Slevik","Sjøsborg","Storesund","Notranskja","Kaledonija","Krlsgorod"} },		cities={"Fanghorn","Eikbu","Galvø","Sårensby","Slevik","Sjøsborg","Storesund","Notranskja","Kaledonija","Krlsgorod"} },
	}		}

NewZimiaGov at 03:10, 14 January 2026

2026-01-14T03:10:05Z

← Older revision		Revision as of 03:10, 14 January 2026
Line 101:		Line 101:
	["Notranskja"] = true,		["Notranskja"] = true,
	["Kaledonija"] = true,		["Kaledonija"] = true,
			["Krlsgorod"] = true,
	}		}

Line 332:		Line 333:

	{ name="Council of Kings Division", link="[[Council of Kings Division]]", code="CKD", weight=1,		{ name="Council of Kings Division", link="[[Council of Kings Division]]", code="CKD", weight=1,
	cities={"Fanghorn","Eikbu","Galvø","Sårensby","Slevik","Sjøsborg","Storesund","Notranskja","Kaledonija"} },		cities={"Fanghorn","Eikbu","Galvø","Sårensby","Slevik","Sjøsborg","Storesund","Notranskja","Kaledonija","Krlsgorod"} },
	}		}

NewZimiaGov at 21:15, 1 January 2026

2026-01-01T21:15:35Z

Show changes