Module:Equipment - Revision history

がか at 15:13, 30 April 2023

2023-04-30T15:13:38Z

2022-09-11T02:49:52Z

2021-10-26T04:43:01Z

2021-08-01T11:52:48Z

2021-05-24T02:04:07Z

2021-05-24T01:50:27Z

2021-05-12T11:54:19Z

2020-07-01T13:57:43Z

2020-06-04T19:20:58Z

12 revisions imported

2017-12-09T10:13:47Z

@@ Line 29: / Line 29: @@
    	return {_name = name}
    end
    return data
 end

@@ Line 2: / Line 2: @@
 local EquipmentData = require('Module:EquipmentData')
-local EquipmentCollection = mw.loadData('Module:Collection/Equipment')
+local EquipmentCollection = mw.loadData('Module:Data/Equipment')
 local Equipment = {}

@@ Line 26: / Line 26: @@
      success, data = U.requireModule('Data/EnemyEquipment/' .. name)
    end
-   return data or {_name = name}
+   if not success then
 end

@@ Line 19: / Line 19: @@
      end
      if not success then
-       data = U.find(EquipmentCollection, name, '_name') or {_name = name}
+       data = U.find(EquipmentCollection, name, '_name')
-       success = true
+       -- success = true
      end
    end
@@ Line 26: / Line 26: @@
      success, data = U.requireModule('Data/EnemyEquipment/' .. name)
    end
-   return data
+   return data or {_name = name}
 end

@@ Line 8: / Line 8: @@
 local equipments = {}
-local function requireEquipmentModule(name)
+local function requireEquipmentModule(name, is_enemy)
-   local success, data = U.requireModule('Data/Equipment/' .. name)
+   local success, data
    if not success then
      success, data = U.requireModule('Data/EnemyEquipment/' .. name)
    end
    return data
 end
-function Equipment:create(name)
+function Equipment:create(name, is_enemy)
    if not name then
      return EquipmentData()
    end
    if not equipments[name] then
-     equipments[name] = EquipmentData(requireEquipmentModule(name))
+     equipments[name] = EquipmentData(requireEquipmentModule(name, is_enemy))
    end
    return equipments[name]

@@ Line 1: / Line 1: @@
 local U = require('Module:Core')
 local EquipmentData = require('Module:EquipmentData')
-local EquipmentCollection = require('Module:Collection/Equipment')
 local Equipment = {}
 local equipments = {}
 function Equipment:create(name)
-	if not name then
+  if not name then
-		return EquipmentData()
+    return EquipmentData()
-	end
+  end
-	if equipments[name] then
+  if not equipments[name] then
-		return equipments[name]
+    equipments[name] = EquipmentData(requireEquipmentModule(name))
-	end
+  end
-	local success, equipment_table = U.requireModule(name)
+  return equipments[name]
 end
 function Equipment:get(stat, name)
-	return self:create(name)[stat]()
+  return self:create(name)[stat]()
 end
-function Equipment:get_module(name)
+function Equipment:get_module(name, typeName)
-	return name and mw.ustring.format(
+  return name and string.format('Module:Data/%s/%s', typeName or 'Equipment', name) or nil
 end
 function Equipment:extend(data)
-	data = data or {}
+  data = data or {}
-	setmetatable(data, data)
+  setmetatable(data, data)
-	data.__index = self
+  data.__index = self
-	data.__call = self.__call
+  data.__call = self.__call
-	return data
+  return data
 end

← Older revision	Revision as of 19:20, 4 June 2020
(No difference)

@@ Line 18: / Line 18: @@
 		local eq = U.find(EquipmentCollection, name, '_name')
 		local success2, equipment_table2
-		if eq and eq._module then
+		if eq and (eq._module or eq._dev) then
-			success2, equipment_table2 = U.requireModule(eq._module)
+			success2, equipment_table2 = U.requireModule(eq._module or eq._dev and name .. '/Dev')
 		end
 		equipment_table = success2 and equipment_table2 or eq or { _name = name }
 		if eq and eq._module then
 			equipment_table._module = eq._module
 		end
 	end
@@ Line 36: / Line 39: @@
 function Equipment:get_module(name)
-	return name and mw.ustring.format('Module:%s', equipments[name] and equipments[name]._module or name) or nil
+	return name and mw.ustring.format(
 end