From cdce04254a5fb8a7813fdf155cc0c8874a353e30 Mon Sep 17 00:00:00 2001 From: webdesigner97 Date: Tue, 27 May 2014 13:49:45 +0200 Subject: move poles to new submod --- roadsigns/init.lua | 1 - roadsigns/pole.lua | 70 -------------------------- streetspoles/depends.txt | 1 + streetspoles/init.lua | 127 +++++++++++++++++++++++++++++++++++++++++++++++ trafficlight/init.lua | 2 - trafficlight/pole.lua | 55 -------------------- 6 files changed, 128 insertions(+), 128 deletions(-) delete mode 100644 roadsigns/pole.lua create mode 100644 streetspoles/depends.txt create mode 100644 streetspoles/init.lua delete mode 100644 trafficlight/pole.lua diff --git a/roadsigns/init.lua b/roadsigns/init.lua index 38e8692..96646b3 100644 --- a/roadsigns/init.lua +++ b/roadsigns/init.lua @@ -1,6 +1,5 @@ --[[ StreetsMod: Poles and signs ]] -dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/pole.lua") dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/signs.lua") dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/workshop.lua") \ No newline at end of file diff --git a/roadsigns/pole.lua b/roadsigns/pole.lua deleted file mode 100644 index 5d68398..0000000 --- a/roadsigns/pole.lua +++ /dev/null @@ -1,70 +0,0 @@ ---[[ - StreetsMod: Poles and signs -]] -minetest.register_node(":streets:pole_bottom",{ - description = streets.S("Pole"), - tiles = {"streets_pole.png"}, - groups = {cracky=2}, - inventory_image = "streets_pole_inv.png", - wield_image = "streets_pole_inv.png", - paramtype = "light", - paramtype2 = "facedir", - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.1,-0.5,-0.5,0.1,0.5,-0.4}, - {-0.125,-0.5,-0.525,0.125,-0.3,-0.375} - } - }, - selection_box = { - type = "fixed", - fixed = { - {-0.1,-0.5,-0.5,0.1,0.5,-0.4} - } - }, - after_place_node = function(pos,placer,itemstack) - pos.y = pos.y +1 - if minetest.get_node(pos).name == "air" then - minetest.add_node(pos,{name = "streets:pole_top", param2 = minetest.dir_to_facedir(placer:get_look_dir())}) - else - minetest.chat_send_player(placer:get_player_name(),"Not enough free space! A pole has a height of 2 blocks!") - pos.y = pos.y -1 - minetest.remove_node(pos) - end - end, - after_dig_node = function(pos, oldnode, oldmetadata, digger) - pos.y = pos.y +1 - if minetest.get_node(pos).name == "streets:pole_top" then - minetest.remove_node(pos) - end - end -}) - -minetest.register_node(":streets:pole_top",{ - description = streets.S("Y u no play minetest without cheating?"), - tiles = {"streets_pole.png"}, - groups = {cracky=2,not_in_creative_inventory=1}, - paramtype = "light", - paramtype2 = "facedir", - drawtype = "nodebox", - drop = "", - can_dig = function() - return false - end, - node_box = { - type = "fixed", - fixed = { - {-0.1,-0.5,-0.5,0.1,0.5,-0.4} - } - } -}) - -minetest.register_craft({ - output = "streets:pole_bottom 3", - recipe = { - {"","default:steel_ingot",""}, - {"","default:steel_ingot",""}, - {"","default:steel_ingot",""} - } -}) \ No newline at end of file diff --git a/streetspoles/depends.txt b/streetspoles/depends.txt new file mode 100644 index 0000000..421a27d --- /dev/null +++ b/streetspoles/depends.txt @@ -0,0 +1 @@ +streetsmod \ No newline at end of file diff --git a/streetspoles/init.lua b/streetspoles/init.lua new file mode 100644 index 0000000..b7d0a6b --- /dev/null +++ b/streetspoles/init.lua @@ -0,0 +1,127 @@ +--[[ + StreetsMod: Poles +]] + +-- Simple pole +minetest.register_node(":streets:pole_bottom",{ + description = streets.S("Pole"), + tiles = {"streets_pole.png"}, + groups = {cracky=2}, + inventory_image = "streets_pole_inv.png", + wield_image = "streets_pole_inv.png", + paramtype = "light", + paramtype2 = "facedir", + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { + {-0.1,-0.5,-0.5,0.1,0.5,-0.4}, + {-0.125,-0.5,-0.525,0.125,-0.3,-0.375} + } + }, + selection_box = { + type = "fixed", + fixed = { + {-0.1,-0.5,-0.5,0.1,0.5,-0.4} + } + }, + after_place_node = function(pos,placer,itemstack) + pos.y = pos.y +1 + if minetest.get_node(pos).name == "air" then + minetest.add_node(pos,{name = "streets:pole_top", param2 = minetest.dir_to_facedir(placer:get_look_dir())}) + else + minetest.chat_send_player(placer:get_player_name(),"Not enough free space! A pole has a height of 2 blocks!") + pos.y = pos.y -1 + minetest.remove_node(pos) + end + end, + after_dig_node = function(pos, oldnode, oldmetadata, digger) + pos.y = pos.y +1 + if minetest.get_node(pos).name == "streets:pole_top" then + minetest.remove_node(pos) + end + end +}) + +minetest.register_node(":streets:pole_top",{ + description = streets.S("Y u no play minetest without cheating?"), + tiles = {"streets_pole.png"}, + groups = {cracky=2,not_in_creative_inventory=1}, + paramtype = "light", + paramtype2 = "facedir", + drawtype = "nodebox", + drop = "", + can_dig = function() + return false + end, + node_box = { + type = "fixed", + fixed = { + {-0.1,-0.5,-0.5,0.1,0.5,-0.4} + } + } +}) + +minetest.register_craft({ + output = "streets:pole_bottom 3", + recipe = { + {"","default:steel_ingot",""}, + {"","default:steel_ingot",""}, + {"","default:steel_ingot",""} + } +}) + +-- Big pole + +local rules_pole = { + {x= 0, y= 0, z=-1}, + {x= 1, y= 0, z= 0}, + {x=-1, y= 0, z= 0}, + {x= 0, y= 0, z= 1}, + {x= 1, y= 1, z= 0}, + {x= 1, y=-1, z= 0}, + {x=-1, y= 1, z= 0}, + {x=-1, y=-1, z= 0}, + {x= 0, y= 1, z= 1}, + {x= 0, y=-1, z= 1}, + {x= 0, y= 1, z=-1}, + {x= 0, y=-1, z=-1}, + {x= 0, y=-1, z= 0}, + {x= 0, y= 1, z= 0} +} + +minetest.register_node(":streets:bigpole", { + description = "Pole", + paramtype = "light", + paramtype2 = "facedir", + drawtype = "nodebox", + tiles = {"streets_pole.png"}, + groups = {cracky = 1, level = 2, bigpole = 1}, + node_box = { + type = "fixed", + fixed = { + {-0.15, -0.5, -0.15, 0.15, 0.5, 0.15} + } + }, + on_place = minetest.rotate_node, + digiline = { + wire = { + rules = rules_pole + } + } +}) +minetest.register_node(":streets:bigpole_edge", { + drop = "streets:bigpole", + paramtype = "light", + paramtype2 = "facedir", + drawtype = "nodebox", + tiles = {"streets_pole.png"}, + groups = {cracky = 1, level = 2, not_in_creative_inventory = 1, bigpole = 1}, + node_box = { + type = "fixed", + fixed = { + {-0.15,-0.5,-0.15,0.15,0.15,0.15}, + {-0.15,-0.15,-0.125,0.15,0.15,-0.5} + } + }, +}) \ No newline at end of file diff --git a/trafficlight/init.lua b/trafficlight/init.lua index a1a0e53..2b4cd46 100644 --- a/trafficlight/init.lua +++ b/trafficlight/init.lua @@ -2,8 +2,6 @@ StreetsMod: inDev Trafficlights ]] -dofile(streets.modpath .. "/../trafficlight/pole.lua") - streets.tlBox = { --[[ Thank you, rubenwardy, for your awesome NodeboxEditor! Not perfect, but still great! ]] {-0.1875,-0.5,0.5,0.1875,0.5,0.75}, --nodebox1 diff --git a/trafficlight/pole.lua b/trafficlight/pole.lua deleted file mode 100644 index a8815fc..0000000 --- a/trafficlight/pole.lua +++ /dev/null @@ -1,55 +0,0 @@ ---[[ - StreetsMod: inDev Trafficlights -]] -local rules_pole = { - {x= 0, y= 0, z=-1}, - {x= 1, y= 0, z= 0}, - {x=-1, y= 0, z= 0}, - {x= 0, y= 0, z= 1}, - {x= 1, y= 1, z= 0}, - {x= 1, y=-1, z= 0}, - {x=-1, y= 1, z= 0}, - {x=-1, y=-1, z= 0}, - {x= 0, y= 1, z= 1}, - {x= 0, y=-1, z= 1}, - {x= 0, y= 1, z=-1}, - {x= 0, y=-1, z=-1}, - {x= 0, y=-1, z= 0}, - {x= 0, y= 1, z= 0} -} - -minetest.register_node(":streets:bigpole", { - description = "Pole", - paramtype = "light", - paramtype2 = "facedir", - drawtype = "nodebox", - tiles = {"streets_pole.png"}, - groups = {cracky = 1, level = 2, bigpole = 1}, - node_box = { - type = "fixed", - fixed = { - {-0.15, -0.5, -0.15, 0.15, 0.5, 0.15} - } - }, - on_place = minetest.rotate_node, - digiline = { - wire = { - rules = rules_pole - } - } -}) -minetest.register_node(":streets:bigpole_edge", { - drop = "streets:bigpole", - paramtype = "light", - paramtype2 = "facedir", - drawtype = "nodebox", - tiles = {"streets_pole.png"}, - groups = {cracky = 1, level = 2, not_in_creative_inventory = 1, bigpole = 1}, - node_box = { - type = "fixed", - fixed = { - {-0.15,-0.5,-0.15,0.15,0.15,0.15}, - {-0.15,-0.15,-0.125,0.15,0.15,-0.5} - } - }, -}) \ No newline at end of file -- cgit v1.2.3