Maverick2797: 2 Add recipes for merged route-prog-rework signals Add recipes for merged route-prog-rework signals 4 files changed, 134 insertions(+), 68 deletions(-)
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.sr.ht/~gpcf/advtrains-devel/patches/58383/mbox | git am -3Learn more about email & git
Add recipe for Ks Distant Signal Reorder and comment Ks and speed sign recipes Add circular crafting for wall-mounted Munich U-Bahn signals, with entry recipe based on existing wall-mounted signal --- advtrains_signals_ks/init.lua | 72 +++++++++++++++------------- advtrains_signals_muc_ubahn/init.lua | 30 ++++++++++++ 2 files changed, 68 insertions(+), 34 deletions(-) mode change 100755 => 100644 advtrains_signals_ks/init.lua mode change 100755 => 100644 advtrains_signals_muc_ubahn/init.lua diff --git a/advtrains_signals_ks/init.lua b/advtrains_signals_ks/init.lua old mode 100755 new mode 100644 index 326c631..701cdef --- a/advtrains_signals_ks/init.lua +++ b/advtrains_signals_ks/init.lua @@ -581,16 +581,8 @@ end -- Crafting -minetest.register_craft({ - output = "advtrains_signals_ks:hs_danger_0 2", - recipe = { - {'default:steel_ingot', 'dye:red', 'default:steel_ingot'}, - {'dye:yellow', 'default:steel_ingot', 'dye:dark_green'}, - {'default:steel_ingot', 'advtrains_signals_ks:mast_mast_0', 'default:steel_ingot'}, - }, -}) - -minetest.register_craft({ +-- Ks Signals +minetest.register_craft({ -- Ks Mast output = "advtrains_signals_ks:mast_mast_0 10", recipe = { {'default:steel_ingot'}, @@ -598,17 +590,23 @@ minetest.register_craft({ {'default:steel_ingot'}, }, }) - -minetest.register_craft({ - output = "advtrains_signals_ks:ra_danger_0 2", +minetest.register_craft({ -- Ks Main Signal + output = "advtrains_signals_ks:hs_danger_0 2", recipe = { - {'dye:red', 'dye:white', 'dye:red'}, - {'dye:white', 'default:steel_ingot', 'default:steel_ingot'}, + {'default:steel_ingot', 'dye:red', 'default:steel_ingot'}, + {'dye:yellow', 'default:steel_ingot', 'dye:dark_green'}, {'default:steel_ingot', 'advtrains_signals_ks:mast_mast_0', 'default:steel_ingot'}, }, }) - -minetest.register_craft({ +minetest.register_craft({ -- Ks Distant Signal + output = "advtrains_signals_ks:vs_slow_0 2", + recipe = { + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + {'dye:dark_green', 'default:steel_ingot', 'dye:yellow'}, + {'default:steel_ingot', 'advtrains_signals_ks:mast_mast_0', 'default:steel_ingot'}, + } +}) +minetest.register_craft({ -- Ks Speed Limit Indicator output = "advtrains_signals_ks:zs3_off_0 2", recipe = { {"","default:steel_ingot",""}, @@ -616,7 +614,7 @@ minetest.register_craft({ {"","advtrains_signals_ks:mast_mast_0",""} }, }) -minetest.register_craft({ +minetest.register_craft({ -- Ks Distant Speed Limit Indicator output = "advtrains_signals_ks:zs3v_off_0 2", recipe = { {"","default:steel_ingot",""}, @@ -624,14 +622,22 @@ minetest.register_craft({ {"","advtrains_signals_ks:mast_mast_0",""} }, }) +minetest.register_craft({ -- Ks Shunting Signal + output = "advtrains_signals_ks:ra_danger_0 2", + recipe = { + {'dye:red', 'dye:white', 'dye:red'}, + {'dye:white', 'default:steel_ingot', 'default:steel_ingot'}, + {'default:steel_ingot', 'advtrains_signals_ks:mast_mast_0', 'default:steel_ingot'}, + }, +}) +-- Speed Restriction signs +-- Crafting entry recipe for signs local sign_material = "default:sign_wall_steel" --fallback if minetest.get_modpath("basic_materials") then sign_material = "basic_materials:plastic_sheet" end ---print("Sign Material: "..sign_material) - -minetest.register_craft({ +minetest.register_craft({ -- Permanent Local Speed Restriction Sign output = "advtrains_signals_ks:sign_8_0 2", recipe = { {sign_material, 'dye:black'}, @@ -641,22 +647,20 @@ minetest.register_craft({ }) sign_material = nil -minetest.register_craft{ - output = "advtrains_signals_ks:sign_8_0 1", - recipe = {{"advtrains_signals_ks:sign_lf7_8_0"}} -} - -minetest.register_craft{ - output = "advtrains_signals_ks:sign_hfs_0 1", +-- Circular crafting between sign types +minetest.register_craft{ -- Signal Sign + output = "advtrains_signals_ks:sign_hfs_0", recipe = {{"advtrains_signals_ks:sign_8_0"}} } - -minetest.register_craft{ - output = "advtrains_signals_ks:sign_lf_8_0 1", +minetest.register_craft{ -- Temporary Local Speed Restriction Sign + output = "advtrains_signals_ks:sign_lf_8_0", recipe = {{"advtrains_signals_ks:sign_hfs_0"}} } - -minetest.register_craft{ - output = "advtrains_signals_ks:sign_lf7_8_0 1", +minetest.register_craft{ -- Line Speed Restriction Sign + output = "advtrains_signals_ks:sign_lf7_8_0", recipe = {{"advtrains_signals_ks:sign_lf_8_0"}} } +minetest.register_craft{ -- Permanent Local Speed Restriction Sign + output = "advtrains_signals_ks:sign_8_0", + recipe = {{"advtrains_signals_ks:sign_lf7_8_0"}} +} \ No newline at end of file diff --git a/advtrains_signals_muc_ubahn/init.lua b/advtrains_signals_muc_ubahn/init.lua old mode 100755 new mode 100644 index 182a3dc..75a90f6 --- a/advtrains_signals_muc_ubahn/init.lua +++ b/advtrains_signals_muc_ubahn/init.lua @@ -86,3 +86,33 @@ for r,f in pairs(all_sigs) do }) end end + +-- Crafting +minetest.register_recipe({ -- Main Signal Left as entry recipe + output = "advtrains_signals_muc_ubahn:signal_wall_l_hp0", + recipe = { + {"advtrains:signal_wall_l_off", "advtrains_interlocking:tcb_node"} + }, + replacements = {"advtrains_interlocking:tcb_node"} +}) +minetest.register_recipe({ -- Distant Signal Left as entry recipe + output = "advtrains_signals_muc_ubahn:signal_wall_l_vr0" + recipe = { + {"dye:orange","",""}, + {"dye:orange","advtrains_signals_muc_ubahn:signal_wall_l_hp0","dye:dark_green"}, + {"","","dye:dark_green"} + } +}) + +for this,nxt in pairs({l = "t", t = "r",r = "l"}) do --Circular crafting for wall-mount signals + minetest.register_recipe({ -- Main Signal + output = "advtrains_signals_muc_ubahn:signal_wall_"..nxt.."_hp0", + type = "shapeless", + recipe = "advtrains_signals_muc_ubahn:signal_wall_"..this.."_hp0", + }) + minetest.recister_recipe({ -- Distant Signal + output = "advtrains_signals_muc_ubahn:signal_wall_"..nxt.."_vr0", + type = "shapeless", + recipe = "advtrains_signals_muc_ubahn:signal_wall_"..this.."_vr0" + }) +end \ No newline at end of file -- 2.46.0
Add recipe for Ks Distant Signal Reorder and comment Ks and speed sign recipes Add circular crafting for wall-mounted Munich U-Bahn signals, with entry recipe based on existing wall-mounted signal --- It sometimes helps to actually check your work before hitting "send" :P Fixed typos and just dumb mistakes from v1 advtrains_signals_ks/init.lua | 72 +++++++++++++++------------- advtrains_signals_muc_ubahn/init.lua | 28 +++++++++++ 2 files changed, 66 insertions(+), 34 deletions(-) mode change 100755 => 100644 advtrains_signals_ks/init.lua mode change 100755 => 100644 advtrains_signals_muc_ubahn/init.lua diff --git a/advtrains_signals_ks/init.lua b/advtrains_signals_ks/init.lua old mode 100755 new mode 100644 index 326c631..701cdef --- a/advtrains_signals_ks/init.lua +++ b/advtrains_signals_ks/init.lua @@ -581,16 +581,8 @@ end -- Crafting -minetest.register_craft({ - output = "advtrains_signals_ks:hs_danger_0 2", - recipe = { - {'default:steel_ingot', 'dye:red', 'default:steel_ingot'}, - {'dye:yellow', 'default:steel_ingot', 'dye:dark_green'}, - {'default:steel_ingot', 'advtrains_signals_ks:mast_mast_0', 'default:steel_ingot'}, - }, -}) - -minetest.register_craft({ +-- Ks Signals +minetest.register_craft({ -- Ks Mast output = "advtrains_signals_ks:mast_mast_0 10", recipe = { {'default:steel_ingot'}, @@ -598,17 +590,23 @@ minetest.register_craft({ {'default:steel_ingot'}, }, }) - -minetest.register_craft({ - output = "advtrains_signals_ks:ra_danger_0 2", +minetest.register_craft({ -- Ks Main Signal + output = "advtrains_signals_ks:hs_danger_0 2", recipe = { - {'dye:red', 'dye:white', 'dye:red'}, - {'dye:white', 'default:steel_ingot', 'default:steel_ingot'}, + {'default:steel_ingot', 'dye:red', 'default:steel_ingot'}, + {'dye:yellow', 'default:steel_ingot', 'dye:dark_green'}, {'default:steel_ingot', 'advtrains_signals_ks:mast_mast_0', 'default:steel_ingot'}, }, }) - -minetest.register_craft({ +minetest.register_craft({ -- Ks Distant Signal + output = "advtrains_signals_ks:vs_slow_0 2", + recipe = { + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + {'dye:dark_green', 'default:steel_ingot', 'dye:yellow'}, + {'default:steel_ingot', 'advtrains_signals_ks:mast_mast_0', 'default:steel_ingot'}, + } +}) +minetest.register_craft({ -- Ks Speed Limit Indicator output = "advtrains_signals_ks:zs3_off_0 2", recipe = { {"","default:steel_ingot",""}, @@ -616,7 +614,7 @@ minetest.register_craft({ {"","advtrains_signals_ks:mast_mast_0",""} }, }) -minetest.register_craft({ +minetest.register_craft({ -- Ks Distant Speed Limit Indicator output = "advtrains_signals_ks:zs3v_off_0 2", recipe = { {"","default:steel_ingot",""}, @@ -624,14 +622,22 @@ minetest.register_craft({ {"","advtrains_signals_ks:mast_mast_0",""} }, }) +minetest.register_craft({ -- Ks Shunting Signal + output = "advtrains_signals_ks:ra_danger_0 2", + recipe = { + {'dye:red', 'dye:white', 'dye:red'}, + {'dye:white', 'default:steel_ingot', 'default:steel_ingot'}, + {'default:steel_ingot', 'advtrains_signals_ks:mast_mast_0', 'default:steel_ingot'}, + }, +}) +-- Speed Restriction signs +-- Crafting entry recipe for signs local sign_material = "default:sign_wall_steel" --fallback if minetest.get_modpath("basic_materials") then sign_material = "basic_materials:plastic_sheet" end ---print("Sign Material: "..sign_material) - -minetest.register_craft({ +minetest.register_craft({ -- Permanent Local Speed Restriction Sign output = "advtrains_signals_ks:sign_8_0 2", recipe = { {sign_material, 'dye:black'}, @@ -641,22 +647,20 @@ minetest.register_craft({ }) sign_material = nil -minetest.register_craft{ - output = "advtrains_signals_ks:sign_8_0 1", - recipe = {{"advtrains_signals_ks:sign_lf7_8_0"}} -} - -minetest.register_craft{ - output = "advtrains_signals_ks:sign_hfs_0 1", +-- Circular crafting between sign types +minetest.register_craft{ -- Signal Sign + output = "advtrains_signals_ks:sign_hfs_0", recipe = {{"advtrains_signals_ks:sign_8_0"}} } - -minetest.register_craft{ - output = "advtrains_signals_ks:sign_lf_8_0 1", +minetest.register_craft{ -- Temporary Local Speed Restriction Sign + output = "advtrains_signals_ks:sign_lf_8_0", recipe = {{"advtrains_signals_ks:sign_hfs_0"}} } - -minetest.register_craft{ - output = "advtrains_signals_ks:sign_lf7_8_0 1", +minetest.register_craft{ -- Line Speed Restriction Sign + output = "advtrains_signals_ks:sign_lf7_8_0", recipe = {{"advtrains_signals_ks:sign_lf_8_0"}} } +minetest.register_craft{ -- Permanent Local Speed Restriction Sign + output = "advtrains_signals_ks:sign_8_0", + recipe = {{"advtrains_signals_ks:sign_lf7_8_0"}} +} \ No newline at end of file diff --git a/advtrains_signals_muc_ubahn/init.lua b/advtrains_signals_muc_ubahn/init.lua old mode 100755 new mode 100644 index 182a3dc..a8eb445 --- a/advtrains_signals_muc_ubahn/init.lua +++ b/advtrains_signals_muc_ubahn/init.lua @@ -86,3 +86,31 @@ for r,f in pairs(all_sigs) do }) end end + +-- Crafting +minetest.register_craft({ -- Main Signal Left as entry recipe + output = "advtrains_signals_muc_ubahn:signal_wall_l_hp0", + type = "shapeless", + recipe = {"advtrains:signal_wall_l_off", "advtrains_interlocking:tcb_node"}, +}) +minetest.register_craft({ -- Distant Signal Left as entry recipe + output = "advtrains_signals_muc_ubahn:signal_wall_l_vr0", + recipe = { + {"dye:orange","",""}, + {"dye:orange","advtrains_signals_muc_ubahn:signal_wall_l_hp0","dye:dark_green"}, + {"","","dye:dark_green"} + } +}) + +for this,nxt in pairs({l = "t", t = "r",r = "l"}) do --Circular crafting for wall-mount signals + minetest.register_craft({ -- Main Signal + output = "advtrains_signals_muc_ubahn:signal_wall_"..nxt.."_hp0", + type = "shapeless", + recipe = {"advtrains_signals_muc_ubahn:signal_wall_"..this.."_hp0"}, + }) + minetest.register_craft({ -- Distant Signal + output = "advtrains_signals_muc_ubahn:signal_wall_"..nxt.."_vr0", + type = "shapeless", + recipe = {"advtrains_signals_muc_ubahn:signal_wall_"..this.."_vr0"}, + }) +end \ No newline at end of file -- 2.46.0