diff --git a/README.txt b/README.txt index 93dd58f..7565ee8 100644 --- a/README.txt +++ b/README.txt @@ -22,15 +22,8 @@ CC-0, if not specified otherwise below Authors --------- -Hawk777 - carts_rail_ss.png - carts_rail_*_ss.png - -hexafraction - carts_rail_brk.png - carts_rail_*_brk.png - carts_rail_pwr.png - carts_rail_*_pwr.png +Various authors + carts_rail_*.png kddekadenz cart_bottom.png @@ -41,12 +34,6 @@ klankbeeld (CC-BY 3.0) http://freesound.org/people/klankbeeld/sounds/174042/ cart_rail.*.ogg -numberZero - carts_rail_dtc.png - carts_rail_dtc_on.png - carts_rail_*_dtc.png - carts_rail_*_dtc_on.png - Zeg9 cart.x cart.png \ No newline at end of file diff --git a/detector.lua b/detector.lua index 43acea5..f345ac6 100644 --- a/detector.lua +++ b/detector.lua @@ -26,7 +26,7 @@ end boost_cart:register_rail("boost_cart:detectorrail", { description = "Detector rail", tiles = { - "carts_rail_dtc.png", "carts_rail_curved_dtc.png", + "carts_rail_straight_dtc.png", "carts_rail_curved_dtc.png", "carts_rail_t_junction_dtc.png", "carts_rail_crossing_dtc.png" }, groups = boost_cart:get_rail_groups({detector_rail = 1}), @@ -37,7 +37,7 @@ boost_cart:register_rail("boost_cart:detectorrail", { boost_cart:register_rail("boost_cart:detectorrail_on", { description = "Detector rail ON (you hacker you)", tiles = { - "carts_rail_dtc_on.png", "carts_rail_curved_dtc_on.png", + "carts_rail_straight_dtc_on.png", "carts_rail_curved_dtc_on.png", "carts_rail_t_junction_dtc_on.png", "carts_rail_crossing_dtc_on.png" }, groups = boost_cart:get_rail_groups({ diff --git a/functions.lua b/functions.lua index f7c560c..fcdd1ad 100644 --- a/functions.lua +++ b/functions.lua @@ -197,7 +197,7 @@ function boost_cart:register_rail(name, def) drawtype = "raillike", paramtype = "light", sunlight_propagates = true, - is_ground_content = true, + is_ground_content = false, walkable = false, selection_box = { type = "fixed", diff --git a/rails.lua b/rails.lua index e5b2f42..c2a58cd 100644 --- a/rails.lua +++ b/rails.lua @@ -1,20 +1,20 @@ boost_cart:register_rail(":default:rail", { description = "Rail", tiles = { - "default_rail.png", "default_rail_curved.png", - "default_rail_t_junction.png", "default_rail_crossing.png" + "carts_rail_straight.png", "carts_rail_curved.png", + "carts_rail_t_junction.png", "carts_rail_crossing.png" }, groups = boost_cart:get_rail_groups() }) +-- Moreores' copper rail if minetest.get_modpath("moreores") then - -- Moreores' copper rail minetest.register_alias("carts:copperrail", "moreores:copper_rail") else boost_cart:register_rail(":carts:copperrail", { description = "Copper rail", tiles = { - "carts_rail_cp.png", "carts_rail_curved_cp.png", + "carts_rail_straight_cp.png", "carts_rail_curved_cp.png", "carts_rail_t_junction_cp.png", "carts_rail_crossing_cp.png" }, groups = boost_cart:get_rail_groups() @@ -23,29 +23,26 @@ else minetest.register_craft({ output = "carts:copperrail 12", recipe = { + {"default:copper_ingot", "", "default:copper_ingot"}, {"default:copper_ingot", "group:stick", "default:copper_ingot"}, - {"default:copper_ingot", "group:stick", "default:copper_ingot"}, - {"default:copper_ingot", "group:stick", "default:copper_ingot"}, + {"default:copper_ingot", "", "default:copper_ingot"}, } }) end --- Speed up - +-- Power rail boost_cart:register_rail(":carts:powerrail", { description = "Powered rail", tiles = { - "carts_rail_pwr.png", "carts_rail_curved_pwr.png", + "carts_rail_straight_pwr.png", "carts_rail_curved_pwr.png", "carts_rail_t_junction_pwr.png", "carts_rail_crossing_pwr.png" }, groups = boost_cart:get_rail_groups(), - after_place_node = function(pos, placer, itemstack) if not mesecon then minetest.get_meta(pos):set_string("cart_acceleration", "0.5") end end, - mesecons = { effector = { action_on = function(pos, node) @@ -67,20 +64,19 @@ minetest.register_craft({ } }) +-- Brake rail boost_cart:register_rail(":carts:brakerail", { description = "Brake rail", tiles = { - "carts_rail_brk.png", "carts_rail_curved_brk.png", + "carts_rail_straight_brk.png", "carts_rail_curved_brk.png", "carts_rail_t_junction_brk.png", "carts_rail_crossing_brk.png" }, groups = boost_cart:get_rail_groups(), - after_place_node = function(pos, placer, itemstack) if not mesecon then minetest.get_meta(pos):set_string("cart_acceleration", "-0.3") end end, - mesecons = { effector = { action_on = function(pos, node) @@ -105,17 +101,15 @@ minetest.register_craft({ boost_cart:register_rail("boost_cart:startstoprail", { description = "Start-stop rail", tiles = { - "carts_rail_ss.png", "carts_rail_curved_ss.png", + "carts_rail_straight_ss.png", "carts_rail_curved_ss.png", "carts_rail_t_junction_ss.png", "carts_rail_crossing_ss.png" }, groups = boost_cart:get_rail_groups(), - after_place_node = function(pos, placer, itemstack) if not mesecon then minetest.get_meta(pos):set_string("cart_acceleration", "halt") end end, - mesecons = { effector = { action_on = function(pos, node) diff --git a/textures/carts_rail_brk.png b/textures/carts_rail_brk.png deleted file mode 100644 index 2717bd5..0000000 Binary files a/textures/carts_rail_brk.png and /dev/null differ diff --git a/textures/carts_rail_cp.png b/textures/carts_rail_cp.png deleted file mode 100644 index 119461f..0000000 Binary files a/textures/carts_rail_cp.png and /dev/null differ diff --git a/textures/carts_rail_crossing.png b/textures/carts_rail_crossing.png new file mode 100644 index 0000000..1591c70 Binary files /dev/null and b/textures/carts_rail_crossing.png differ diff --git a/textures/carts_rail_crossing_brk.png b/textures/carts_rail_crossing_brk.png index f9ce303..0e6adfa 100644 Binary files a/textures/carts_rail_crossing_brk.png and b/textures/carts_rail_crossing_brk.png differ diff --git a/textures/carts_rail_crossing_cp.png b/textures/carts_rail_crossing_cp.png index b04aa63..b2cd736 100644 Binary files a/textures/carts_rail_crossing_cp.png and b/textures/carts_rail_crossing_cp.png differ diff --git a/textures/carts_rail_crossing_dtc.png b/textures/carts_rail_crossing_dtc.png index a2e4760..8558c02 100644 Binary files a/textures/carts_rail_crossing_dtc.png and b/textures/carts_rail_crossing_dtc.png differ diff --git a/textures/carts_rail_crossing_dtc_on.png b/textures/carts_rail_crossing_dtc_on.png index 1adba4f..c5d0bf4 100644 Binary files a/textures/carts_rail_crossing_dtc_on.png and b/textures/carts_rail_crossing_dtc_on.png differ diff --git a/textures/carts_rail_crossing_pwr.png b/textures/carts_rail_crossing_pwr.png index dc317cf..ca9eac4 100644 Binary files a/textures/carts_rail_crossing_pwr.png and b/textures/carts_rail_crossing_pwr.png differ diff --git a/textures/carts_rail_crossing_ss.png b/textures/carts_rail_crossing_ss.png index 11a4226..d7b945a 100644 Binary files a/textures/carts_rail_crossing_ss.png and b/textures/carts_rail_crossing_ss.png differ diff --git a/textures/carts_rail_curved.png b/textures/carts_rail_curved.png new file mode 100644 index 0000000..8db11f3 Binary files /dev/null and b/textures/carts_rail_curved.png differ diff --git a/textures/carts_rail_curved_brk.png b/textures/carts_rail_curved_brk.png index c55183d..03f8bda 100644 Binary files a/textures/carts_rail_curved_brk.png and b/textures/carts_rail_curved_brk.png differ diff --git a/textures/carts_rail_curved_cp.png b/textures/carts_rail_curved_cp.png index 004ef56..b950453 100644 Binary files a/textures/carts_rail_curved_cp.png and b/textures/carts_rail_curved_cp.png differ diff --git a/textures/carts_rail_curved_dtc.png b/textures/carts_rail_curved_dtc.png index 0bf7501..67cc18b 100644 Binary files a/textures/carts_rail_curved_dtc.png and b/textures/carts_rail_curved_dtc.png differ diff --git a/textures/carts_rail_curved_dtc_on.png b/textures/carts_rail_curved_dtc_on.png index 71b8f93..b000d7b 100644 Binary files a/textures/carts_rail_curved_dtc_on.png and b/textures/carts_rail_curved_dtc_on.png differ diff --git a/textures/carts_rail_curved_pwr.png b/textures/carts_rail_curved_pwr.png index 4aef5dd..11d2dbf 100644 Binary files a/textures/carts_rail_curved_pwr.png and b/textures/carts_rail_curved_pwr.png differ diff --git a/textures/carts_rail_curved_ss.png b/textures/carts_rail_curved_ss.png index 5269fdd..934f499 100644 Binary files a/textures/carts_rail_curved_ss.png and b/textures/carts_rail_curved_ss.png differ diff --git a/textures/carts_rail_dtc.png b/textures/carts_rail_dtc.png deleted file mode 100644 index fe306e4..0000000 Binary files a/textures/carts_rail_dtc.png and /dev/null differ diff --git a/textures/carts_rail_dtc_on.png b/textures/carts_rail_dtc_on.png deleted file mode 100644 index 715e063..0000000 Binary files a/textures/carts_rail_dtc_on.png and /dev/null differ diff --git a/textures/carts_rail_pwr.png b/textures/carts_rail_pwr.png deleted file mode 100644 index f346a02..0000000 Binary files a/textures/carts_rail_pwr.png and /dev/null differ diff --git a/textures/carts_rail_ss.png b/textures/carts_rail_ss.png deleted file mode 100644 index 9390394..0000000 Binary files a/textures/carts_rail_ss.png and /dev/null differ diff --git a/textures/carts_rail_straight.png b/textures/carts_rail_straight.png new file mode 100644 index 0000000..36fdf4e Binary files /dev/null and b/textures/carts_rail_straight.png differ diff --git a/textures/carts_rail_straight_brk.png b/textures/carts_rail_straight_brk.png new file mode 100644 index 0000000..d68e396 Binary files /dev/null and b/textures/carts_rail_straight_brk.png differ diff --git a/textures/carts_rail_straight_cp.png b/textures/carts_rail_straight_cp.png new file mode 100644 index 0000000..232cee8 Binary files /dev/null and b/textures/carts_rail_straight_cp.png differ diff --git a/textures/carts_rail_straight_dtc.png b/textures/carts_rail_straight_dtc.png new file mode 100644 index 0000000..85a76b2 Binary files /dev/null and b/textures/carts_rail_straight_dtc.png differ diff --git a/textures/carts_rail_straight_dtc_on.png b/textures/carts_rail_straight_dtc_on.png new file mode 100644 index 0000000..68bfa14 Binary files /dev/null and b/textures/carts_rail_straight_dtc_on.png differ diff --git a/textures/carts_rail_straight_pwr.png b/textures/carts_rail_straight_pwr.png new file mode 100644 index 0000000..252dea4 Binary files /dev/null and b/textures/carts_rail_straight_pwr.png differ diff --git a/textures/carts_rail_straight_ss.png b/textures/carts_rail_straight_ss.png new file mode 100644 index 0000000..b0f537e Binary files /dev/null and b/textures/carts_rail_straight_ss.png differ diff --git a/textures/carts_rail_t_junction.png b/textures/carts_rail_t_junction.png new file mode 100644 index 0000000..0b55a0a Binary files /dev/null and b/textures/carts_rail_t_junction.png differ diff --git a/textures/carts_rail_t_junction_brk.png b/textures/carts_rail_t_junction_brk.png index 5689ffe..d6fc78a 100644 Binary files a/textures/carts_rail_t_junction_brk.png and b/textures/carts_rail_t_junction_brk.png differ diff --git a/textures/carts_rail_t_junction_cp.png b/textures/carts_rail_t_junction_cp.png index 3da9094..e266bcc 100644 Binary files a/textures/carts_rail_t_junction_cp.png and b/textures/carts_rail_t_junction_cp.png differ diff --git a/textures/carts_rail_t_junction_dtc.png b/textures/carts_rail_t_junction_dtc.png index e50cf3b..b69c649 100644 Binary files a/textures/carts_rail_t_junction_dtc.png and b/textures/carts_rail_t_junction_dtc.png differ diff --git a/textures/carts_rail_t_junction_dtc_on.png b/textures/carts_rail_t_junction_dtc_on.png index 41a08d1..2a21d1f 100644 Binary files a/textures/carts_rail_t_junction_dtc_on.png and b/textures/carts_rail_t_junction_dtc_on.png differ diff --git a/textures/carts_rail_t_junction_pwr.png b/textures/carts_rail_t_junction_pwr.png index d7edaf1..a2e0f1d 100644 Binary files a/textures/carts_rail_t_junction_pwr.png and b/textures/carts_rail_t_junction_pwr.png differ diff --git a/textures/carts_rail_t_junction_ss.png b/textures/carts_rail_t_junction_ss.png index f101298..303c6cf 100644 Binary files a/textures/carts_rail_t_junction_ss.png and b/textures/carts_rail_t_junction_ss.png differ diff --git a/textures/default_rail_t_junction.png b/textures/default_rail_t_junction.png deleted file mode 100644 index fe62905..0000000 Binary files a/textures/default_rail_t_junction.png and /dev/null differ diff --git a/textures/templates/crossing.png b/textures/templates/crossing.png new file mode 100644 index 0000000..67b7168 Binary files /dev/null and b/textures/templates/crossing.png differ diff --git a/textures/templates/curved.png b/textures/templates/curved.png new file mode 100644 index 0000000..a9070dc Binary files /dev/null and b/textures/templates/curved.png differ diff --git a/textures/templates/straight.png b/textures/templates/straight.png new file mode 100644 index 0000000..9911b36 Binary files /dev/null and b/textures/templates/straight.png differ diff --git a/textures/templates/t_junction.png b/textures/templates/t_junction.png new file mode 100644 index 0000000..8c6b621 Binary files /dev/null and b/textures/templates/t_junction.png differ