Module:Calc - Revision history

Chocolatecravinghobo: another item attempt. doesn't work. revert if needed.

2025-10-25T15:05:11Z

another item attempt. doesn't work. revert if needed.

Chocolatecravinghobo: fix

2025-10-25T10:49:20Z

fix

Chocolatecravinghobo: fix

2025-10-21T16:09:48Z

fix

Chocolatecravinghobo: Enable Item test

2025-10-21T16:03:55Z

Enable Item test

Chocolatecravinghobo: ?card: attempted to stop equipment from being filtered out, as equip cards weren't showing up. Don't know if this only works for equip and if I broke the original funtion's intention. This may not work at filtering out errors

2025-09-09T14:36:19Z

?card: attempted to stop equipment from being filtered out, as equip cards weren't showing up. Don't know if this only works for equip and if I broke the original funtion's intention. This may not work at filtering out errors

がか at 08:31, 28 March 2025

2025-03-28T08:31:44Z

がか at 18:08, 17 October 2024

2024-10-17T18:08:26Z

Memetails: /* nil catch in comparison */

2024-08-01T09:54:25Z

nil catch in comparison

がか at 07:35, 21 January 2024

2024-01-21T07:35:18Z

がか at 19:51, 22 October 2023

2023-10-22T19:51:44Z

@@ Line 10: / Line 10: @@
 local EquipmentGraphicKai = require("Module:EquipmentGraphicKai")
 local EquipmentCollection = require("Module:Data/Equipment")
 -- local AllEquipmentCollection = require("Module:Collection/EquipmentByApiId")
 local Development = require("Module:Development")
