diff --git a/scripts/Main.gd b/scripts/Main.gd index 7989ec4..24946f1 100644 --- a/scripts/Main.gd +++ b/scripts/Main.gd @@ -626,6 +626,10 @@ func _make_recipe_panel() -> void: "leather": "Leather", "iron": "Iron", "metal_plate":"Iron Plate", + #"MetalPlate":"Armor boots" + "essence":"Essence", + "Enchanted_Table": "Ench Table", + "EnchantedSphere": "Enchanted Boots" } const RESULT_NAMES := { "LeatherBoots": "Leather Boots", @@ -636,6 +640,7 @@ func _make_recipe_panel() -> void: "WoodenShield": "Wooden Shield", "IronShield": "Iron Shield", "MetalArmor": "Metal Armor", + "MetalPlate": "Armor boots" } const PAD_H := 10 diff --git a/scripts/MergeRecipes.gd b/scripts/MergeRecipes.gd index 1df335f..ab7292d 100644 --- a/scripts/MergeRecipes.gd +++ b/scripts/MergeRecipes.gd @@ -24,7 +24,7 @@ static var _list: Array[Dictionary] = [ "speed_threshold": 18.0, }, { - "ingredients": ["leather", "metal_plate"], + "ingredients": ["leather", "iron"], "result_scene": "res://scenes/PlateArmor.tscn", "speed_threshold": 18.0, }, @@ -34,10 +34,20 @@ static var _list: Array[Dictionary] = [ "speed_threshold": 18.0, }, { - "ingredients": ["iron", "leather"], + "ingredients": ["iron", "rock"], "result_scene": "res://scenes/IronShield.tscn", "speed_threshold": 18.0, }, + { + "ingredients": ["iron", "Smith"], + "result_scene": "res://scenes/MetalPlate.tscn", + "speed_threshold": 0.1, + }, + { + "ingredients": ["essence", "Enchanted_Table"], + "result_scene": "res://scenes/EnchantedSphere.tscn", + "speed_threshold": 0.1, + } ] static func find(type_a: String, type_b: String, speed: float) -> Dictionary: