From 2108db402d27e9129371a4343b06e35b130bfc38 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Fri, 13 Sep 2019 17:00:08 -0400 Subject: [PATCH] update signs_lib and street_signs. --- signs_lib/api.lua | 72 ++++++++++++++++++++++- street_signs/signs_class_d.lua | 16 ++--- street_signs/signs_class_m.lua | 8 +-- street_signs/signs_class_om.lua | 2 +- street_signs/signs_class_r.lua | 90 ++++++++++++++--------------- street_signs/signs_class_w.lua | 84 +++++++++++++-------------- street_signs/signs_misc_generic.lua | 12 ++-- 7 files changed, 176 insertions(+), 108 deletions(-) diff --git a/signs_lib/api.lua b/signs_lib/api.lua index c3bb1639..2d6292cc 100644 --- a/signs_lib/api.lua +++ b/signs_lib/api.lua @@ -18,8 +18,8 @@ signs_lib.standard_xoffs = 4 signs_lib.standard_yoffs = 2 signs_lib.standard_cpl = 35 -signs_lib.standard_wood_groups = {choppy = 2, flammable = 2, oddly_breakable_by_hand = 3} -signs_lib.standard_steel_groups = {cracky = 2, oddly_breakable_by_hand = 3} +signs_lib.standard_wood_groups = {sign = 1, choppy = 2, flammable = 2, oddly_breakable_by_hand = 3} +signs_lib.standard_steel_groups = {sign = 1, cracky = 2, oddly_breakable_by_hand = 3} signs_lib.standard_yaw = { 0, @@ -694,3 +694,71 @@ minetest.register_lbm({ end end }) + +signs_lib.block_list = {} +signs_lib.totalblocks = 0 + +-- Maintain a list of currently-loaded blocks +minetest.register_lbm({ + nodenames = {"group:sign"}, + name = "signs_lib:update_block_list", + label = "Update list of loaded blocks, log only those with signs", + run_at_every_load = true, + action = function(pos, node) + -- yeah, yeah... I know I'm hashing a block pos, but it's still just a set of coords + local hash = minetest.hash_node_position(vector.floor(vector.divide(pos, core.MAP_BLOCKSIZE))) + if not signs_lib.block_list[hash] then + signs_lib.block_list[hash] = true + signs_lib.totalblocks = signs_lib.totalblocks + 1 + end + end +}) + +minetest.register_chatcommand("regen_signs", { + params = "", + privs = {sign_editor = true}, + description = "Skims through all currently-loaded sign-bearing mapblocks, clears away any entities within each sign's node space, and regenerates their text entities, if any.", + func = function(player_name, params) + local allsigns = {} + local totalsigns = 0 + for b in pairs(signs_lib.block_list) do + local blockpos = minetest.get_position_from_hash(b) + local pos1 = vector.multiply(blockpos, core.MAP_BLOCKSIZE) + local pos2 = vector.add(pos1, core.MAP_BLOCKSIZE - 1) + if minetest.get_node_or_nil(vector.add(pos1, core.MAP_BLOCKSIZE/2)) then + local signs_in_block = minetest.find_nodes_in_area(pos1, pos2, {"group:sign"}) + allsigns[#allsigns + 1] = signs_in_block + totalsigns = totalsigns + #signs_in_block + else + signs_lib.block_list[b] = nil -- if the block is no longer loaded, remove it from the table + signs_lib.totalblocks = signs_lib.totalblocks - 1 + end + end + if signs_lib.totalblocks < 0 then signs_lib.totalblocks = 0 end + if totalsigns == 0 then + minetest.chat_send_player(player_name, "There are no signs in the currently-loaded terrain.") + signs_lib.block_list = {} + return + end + + minetest.chat_send_player(player_name, "Found a total of "..totalsigns.." sign nodes across "..signs_lib.totalblocks.." blocks.") + minetest.chat_send_player(player_name, "Regenerating sign entities...") + + for _, b in pairs(allsigns) do + for _, pos in ipairs(b) do + local objects = minetest.get_objects_inside_radius(pos, 0.5) + if #objects > 0 then + for _, v in ipairs(objects) do + v:remove() + end + end + local node = minetest.get_node(pos) + local def = minetest.registered_items[node.name] + if def and def.entity_info then + signs_lib.update_sign(pos) + end + end + end + minetest.chat_send_player(player_name, "Finished.") + end +}) diff --git a/street_signs/signs_class_d.lua b/street_signs/signs_class_d.lua index ab2a40e8..4002e75c 100644 --- a/street_signs/signs_class_d.lua +++ b/street_signs/signs_class_d.lua @@ -24,7 +24,7 @@ minetest.register_node("street_signs:sign_basic", { selection_box = cbox, mesh = "street_signs_basic.obj", tiles = { "street_signs_basic.png" }, - groups = {choppy=2, dig_immediate=2}, + groups = {sign = 1, choppy=2, dig_immediate=2}, default_color = "f", on_construct = signs_lib.construct_sign, on_rightclick = signs_lib.construct_sign, @@ -68,7 +68,7 @@ minetest.register_node("street_signs:sign_basic_top_only", { selection_box = cbox, mesh = "street_signs_basic_top_only.obj", tiles = { "street_signs_basic.png" }, - groups = {choppy=2, dig_immediate=2}, + groups = {sign = 1, choppy=2, dig_immediate=2}, default_color = "f", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -122,7 +122,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_service_hospital_inv.png", wield_image = "street_signs_service_hospital_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -144,7 +144,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_service_handicapped_inv.png", wield_image = "street_signs_service_handicapped_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -166,7 +166,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_service_fuel_inv.png", wield_image = "street_signs_service_fuel_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -188,7 +188,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_service_food_inv.png", wield_image = "street_signs_service_food_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -210,7 +210,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_service_lodging_inv.png", wield_image = "street_signs_service_lodging_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -232,7 +232,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_service_ev_charging_inv.png", wield_image = "street_signs_service_ev_charging_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, diff --git a/street_signs/signs_class_m.lua b/street_signs/signs_class_m.lua index 46158985..b1256d4d 100644 --- a/street_signs/signs_class_m.lua +++ b/street_signs/signs_class_m.lua @@ -32,7 +32,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_us_route_inv.png", wield_image = "street_signs_us_route_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -71,7 +71,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_us_interstate_inv.png", wield_image = "street_signs_us_interstate_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "f", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -112,7 +112,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_detour_right_m4_10_inv.png", wield_image = "street_signs_detour_right_m4_10_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -134,7 +134,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_detour_left_m4_10_inv.png", wield_image = "street_signs_detour_left_m4_10_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, diff --git a/street_signs/signs_class_om.lua b/street_signs/signs_class_om.lua index 254ccffa..0d458916 100644 --- a/street_signs/signs_class_om.lua +++ b/street_signs/signs_class_om.lua @@ -20,6 +20,6 @@ for _, d in ipairs({"l", "c", "r"}) do "street_signs_sign_edge.png" }, inventory_image = "street_signs_object_marker_type3_"..d.."_inv.png", - groups = {choppy=2, dig_immediate=2}, + groups = {sign = 1, choppy=2, dig_immediate=2}, }) end diff --git a/street_signs/signs_class_r.lua b/street_signs/signs_class_r.lua index f2749463..344c9251 100644 --- a/street_signs/signs_class_r.lua +++ b/street_signs/signs_class_r.lua @@ -32,7 +32,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_stop_inv.png", wield_image = "street_signs_stop_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -57,7 +57,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_stop_all_way_inv.png", wield_image = "street_signs_stop_all_way_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -81,7 +81,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_yield_inv.png", wield_image = "street_signs_yield_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -105,7 +105,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_speed_limit_inv.png", wield_image = "street_signs_speed_limit_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -147,7 +147,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_no_right_turn_inv.png", wield_image = "street_signs_no_right_turn_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_no_right_turn" @@ -169,7 +169,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_no_left_turn_inv.png", wield_image = "street_signs_no_left_turn_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_no_left_turn" @@ -191,7 +191,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_no_u_turn_inv.png", wield_image = "street_signs_no_u_turn_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_no_u_turn" @@ -213,7 +213,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_u_turn_here_inv.png", wield_image = "street_signs_u_turn_here_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_u_turn_here" @@ -237,7 +237,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_left_turn_only_inv.png", wield_image = "street_signs_left_turn_only_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_left_turn_only" @@ -259,7 +259,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_right_turn_only_inv.png", wield_image = "street_signs_right_turn_only_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_right_turn_only" @@ -281,7 +281,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_straight_through_only_inv.png", wield_image = "street_signs_straight_through_only_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_straight_through_only" @@ -303,7 +303,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_left_turn_or_straight_inv.png", wield_image = "street_signs_left_turn_or_straight_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_left_turn_or_straight" @@ -325,7 +325,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_right_turn_or_straight_inv.png", wield_image = "street_signs_right_turn_or_straight_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_right_turn_or_straight" @@ -350,7 +350,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_left_lane_must_turn_left_inv.png", wield_image = "street_signs_left_lane_must_turn_left_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_left_lane_must_turn_left" @@ -372,7 +372,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_right_lane_must_turn_right_inv.png", wield_image = "street_signs_right_lane_must_turn_right_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_right_lane_must_turn_right" @@ -394,7 +394,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_no_straight_through_inv.png", wield_image = "street_signs_no_straight_through_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_no_straight_through" @@ -417,7 +417,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_keep_right_inv.png", wield_image = "street_signs_keep_right_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_keep_right" @@ -438,7 +438,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_keep_left_inv.png", wield_image = "street_signs_keep_left_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_keep_left" @@ -462,7 +462,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_do_not_enter_inv.png", wield_image = "street_signs_do_not_enter_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_do_not_enter" @@ -485,7 +485,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_wrong_way_inv.png", wield_image = "street_signs_wrong_way_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_wrong_way" @@ -508,7 +508,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_one_way_left_inv.png", wield_image = "street_signs_one_way_left_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_one_way_left" @@ -529,7 +529,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_one_way_right_inv.png", wield_image = "street_signs_one_way_right_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_one_way_right" @@ -552,7 +552,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_divided_highway_with_cross_road_inv.png", wield_image = "street_signs_divided_highway_with_cross_road_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_divided_highway_with_cross_road" @@ -575,7 +575,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_roundabout_directional_inv.png", wield_image = "street_signs_roundabout_directional.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_roundabout_directional" @@ -596,7 +596,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_roundabout_directional_left_inv.png", wield_image = "street_signs_roundabout_directional_left.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_roundabout_directional_left" @@ -619,7 +619,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_roundabout_counter_clockwise_inv.png", wield_image = "street_signs_roundabout_counter_clockwise.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_roundabout_counter_clockwise" @@ -640,7 +640,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_roundabout_clockwise_inv.png", wield_image = "street_signs_roundabout_clockwise.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_roundabout_clockwise" @@ -663,7 +663,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_do_not_stop_on_tracks_inv.png", wield_image = "street_signs_do_not_stop_on_tracks.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -687,7 +687,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_ped_push_button_to_cross_r10_3a_inv.png", wield_image = "street_signs_ped_push_button_to_cross_r10_3a_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -709,7 +709,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_ped_push_button_to_cross_r10_3a_right_inv.png", wield_image = "street_signs_ped_push_button_to_cross_r10_3a_right_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -731,7 +731,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_ped_push_button_to_cross_r10_3a_both_ways_inv.png", wield_image = "street_signs_ped_push_button_to_cross_r10_3a_both_ways_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -753,7 +753,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_ped_push_button_to_cross_r10_3e_inv.png", wield_image = "street_signs_ped_push_button_to_cross_r10_3e_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -775,7 +775,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_ped_push_button_to_cross_r10_3e_left_inv.png", wield_image = "street_signs_ped_push_button_to_cross_r10_3e_left_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -797,7 +797,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_ped_push_button_to_cross_r10_3i_inv.png", wield_image = "street_signs_ped_push_button_to_cross_r10_3i_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -836,7 +836,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_ped_push_button_to_cross_r10_3i_left_inv.png", wield_image = "street_signs_ped_push_button_to_cross_r10_3i_left_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -877,7 +877,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_left_on_green_arrow_only_inv.png", wield_image = "street_signs_left_on_green_arrow_only_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_left_on_green_arrow_only" @@ -900,7 +900,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_stop_here_on_red_inv.png", wield_image = "street_signs_stop_here_on_red_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_stop_here_on_red" @@ -923,7 +923,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_use_lane_with_green_arrow_inv.png", wield_image = "street_signs_use_lane_with_green_arrow_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:use_lane_with_green_arrow" @@ -946,7 +946,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_no_turn_on_red_light_inv.png", wield_image = "street_signs_no_turn_on_red_light_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:no_turn_on_red_light" @@ -969,7 +969,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_left_turn_yield_on_green_light_inv.png", wield_image = "street_signs_left_turn_yield_on_green_light_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_left_turn_yield_on_green_light" @@ -992,7 +992,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_crosswalk_stop_on_red_light_inv.png", wield_image = "street_signs_crosswalk_stop_on_red_light_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_crosswalk_stop_on_red_light" @@ -1015,7 +1015,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_ped_push_button_to_turn_on_warning_lights_inv.png", wield_image = "street_signs_ped_push_button_to_turn_on_warning_lights_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -1039,7 +1039,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_rr_grade_crossbuck_inv.png", wield_image = "street_signs_rr_grade_crossbuck_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, drop = "street_signs:sign_rr_grade_crossbuck" @@ -1062,7 +1062,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_rr_exempt_r15_3p_inv.png", wield_image = "street_signs_rr_exempt_r15_3p_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -1091,5 +1091,5 @@ minetest.register_node("street_signs:sign_stop_for_ped", { mesh = "street_signs_stop_for_ped.obj", tiles = { "street_signs_stop_for_ped.png" }, inventory_image = "street_signs_stop_for_ped_inv.png", - groups = {choppy=2, dig_immediate=2}, + groups = {sign = 1, choppy=2, dig_immediate=2}, }) diff --git a/street_signs/signs_class_w.lua b/street_signs/signs_class_w.lua index b25b67e1..7487a959 100644 --- a/street_signs/signs_class_w.lua +++ b/street_signs/signs_class_w.lua @@ -32,7 +32,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_road_turns_sharp_left_inv.png", wield_image = "street_signs_road_turns_sharp_left_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -54,7 +54,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_road_turns_sharp_right_inv.png", wield_image = "street_signs_road_turns_sharp_right_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -76,7 +76,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_road_turns_left_inv.png", wield_image = "street_signs_road_turns_left_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -98,7 +98,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_road_turns_right_inv.png", wield_image = "street_signs_road_turns_right_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -120,7 +120,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_road_turns_dog_leg_left_inv.png", wield_image = "street_signs_road_turns_dog_leg_left_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -142,7 +142,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_road_turns_dog_leg_right_inv.png", wield_image = "street_signs_road_turns_dog_leg_right_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -164,7 +164,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_road_turns_dog_leg_curve_left_inv.png", wield_image = "street_signs_road_turns_dog_leg_curve_left_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -186,7 +186,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_road_turns_dog_leg_curve_right_inv.png", wield_image = "street_signs_road_turns_dog_leg_curve_right_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -208,7 +208,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_road_winding_inv.png", wield_image = "street_signs_road_winding_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -230,7 +230,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_road_turns_hairpin_left_inv.png", wield_image = "street_signs_road_turns_hairpin_left_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -252,7 +252,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_road_turns_hairpin_right_inv.png", wield_image = "street_signs_road_turns_hairpin_right_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -274,7 +274,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_road_turns_270_left_inv.png", wield_image = "street_signs_road_turns_270_left_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -296,7 +296,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_road_turns_270_right_inv.png", wield_image = "street_signs_road_turns_270_right_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -320,7 +320,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_large_arrow_left_inv.png", wield_image = "street_signs_large_arrow_left_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -342,7 +342,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_large_arrow_right_inv.png", wield_image = "street_signs_large_arrow_right_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -364,7 +364,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_two_direction_large_arrow_inv.png", wield_image = "street_signs_two_direction_large_arrow_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -388,7 +388,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_cross_road_ahead_inv.png", wield_image = "street_signs_cross_road_ahead_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -410,7 +410,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_side_road_right_ahead_inv.png", wield_image = "street_signs_side_road_right_ahead_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -432,7 +432,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_side_road_left_ahead_inv.png", wield_image = "street_signs_side_road_left_ahead_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -454,7 +454,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_t_junction_ahead_inv.png", wield_image = "street_signs_t_junction_ahead_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -476,7 +476,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_circular_intersection_ahead_inv.png", wield_image = "street_signs_circular_intersection_ahead_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -498,7 +498,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_offset_side_road_left_ahead_inv.png", wield_image = "street_signs_offset_side_road_left_ahead_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -520,7 +520,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_offset_side_road_right_ahead_inv.png", wield_image = "street_signs_offset_side_road_right_ahead_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -542,7 +542,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_stop_ahead_inv.png", wield_image = "street_signs_stop_ahead_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -564,7 +564,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_yield_ahead_inv.png", wield_image = "street_signs_yield_ahead_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -586,7 +586,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_signal_ahead_inv.png", wield_image = "street_signs_signal_ahead_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -608,7 +608,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_merging_traffic_inv.png", wield_image = "street_signs_merging_traffic_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -630,7 +630,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_left_lane_ends_inv.png", wield_image = "street_signs_left_lane_ends_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -652,7 +652,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_right_lane_ends_inv.png", wield_image = "street_signs_right_lane_ends_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -674,7 +674,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_divided_highway_begins_inv.png", wield_image = "street_signs_divided_highway_begins_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -696,7 +696,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_divided_highway_ends_inv.png", wield_image = "street_signs_divided_highway_ends_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -718,7 +718,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_two_way_traffic_inv.png", wield_image = "street_signs_two_way_traffic_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -740,7 +740,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_hill_with_grade_ahead_inv.png", wield_image = "street_signs_hill_with_grade_ahead_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -781,7 +781,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_distance_2_lines_inv.png", wield_image = "street_signs_distance_2_lines_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -820,7 +820,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_distance_2_lines_orange_inv.png", wield_image = "street_signs_distance_2_lines_orange_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -862,7 +862,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_rr_grade_crossing_advance_inv.png", wield_image = "street_signs_rr_grade_crossing_advance_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -886,7 +886,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_rr_exempt_w10_1ap_inv.png", wield_image = "street_signs_rr_exempt_w10_1ap_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -910,7 +910,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_pedestrian_crossing_inv.png", wield_image = "street_signs_pedestrian_crossing_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", after_place_node = signs_lib.after_place_node, on_rotate = signs_lib.wallmounted_rotate, @@ -932,7 +932,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_low_clearance_inv.png", wield_image = "street_signs_low_clearance_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -973,7 +973,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_advisory_speed_mph_inv.png", wield_image = "street_signs_advisory_speed_mph_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -1012,7 +1012,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_advisory_speed_kmh_inv.png", wield_image = "street_signs_advisory_speed_kmh_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -1051,7 +1051,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_advisory_speed_ms_inv.png", wield_image = "street_signs_advisory_speed_ms_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, diff --git a/street_signs/signs_misc_generic.lua b/street_signs/signs_misc_generic.lua index 3127d9dd..0e4ffe1b 100644 --- a/street_signs/signs_misc_generic.lua +++ b/street_signs/signs_misc_generic.lua @@ -30,7 +30,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_warning_3_line_inv.png", wield_image = "street_signs_warning_3_line_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -69,7 +69,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_warning_4_line_inv.png", wield_image = "street_signs_warning_4_line_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -108,7 +108,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_warning_orange_3_line_inv.png", wield_image = "street_signs_warning_orange_3_line_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -147,7 +147,7 @@ for _, onpole in ipairs({"", "_onpole"}) do }, inventory_image = "street_signs_warning_orange_4_line_inv.png", wield_image = "street_signs_warning_orange_4_line_inv.png", - groups = {choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, + groups = {sign = 1, choppy=2, dig_immediate=2, not_in_creative_inventory = nci}, default_color = "0", on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, @@ -214,7 +214,7 @@ for _, s in ipairs(street_signs.big_sign_sizes) do "street_signs_generic_highway_edges.png" }, default_color = defc, - groups = {choppy=2, dig_immediate=2}, + groups = {sign = 1, choppy=2, dig_immediate=2}, on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, on_destruct = signs_lib.destruct_sign, @@ -252,7 +252,7 @@ for _, s in ipairs(street_signs.big_sign_sizes) do "street_signs_generic_highway_edges.png" }, default_color = defc, - groups = {choppy=2, dig_immediate=2}, + groups = {sign = 1, choppy=2, dig_immediate=2}, on_rightclick = signs_lib.construct_sign, on_construct = signs_lib.construct_sign, on_destruct = signs_lib.destruct_sign,