Module:ShipClass - Revision history

がか at 19:50, 10 September 2022

2022-09-10T19:50:28Z

Botkaze: 6 revisions imported

2021-05-12T12:26:54Z

6 revisions imported

がか at 14:42, 22 June 2020

2020-06-22T14:42:48Z

がか at 14:35, 22 June 2020

2020-06-22T14:35:20Z

がか at 14:29, 22 June 2020

2020-06-22T14:29:45Z

com>Ckwng: Return barebones ShipClassData when module require fails.

2015-03-11T20:02:17Z

Return barebones ShipClassData when module require fails.

com>Ckwng at 06:32, 13 February 2015

2015-02-13T06:32:29Z

com>Ckwng: Entry point for ship classes

2015-02-13T03:36:05Z

Entry point for ship classes

New page

local ShipClass = {}
local ship_classes = {}

local ShipClassData = require('Module:ShipClassData')

function ShipClass:create(name)
if model == nil then
model = ""
end
local ship_class = ship_classes[name]
if ship_class then
return ship_class
else
local ship_class_table = require(mw.ustring.format('Module:%s', name))
ship_class = ShipClassData(ship_class_table)
ship_classes[name] = ship_class
return ship_class
end
end

ShipClass.__call = ShipClass.create
setmetatable(ShipClass, ShipClass)

return ShipClass

@@ Line 12: / Line 12: @@
    end
    if not success or not data.class then
-     data = {class = {_name = name}}
+     data = {class = {_name = name, _class = true}}
    end
    return data.class

@@ Line 7: / Line 7: @@
 local function requireShipClassModule(name)
-   local success, data = U.requireModule(name)
+   local success, data = U.requireModule('Data/ShipClass/' .. name)
    if not success then
      success, data = U.requireModule('Data/Ship/' .. name)

@@ Line 10: / Line 10: @@
    if not success then
      success, data = U.requireModule('Data/ShipClass/' .. name)
    end
    if not success or not data.class then

← Older revision	Revision as of 12:26, 12 May 2021
(No difference)

@@ Line 1: / Line 1: @@
 local ShipClass = {}
 local ship_classes = {}
-local ShipClassData = require('Module:ShipClassData')
+local function requireShipClassModule(name)
 function ShipClass:create(name)
-	if model == nil then
+  if not name then
-		model = ""
+    return ShipClassData()
-	end
+  end
-	--check if we already have it
+  if not ship_classes[name] then
-	local ship_class = ship_classes[name]
+    ship_classes[name] = ShipClassData(requireShipClassModule(name))
-	if ship_class then
+  end
-		return ship_class
+  return ship_classes[name]
 end

@@ Line 8: / Line 8: @@
 		model = ""
 	end
 	local ship_class = ship_classes[name]
 	if ship_class then
 		return ship_class
 	else
-		local ship_class_table = require(mw.ustring.format('Module:%s', name))
+		--Catch a failed require
-		ship_class = ShipClassData(ship_class_table.class)
+		local success, ship_class_table = pcall(function () return require(mw.ustring.format('Module:%s', name)) end)
 		ship_classes[name] = ship_class
 		return ship_class