@@ Line 46: / Line 47: @@
      end,
      enemy = function() return require('Module:Collection/EnemyShips') end,
      equipment = function()
      	equipment = true
      	return U.imap(EquipmentCollection, function(e) return e._name end)
      end,
      --[[
@@ Line 417: / Line 421: @@
 	        	for _, e in ipairs(enumerating_function()) do
 	        		local ship
-	        		if equipment then
+	        		if equipment or item then
 	        			ship = Equipment(e)
 	        		else

@@ Line 31: / Line 31: @@
      base_names = function() return require('Module:Collection/ShipsBase') end,
      all_names = function() return require('Module:Collection/Ships') end,
      remodel_names = function()
      	local all_names = require('Module:Collection/Ships')

@@ Line 48: / Line 48: @@
      end,
      enemy = function() return require('Module:Collection/EnemyShips') end,
-     enemy = function() return require('Module:Collection/Items') end,
+     item = function() return require('Module:Collection/Items') end,
      equipment = function()
      	equipment = true

@@ Line 31: / Line 31: @@
      base_names = function() return require('Module:Collection/ShipsBase') end,
      all_names = function() return require('Module:Collection/Ships') end,
      remodel_names = function()
      	local all_names = require('Module:Collection/Ships')
@@ Line 46: / Line 48: @@
      end,
      enemy = function() return require('Module:Collection/EnemyShips') end,
      equipment = function()
      	equipment = true

@@ Line 151: / Line 151: @@
      card = function(obj)
      	if not obj or not obj.lua_name then
-     		return ' '
+     		if equipment then --attempted to stop equipment from being filtered out, as equip cards weren't showing up. Don't know if this only works for equip and if I broke the original funtion's intention. This may not work at filtering out errors -chocolatecravinghobo
      	end
          if obj.hp then

@@ Line 428: / Line 428: @@
 								if type(g) == 'function' then
 									obj = g(obj)
 								elseif type(g) == 'table' then
 									obj = g
@@ Line 515: / Line 519: @@
 	 mw.log(interpret({"!Saiun", "?icon"}))
 	 mw.log(interpret({"!Ayanami", "?scrap_string", "?scrap.fuel", "?scrap_fuel", "?_scrap_fuel"}))
 end

@@ Line 188: / Line 188: @@
          end
      end,
-     scrap = function(eq)
+     scrap_string = function(eq)
          local scrap = eq:scrap()
          return string.format("%s/%s/%s/%s", scrap.fuel or 0, scrap.ammo or 0, scrap.steel or 0, scrap.bauxite or 0)
@@ Line 231: / Line 231: @@
 local function format_value(key, ship, target)
-    local formatting_function = formatting_functions[key]
+	local keys = mw.text.split(key, "%s*%.%s*")
-    if formatting_function then
+	local result = ship
-        return formatting_function(ship, target)
+	for _, key in ipairs(keys) do
-    end
+    	local formatting_function = formatting_functions[key]
-    --[[
+    	if formatting_function then
-    if shipCapabilities[key] then
+        	result = formatting_function(result, target)
-        local a, b = shipCapabilities[key](shipCapabilities)
+    	else
-        return format_lua(b or a)
+    		local lua = result[key] or result['_' .. key]
-    end
+    		if type(lua) == "function" then
-    ]]--
+        		result = lua(result)
-    local lua = ship[key]
+    		else
-    if type(lua) == "function" then
+        		result = lua
-        return format_lua(lua(ship))
+    		end
-    else
+    	end
-        return format_lua(lua)
+		if type(result) ~= 'table' then
-    end
+			return format_lua(result)
 end
@@ Line 505: / Line 514: @@
 	 mw.log(interpret({"@base_names", "~class.name~Kagerou Class", "?link", sort = "type,id"}))
 	 mw.log(interpret({"!Saiun", "?icon"}))
 end
 return {
 	format = function(frame) return interpret(U.getTemplateArgs(frame).explicit) end,
 	test = test,
+}

@@ Line 471: / Line 471: @@
    				local x = a[sort](a)
     				local y = b[sort](b)
     				if x < y then return true end
     				if x > y then return false end

@@ Line 132: / Line 132: @@
              end
          else
-             return obj.icon and ([[<span data-sort-value="]] .. (obj._type or '0') .. [=[">[[File:]=] .. Formatting:format_equipment_icon(obj:icon()) .. "]]</span>") or ''
+        	return obj.icon and ([=[[[File:]=] .. Formatting:format_equipment_icon(obj:icon()) .. "]]") or ''
          end
      end,
@@ Line 449: / Line 450: @@
 				sequence_length = #sequence
 	        end
 	    elseif arg == "#" or prefix == "?" then
 	    	table.insert(actions, string.sub(arg, 2))
@@ Line 490: / Line 502: @@
 	 mw.log(interpret({"@base_names", "~is_battleship~true", "?link", sort = "type,id"}))
 	 mw.log(interpret({"@base_names", "~class.name~Kagerou Class", "?link", sort = "type,id"}))
 end

@@ Line 21: / Line 21: @@
 local target = nil
 local equipment = nil
 local sequence = nil
 local sequence_length = nil
 local sequence_position = nil
-local env = {}
+-- local sorted = false
 local enumerating_functions = {
@@ Line 382: / Line 381: @@
 local function interpret(args_)
 	args = args_
      for _, arg in ipairs(args) do
      	local prefix = string.sub(arg, 1, 1)
      	if prefix == "~" then
-     		local kv = mw.text.split(string.sub(arg, 2), "%s*~%s*")
+    		-- ~x.y.z~a.b.c means obj.x.y.z == a or obj.x.y.z == b or obj.x.y.z == c
-     		local xs = mw.text.split(kv[2], "%s*,%s*")
+    		-- obj.x.y.z can be obj:x():y():z(), etc.
-     		table.insert(filterArgs, {kv[1], xs})
+     		local ksvs = mw.text.split(string.sub(arg, 2), "%s*~%s*")
      	end
      end
@@ Line 407: / Line 410: @@
 	        		if #filterArgs > 0 then
 				    	local test = true
-						for _, kv in ipairs(filterArgs) do
+						for _, ksvs in ipairs(filterArgs) do
 							local test2 = false
-							for _, e2 in ipairs(kv[2]) do
-								if tostring(ship[kv[1]](ship)) == e2 then
+							local obj = ship
 									test2 = true
 									break
 								end
 							end
 							if not test2 then
 								test = false
@@ Line 466: / Line 485: @@
      until not sequence_length or sequence_position > sequence_length
      return table.concat(values, args.concat or (args.format == "table" and "" or ", "))
 end
 return {
 	format = function(frame) return interpret(U.getTemplateArgs(frame).explicit) end,
-	test = function() mw.log(interpret({"@base_names", "~is_battleship~true", "?link", sort = "type,id"})) end,
+	test = test,
+}