From f1f1dc99242b4bfdc760acc0b1acb3392c91e222 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sun, 29 Mar 2020 23:12:56 +0200 Subject: [PATCH] Move rail to boost_cart --- mods/boost_cart/rails.lua | 11 ++++++++++- .../textures/default_rail.png | Bin .../textures/default_rail_crossing.png | Bin .../textures/default_rail_curved.png | Bin mods/hades_core/crafting.lua | 11 ----------- mods/hades_core/simple_nodes.lua | 18 ------------------ mods/hades_core/textures/default_rail_t_junction.png | Bin 1063 -> 0 bytes 7 files changed, 10 insertions(+), 30 deletions(-) rename mods/{hades_core => boost_cart}/textures/default_rail.png (100%) rename mods/{hades_core => boost_cart}/textures/default_rail_crossing.png (100%) rename mods/{hades_core => boost_cart}/textures/default_rail_curved.png (100%) delete mode 100644 mods/hades_core/textures/default_rail_t_junction.png diff --git a/mods/boost_cart/rails.lua b/mods/boost_cart/rails.lua index 602af31..5becf3a 100644 --- a/mods/boost_cart/rails.lua +++ b/mods/boost_cart/rails.lua @@ -1,6 +1,6 @@ local raillike_group = minetest.raillike_group("rail") -minetest.register_node(":hades_core:rail", { +minetest.register_node(":carts:rail", { description = "Steel Rail", drawtype = "raillike", tiles = {"default_rail.png", "default_rail_curved.png", "default_rail_t_junction.png", "default_rail_crossing.png"}, @@ -18,6 +18,15 @@ minetest.register_node(":hades_core:rail", { sounds = hades_sounds.node_sound_metal_defaults(), }) +minetest.register_craft({ + output = 'carts:rail 18', + recipe = { + {'hades_core:steel_ingot', '', 'hades_core:steel_ingot'}, + {'hades_core:steel_ingot', 'group:stick', 'hades_core:steel_ingot'}, + {'hades_core:steel_ingot', '', 'hades_core:steel_ingot'}, + } +}) + -- Copper rail minetest.register_node(":carts:copperrail", { description = "Bronze Rail", diff --git a/mods/hades_core/textures/default_rail.png b/mods/boost_cart/textures/default_rail.png similarity index 100% rename from mods/hades_core/textures/default_rail.png rename to mods/boost_cart/textures/default_rail.png diff --git a/mods/hades_core/textures/default_rail_crossing.png b/mods/boost_cart/textures/default_rail_crossing.png similarity index 100% rename from mods/hades_core/textures/default_rail_crossing.png rename to mods/boost_cart/textures/default_rail_crossing.png diff --git a/mods/hades_core/textures/default_rail_curved.png b/mods/boost_cart/textures/default_rail_curved.png similarity index 100% rename from mods/hades_core/textures/default_rail_curved.png rename to mods/boost_cart/textures/default_rail_curved.png diff --git a/mods/hades_core/crafting.lua b/mods/hades_core/crafting.lua index 50094bc..ee29f66 100644 --- a/mods/hades_core/crafting.lua +++ b/mods/hades_core/crafting.lua @@ -251,17 +251,6 @@ minetest.register_craft({ minetest.register_craft({ - output = 'hades_core:rail 18', - recipe = { - {'hades_core:steel_ingot', '', 'hades_core:steel_ingot'}, - {'hades_core:steel_ingot', 'group:stick', 'hades_core:steel_ingot'}, - {'hades_core:steel_ingot', '', 'hades_core:steel_ingot'}, - } -}) - - - -minetest.register_craft({ type = "shapeless", output = "hades_core:bronze_ingot 2", recipe = {"hades_core:copper_ingot", "hades_core:tin_ingot"}, diff --git a/mods/hades_core/simple_nodes.lua b/mods/hades_core/simple_nodes.lua index 0f316c2..b23246d 100644 --- a/mods/hades_core/simple_nodes.lua +++ b/mods/hades_core/simple_nodes.lua @@ -657,24 +657,6 @@ minetest.register_node("hades_core:glass", { sounds = hades_sounds.node_sound_glass_defaults(), }) -minetest.register_node("hades_core:rail", { - description = "Rail", - drawtype = "raillike", - tiles = {"default_rail.png", "default_rail_curved.png", "default_rail_t_junction.png", "default_rail_crossing.png"}, - inventory_image = "default_rail.png", - wield_image = "default_rail.png", - paramtype = "light", - walkable = false, - is_ground_content = false, - selection_box = { - type = "fixed", - -- but how to specify the dimensions for curved and sideways rails? - fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2}, - }, - groups = {dig_immediate=2,attached_node=1,rail=1,connect_to_raillike=minetest.raillike_group("rail")}, - sounds = hades_sounds.node_sound_metal_defaults(), -}) - --- Liquids minetest.register_node("hades_core:water_flowing", { diff --git a/mods/hades_core/textures/default_rail_t_junction.png b/mods/hades_core/textures/default_rail_t_junction.png deleted file mode 100644 index 5154063d778f1f95aefdcff70eebdd5184d353aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 1063 zcwXxa@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^8||NsAoh6nH3yR9%# zHs4=1$5*C4TB#&hz92v@(_5xDU9%-Yy)H(zE=Fy2o%#GS;~52p6SMXEv-H+9Sgfcq zpIc%)r^I+#zTuQygUPuD%WKRRmYdElHl9&vG%3fRG*~XzSEeFVKHpC^$490%Qn4~j zp)5qcC{V62KrYWuHr-RYB2*#6OQtwTzB*E+IbMB9h3UK!<27{_^Gi*p=Nkf@$1n;; z0d2tXeBM?dWnL2G7yO?rz#tGgw;N~#XMsm#F#`j)FbFd;%$g$s6zuYJaSV~T9D4q^ z&>;f>=74?|e%*z_RT|66|NdWIxZz-8e}0*1l(OI_W-m8QLHlEie;QOa%SvA5h>n}T z>Fqy`NosQ@FnnMZDv(qv*(>~`t?R;}Tvmlw=WPU5xt+9MQS_R