Merge pull request #12 from wingedcatgirl/register

Convert `add_fusion` to `register_fusion`

Author: Maratby

Tsunami.lua

@@ -526,38 +526,19 @@ TsunamiAutoRegister = {
 }
 function auto_register(registry)
 	for index2, value2 in pairs(registry) do
-		local card1 = "j_splash"
-		local card2 = "j_splash"
-		local carry_1 = nil
-		local carry_2 = nil
-		local extra_1 = false
-		local extra_2 = false
 		local _flag = false
-		---placeholder values in case something goes wrong
-		local _result = "j_splash"
-		local _cost = 8
 		for index, value in ipairs(FusionJokers.fusions) do
-			if FusionJokers.fusions[index].jokers[1].name == "j_splash" then
-				card2 = FusionJokers.fusions[index].jokers[2].name
-				card1 = value2
-				_flag = true
-				carry_2 = FusionJokers.fusions[index].jokers[2].carry_stat
-				extra_2 = FusionJokers.fusions[index].jokers[2].extra_stat
-				_result = FusionJokers.fusions[index].result_joker
-				_cost = FusionJokers.fusions[index].cost + 3
-			elseif FusionJokers.fusions[index].jokers[2].name == "j_splash" then
-				card1 = FusionJokers.fusions[index].jokers[1].name
-				card2 = value2
-				_flag = true
-				carry_1 = FusionJokers.fusions[index].jokers[1].carry_stat
-				extra_1 = FusionJokers.fusions[index].jokers[1].extra_stat
-				_result = FusionJokers.fusions[index].result_joker
-				_cost = FusionJokers.fusions[index].cost + 3
-			else
-				_flag = false
+			local recipe = copy_table(value)
+
+			for jokerindex, joker in ipairs(value.jokers) do
+				if joker.name == "j_splash" then
+					recipe.jokers[jokerindex].name = value2
+					_flag = true
+				end
 			end
+			
 			if _flag then
-				FusionJokers.fusions:add_fusion(card1, carry_1, extra_1, card2, carry_2, extra_2, _result, _cost)
+				FusionJokers.fusions:register_fusion(recipe)
 			end
 		end
 	end

items/Crossmod_Fusions.lua

@@ -36,7 +36,12 @@ if Tsun_has_Morefluff then
             end
         end
     }
-    FusionJokers.fusions:add_fusion("j_mf_basepaul_card", nil, false, "j_splash", nil, false, "j_tsun_style_marieter", 12)
+    FusionJokers.fusions:register_fusion{
+      jokers = {
+        { name = "j_mf_basepaul_card" },
+        { name = "j_splash" },
+      }, cost = 12, result_joker = "j_tsun_style_marieter" 
+    }
 
     SMODS.Joker {
         name = "Waterfall Loop",
@@ -66,10 +71,20 @@ if Tsun_has_Morefluff then
             G.hand:unhighlight_all()
         end
     }
-    FusionJokers.fusions:add_fusion("j_mf_philosophical", nil, false, "j_splash", nil, false, "j_tsun_waterfall_loop", 10)
+    FusionJokers.fusions:register_fusion{
+      jokers = {
+        { name = "j_mf_philosophical" },
+        { name = "j_splash" },
+      }, cost = 10, result_joker = "j_tsun_waterfall_loop" 
+    }
 end
 
 ---insert picture of obama giving himself a medal
 if Jokebox then
-    FusionJokers.fusions:add_fusion("j_jkbx_marie", nil, false, "j_splash", nil, false, "j_tsun_tsunami_marie", 10)
+    FusionJokers.fusions:register_fusion{
+      jokers = {
+        { name = "j_jkbx_marie" },
+        { name = "j_splash" },
+      }, cost = 10, result_joker = "j_tsun_tsunami_marie" 
+    }
 end