From d85e582e8c307ed3dbb0e0f3a34af9154b82503d Mon Sep 17 00:00:00 2001
From: the-real-herowl <wiktor_t-i@proton.me>
Date: Fri, 27 Oct 2023 03:19:25 +0200
Subject: [PATCH] Arabic-to-Roman converter redo

-rewrote the Arabic-to-Roman number converter
-moved it to mcl_util
---
 mods/CORE/mcl_util/init.lua                  |  2 ++
 mods/CORE/mcl_util/roman_numerals.lua        | 30 +++++++++++++++++
 mods/ITEMS/mcl_enchanting/engine.lua         |  2 +-
 mods/ITEMS/mcl_enchanting/init.lua           |  1 -
 mods/ITEMS/mcl_enchanting/mod.conf           |  2 +-
 mods/ITEMS/mcl_enchanting/roman_numerals.lua | 34 --------------------
 6 files changed, 34 insertions(+), 37 deletions(-)
 create mode 100644 mods/CORE/mcl_util/roman_numerals.lua
 delete mode 100644 mods/ITEMS/mcl_enchanting/roman_numerals.lua

diff --git a/mods/CORE/mcl_util/init.lua b/mods/CORE/mcl_util/init.lua
index c2ae5391e..4204e218d 100644
--- a/mods/CORE/mcl_util/init.lua
+++ b/mods/CORE/mcl_util/init.lua
@@ -1,5 +1,7 @@
 mcl_util = {}
 
+dofile(minetest.get_modpath(minetest.get_current_modname()).."/roman_numerals.lua")
+
 -- Updates all values in t using values from to*.
 function table.update(t, ...)
 	for _, to in ipairs {...} do
diff --git a/mods/CORE/mcl_util/roman_numerals.lua b/mods/CORE/mcl_util/roman_numerals.lua
new file mode 100644
index 000000000..a808e43f1
--- /dev/null
+++ b/mods/CORE/mcl_util/roman_numerals.lua
@@ -0,0 +1,30 @@
+local converter = {
+	{1000, "M"},
+	{900, "CM"},
+	{500, "D"},
+	{400, "CD"},
+	{100, "C"},
+	{90, "XC"},
+	{50, "L"},
+	{40, "XL"},
+	{10, "X"},
+	{9, "IX"},
+	{5, "V"},
+	{4, "IV"},
+	{1, "I"}
+}
+
+mcl_util.to_roman = function(number)
+	local r = ""
+	local a = number
+	local i = 1
+	while a > 0 do
+		if a >= converter[i][1] then
+			a = a - converter[i][1]
+			r = r.. converter[i][2]
+		else
+			i = i + 1
+		end
+	end
+	return r
+end
diff --git a/mods/ITEMS/mcl_enchanting/engine.lua b/mods/ITEMS/mcl_enchanting/engine.lua
index 67ef72056..dd01d5950 100644
--- a/mods/ITEMS/mcl_enchanting/engine.lua
+++ b/mods/ITEMS/mcl_enchanting/engine.lua
@@ -56,7 +56,7 @@ end
 function mcl_enchanting.get_enchantment_description(enchantment, level)
 	local enchantment_def = mcl_enchanting.enchantments[enchantment]
 	return enchantment_def.name ..
-		(enchantment_def.max_level == 1 and "" or " " .. mcl_enchanting.roman_numerals.toRoman(level))
+		(enchantment_def.max_level == 1 and "" or " " .. mcl_util.to_roman(level))
 end
 
 function mcl_enchanting.get_colorized_enchantment_description(enchantment, level)
diff --git a/mods/ITEMS/mcl_enchanting/init.lua b/mods/ITEMS/mcl_enchanting/init.lua
index 9f9fbd271..02ed1ee85 100644
--- a/mods/ITEMS/mcl_enchanting/init.lua
+++ b/mods/ITEMS/mcl_enchanting/init.lua
@@ -11,7 +11,6 @@ mcl_enchanting = {
 	book_animation_steps = {0, 640, 680, 700, 740},
 	book_animation_loop = {["open"] = true, ["close"] = true},
 	book_animation_speed = 40,
-	roman_numerals = dofile(modpath .. "/roman_numerals.lua"), 			-- https://exercism.io/tracks/lua/exercises/roman-numerals/solutions/73c2fb7521e347209312d115f872fa49
 	enchantments = {},
 	overlay = "^[colorize:purple:50",
 	--overlay = "^[invert:rgb^[multiply:#4df44d:50^[invert:rgb",
diff --git a/mods/ITEMS/mcl_enchanting/mod.conf b/mods/ITEMS/mcl_enchanting/mod.conf
index 610492857..d163fcd55 100644
--- a/mods/ITEMS/mcl_enchanting/mod.conf
+++ b/mods/ITEMS/mcl_enchanting/mod.conf
@@ -1,5 +1,5 @@
 name = mcl_enchanting
 description = Enchanting for MineClone2
-depends = tt, walkover, mcl_sounds, mcl_colors, mcl_experience
+depends = tt, walkover, mcl_sounds, mcl_colors, mcl_experience, mcl_util
 optional_depends = screwdriver
 author = Fleckenstein
diff --git a/mods/ITEMS/mcl_enchanting/roman_numerals.lua b/mods/ITEMS/mcl_enchanting/roman_numerals.lua
deleted file mode 100644
index f40c65406..000000000
--- a/mods/ITEMS/mcl_enchanting/roman_numerals.lua
+++ /dev/null
@@ -1,34 +0,0 @@
---------------------------------------------------------------------
---! @file
---! @brief Convert from normal numbers to Roman Numerals
----------------------------------------------------------------------
-local conversionTable = {
-  { number = 1000, symbol = "M" },
-  { number = 900, symbol = "CM" },
-  { number = 500, symbol = "D" },
-  { number = 400, symbol = "CD" },
-  { number = 100, symbol = "C" },
-  { number = 90, symbol = "XC" },
-  { number = 50, symbol = "L" },
-  { number = 40, symbol = "XL" },
-  { number = 10, symbol = "X" },
-  { number = 9, symbol = "IX" },
-  { number = 5, symbol = "V" },
-  { number = 4, symbol = "IV" },
-  { number = 1, symbol = "I" }
-}
-
-return{
-  toRoman = function(number)
-    local romanNumeral = ""
-
-    for _,table in pairs (conversionTable) do
-      while(number >= table.number) do
-        romanNumeral = romanNumeral .. table.symbol
-        number = number - table.number
-      end
-    end
-
-    return romanNumeral
-  end
-}