Module:Formatting - Revision history

Sin sin: Fix typo

2024-10-18T05:44:23Z

Fix typo

2024-10-17T19:15:28Z

overseas

2024-06-23T21:21:11Z

2024-06-09T12:24:31Z

2024-04-06T20:16:36Z

2024-03-30T20:30:59Z

2024-03-30T20:18:06Z

2024-03-30T20:13:50Z

2022-11-05T00:14:33Z

disabled EquipmentComparisonKai's shiptype grouper. Not working.

2022-10-29T13:33:15Z

✔️❌ & LoS

@@ Line 332: / Line 332: @@
 end
-function Formatting:format_remodel_items(blueprint, catapult, report, gunmat, airmat, armamen, overseas)
+function Formatting:format_remodel_items(blueprint, catapult, report, gunmat, airmat, armament, overseas)
 	local items = {}
 	-- explicit items

@@ Line 314: / Line 314: @@
 end
-function Formatting:format_remodel_level_and_item_cost(remodel_level, blueprint, catapult, report, gunmat, airmat, armament)
+function Formatting:format_remodel_level_and_item_cost(remodel_level, blueprint, catapult, report, gunmat, airmat, armament, overseas)
-	local item_requirements = self:format_remodel_items(blueprint, catapult, report, gunmat, airmat, armament)
+	local item_requirements = self:format_remodel_items(blueprint, catapult, report, gunmat, airmat, armament, overseas)
 	if remodel_level == nil then
 		remodel_level = "??"
@@ Line 332: / Line 332: @@
 end
-function Formatting:format_remodel_items(blueprint, catapult, report, gunmat, airmat, armament)
+function Formatting:format_remodel_items(blueprint, catapult, report, gunmat, airmat, armamen, overseas)
 	local items = {}
 	-- explicit items
@@ Line 354: / Line 354: @@
 	    table.insert(items, self:format_remodel_item("new_model_armament_material_item", armament))
 	end
 	return #items > 0 and table.concat(items, " ") or nil
 end
@@ Line 725: / Line 728: @@
 	new_model_armament_material = "New Model Armament Material",
 	new_model_armament_material_item = "New Model Armament Material",
 })

@@ Line 329: / Line 329: @@
      local title = Formatting:format_resource_name(item)
      return self:format_image{DataAsset[item], caption = title, link = title, size = "24px"}
-        .. (value == nil and "?" or type(value) == "number" and "×" .. value or "")
+		.. (value == nil and "×??" or type(value) == "number" and "×" .. value or "")
 end
@@ Line 357: / Line 357: @@
 end
-function Formatting:format_blueprint_requirement(blueprint, force)
+function Formatting:format_item_requirement(item, value, show_false)
-	if force or (blueprint ~= false) then
+	return value == false and not show_false and "" or
-		local value
+		value == false and "❌" or value and self:format_remodel_item(item, value) or "??"
-		if blueprint == false then
+end
-			value = "❌"
-		elseif blueprint == true then
+function Formatting:format_blueprint_requirement(value, show_false)
-			value = self:format_image{DataAsset.blueprint_item, size = "24px", caption = Formatting:format_resource_name("blueprint")}
+	return self:format_item_requirement("blueprint_item", value, show_false)
 end
 Formatting.format_blueprint_requirement_simple = Formatting.format_blueprint_requirement
-function Formatting:format_catapult_requirement(catapult, force)
+function Formatting:format_catapult_requirement(value, show_false)
-	if force or (catapult ~= false) then
+	return self:format_item_requirement("prototype_deck_catapult_item", value, show_false)
 end

@@ Line 361: / Line 361: @@
 		local value
 		if blueprint == false then
-			value = "✗"
+			value = "❌"
 		elseif blueprint == true then
 			value = self:format_image{DataAsset.blueprint_item, size = "24px", caption = Formatting:format_resource_name("blueprint")}
@@ Line 378: / Line 378: @@
 		local value
 		if catapult == false then
-			value = "✗"
+			value = "❌"
 		elseif catapult == true then
 			value = self:format_image{DataAsset.prototype_deck_catapult_item, size = "24px", caption = Formatting:format_resource_name("prototype_deck_catapult_item")}

@@ Line 852: / Line 852: @@
 		elseif value == 1 then
 			table.insert(compatible, ship_code)
-		elseif value == 2 then
+		elseif value == 2 or value == 3 then
 			complex = true
 			table.insert(compatible, string.format("%s (%s)", ship_code, note))

@@ Line 785: / Line 785: @@
 	[1] = "#73ff4d", -- true
 	[2] = "#ffff40", -- only
-	[3] = "#ffff41", -- except
+	[3] = "#ddffbb", -- except
 	}, "transparent")

@@ Line 814: / Line 814: @@
 function Formatting:format_ship_compatibility(compatibility_table)
-	if compatibility_table[3] == compatibility_table[4] then
+	--[=[ if compatibility_table[3] == compatibility_table[4] then
 		compatibility_table[3] = {value = compatibility_table[3], code = "CL(T)"}
 		compatibility_table[4] = false
@@ Line 837: / Line 837: @@
 		compatibility_table[13] = {value = compatibility_table[13], code = "SS(V)"}
 		compatibility_table[14] = false
-	end
+	end]=]--
 	compatibility_table[12] = false
 	compatibility_table[15] = false

@@ Line 680: / Line 680: @@
 Formatting.format_boolean_short = Formatting:create_formatter({
-	[true] = "✔", -- HEAVY CHECK MARK
+	[true] = "✔️", -- HEAVY CHECK MARK
-	[false] = "✘", -- HEAVY BALLOT X
+	[false] = "❌", -- HEAVY BALLOT X
 })
@@ Line 693: / Line 693: @@
 	shelling_accuracy = "Accuracy",
 	evasion = "Evasion",
-	los = "LOS",
+	los = "LoS",
 	speed = "Speed",
 	luck = "Luck",