Merge pull request #6 from Kotolegokot/master

Some modifications and fixed.
This commit is contained in:
Jeija 2012-08-01 07:45:07 -07:00
commit 150da24db6
19 changed files with 46 additions and 38 deletions

View File

@ -126,7 +126,7 @@ minetest.register_node("mesecons:mesecon_on", {
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5}, fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
}, },
groups = {dig_immediate=3}, groups = {dig_immediate=3, not_in_creaive_inventory=1},
drop = '"mesecons:mesecon_off" 1', drop = '"mesecons:mesecon_off" 1',
light_source = LIGHT_MAX-11, light_source = LIGHT_MAX-11,
}) })

View File

@ -9,9 +9,9 @@ for i = 1, 5 do
type = "fixed", type = "fixed",
fixed = { fixed = {
{-0.499, -0.499, -0.499, -0.4, 0.499, 0.499}, {-0.499, -0.499, -0.499, -0.4, 0.499, 0.499},
{ 0.499, -0.499, -0.499, 0.4, 0.499, 0.499}, { 0.4, -0.499, -0.499, 0.499, 0.499, 0.499},
{-0.499, -0.499, -0.499, 0.499, 0.499, -0.4 }, {-0.499, -0.499, -0.499, 0.499, 0.499, -0.4 },
{-0.499, -0.499, 0.499, 0.499, 0.499, 0.4 }, {-0.499, -0.499, 0.4, 0.499, 0.499, 0.499 },
{-0.4 , -0.5 , -0.4 , 0.4 , 1*(i/5)-0.5, 0.4}} {-0.4 , -0.5 , -0.4 , 0.4 , 1*(i/5)-0.5, 0.4}}
}, },
@ -36,9 +36,9 @@ for i = 1, 5 do
type = "fixed", type = "fixed",
fixed = { fixed = {
{-0.499, -0.499, -0.499, -0.4, 0.499, 0.499}, {-0.499, -0.499, -0.499, -0.4, 0.499, 0.499},
{ 0.499, -0.499, -0.499, 0.4, 0.499, 0.499}, { 0.4, -0.499, -0.499, 0.499, 0.499, 0.499},
{-0.499, -0.499, -0.499, 0.499, 0.499, -0.4 }, {-0.499, -0.499, -0.499, 0.499, 0.499, -0.4 },
{-0.499, -0.499, 0.499, 0.499, 0.499, 0.4 }, {-0.499, -0.499, 0.4, 0.499, 0.499, 0.499 },
{-0.4 , -0.5 , -0.4 , 0.4 , 1*(i/5)-0.5, 0.4}} {-0.4 , -0.5 , -0.4 , 0.4 , 1*(i/5)-0.5, 0.4}}
}, },
@ -46,7 +46,7 @@ for i = 1, 5 do
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
}, },
groups = {dig_immediate=2}, groups = {dig_immediate=2,not_in_creative_inventory=1},
description="Battery", description="Battery",
}) })
mesecon:add_receptor_node("mesecons_battery:battery_discharging_"..i) mesecon:add_receptor_node("mesecons_battery:battery_discharging_"..i)

View File

@ -7,8 +7,12 @@ minetest.register_node("mesecons_blinkyplant:blinky_plant_off", {
inventory_image = "jeija_blinky_plant_off.png", inventory_image = "jeija_blinky_plant_off.png",
paramtype = "light", paramtype = "light",
walkable = false, walkable = false,
groups = {snappy=2}, groups = {dig_immediate=3},
description="Blinky Plant", description="Blinky Plant",
selection_box = {
type = "fixed",
fixed = {-0.1, -0.5, -0.1, 0.1, -0.5+0.6, 0.1},
},
}) })
minetest.register_node("mesecons_blinkyplant:blinky_plant_on", { minetest.register_node("mesecons_blinkyplant:blinky_plant_on", {
@ -18,13 +22,17 @@ minetest.register_node("mesecons_blinkyplant:blinky_plant_on", {
inventory_image = "jeija_blinky_plant_off.png", inventory_image = "jeija_blinky_plant_off.png",
paramtype = "light", paramtype = "light",
walkable = false, walkable = false,
groups = {snappy=2}, groups = {dig_immediate=3, not_in_creative_inventory=1},
drop='"mesecons_blinkyplant:blinky_plant_off" 1', drop='"mesecons_blinkyplant:blinky_plant_off" 1',
light_source = LIGHT_MAX-7, light_source = LIGHT_MAX-7,
description = "Blinky Plant", description = "Blinky Plant",
after_dig_node = function(pos) after_dig_node = function(pos)
mesecon:receptor_off(pos) mesecon:receptor_off(pos)
end end,
selection_box = {
type = "fixed",
fixed = {-0.1, -0.5, -0.1, 0.1, -0.5+0.6, 0.1},
},
}) })
minetest.register_craft({ minetest.register_craft({

View File

@ -32,7 +32,7 @@ minetest.register_node("mesecons_button:button_on", {
type = "fixed", type = "fixed",
fixed = {-0.2, -0.15, 0.4, 0.2, 0.15, 0.5}, fixed = {-0.2, -0.15, 0.4, 0.2, 0.15, 0.5},
}, },
groups = {dig_immediate=2}, groups = {dig_immediate=2, not_in_creative_inventory=1},
drop = 'mesecons_button:button_off', drop = 'mesecons_button:button_off',
description = "Button", description = "Button",
after_dig_node = function(pos, oldnode) after_dig_node = function(pos, oldnode)

View File

@ -35,7 +35,7 @@ minetest.register_node("mesecons_delayer:delayer_off_2", {
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5}, fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
}, },
groups = {bendy=2,snappy=1,dig_immediate=2}, groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1},
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sunlight_propagates = true, sunlight_propagates = true,
@ -57,7 +57,7 @@ minetest.register_node("mesecons_delayer:delayer_off_3", {
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5}, fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
}, },
groups = {bendy=2,snappy=1,dig_immediate=2}, groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1},
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sunlight_propagates = true, sunlight_propagates = true,
@ -79,7 +79,7 @@ minetest.register_node("mesecons_delayer:delayer_off_4", {
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5}, fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
}, },
groups = {bendy=2,snappy=1,dig_immediate=2}, groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1},
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sunlight_propagates = true, sunlight_propagates = true,
@ -87,10 +87,6 @@ minetest.register_node("mesecons_delayer:delayer_off_4", {
drop = 'mesecons_delayer:delayer_off_1', drop = 'mesecons_delayer:delayer_off_1',
}) })
minetest.register_node("mesecons_delayer:delayer_on_1", { minetest.register_node("mesecons_delayer:delayer_on_1", {
description = "Delayer", description = "Delayer",
drawtype = "nodebox", drawtype = "nodebox",
@ -105,7 +101,7 @@ minetest.register_node("mesecons_delayer:delayer_on_1", {
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5}, fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
}, },
groups = {bendy=2,snappy=1,dig_immediate=2}, groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1},
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sunlight_propagates = true, sunlight_propagates = true,
@ -127,7 +123,7 @@ minetest.register_node("mesecons_delayer:delayer_on_2", {
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5}, fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
}, },
groups = {bendy=2,snappy=1,dig_immediate=2}, groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1},
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sunlight_propagates = true, sunlight_propagates = true,
@ -149,7 +145,7 @@ minetest.register_node("mesecons_delayer:delayer_on_3", {
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5}, fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
}, },
groups = {bendy=2,snappy=1,dig_immediate=2}, groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1},
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sunlight_propagates = true, sunlight_propagates = true,
@ -171,7 +167,7 @@ minetest.register_node("mesecons_delayer:delayer_on_4", {
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5}, fixed = {-0.5, -0.5, -0.5, 0.5, -0.35, 0.5},
}, },
groups = {bendy=2,snappy=1,dig_immediate=2}, groups = {bendy=2,snappy=1,dig_immediate=2,not_in_creative_inventory=1},
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sunlight_propagates = true, sunlight_propagates = true,

View File

@ -11,7 +11,7 @@ minetest.register_node("mesecons_detector:object_detector_on", {
tile_images = {"default_steel_block.png", "default_steel_block.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png"}, tile_images = {"default_steel_block.png", "default_steel_block.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png"},
paramtype = "light", paramtype = "light",
walkable = true, walkable = true,
groups = {cracky=3}, groups = {cracky=3,not_in_creative_inventory=1},
drop = 'mesecons_detector:object_detector_off', drop = 'mesecons_detector:object_detector_off',
description="Player Detector", description="Player Detector",
after_dig_node = function(pos) after_dig_node = function(pos)

View File

@ -26,8 +26,8 @@ minetest.register_node("mesecons_hydroturbine:hydro_turbine_on", {
drawtype = "nodebox", drawtype = "nodebox",
tile_images = {"jeija_hydro_turbine_on.png"}, tile_images = {"jeija_hydro_turbine_on.png"},
drop = '"mesecons_hydroturbine:hydro_turbine_off" 1', drop = '"mesecons_hydroturbine:hydro_turbine_off" 1',
groups = {dig_immediate=2}, groups = {dig_immediate=2,not_in_creative_inventory=1},
description="Water Turbine", description="Water Turbine",
paramtype = "light", paramtype = "light",
selection_box = { selection_box = {
type = "fixed", type = "fixed",

View File

@ -14,7 +14,7 @@ minetest.register_node("mesecons_lamp:lamp_on", {
--type = "fixed", --type = "fixed",
fixed = {-0.38, -0.5, -0.1, 0.38, -0.2, 0.1}, fixed = {-0.38, -0.5, -0.1, 0.38, -0.2, 0.1},
}, },
groups = {dig_immediate=3}, groups = {dig_immediate=3,not_in_creative_inventory=1},
drop='"mesecons_lamp:lamp_off" 1', drop='"mesecons_lamp:lamp_off" 1',
}) })

View File

@ -8,7 +8,7 @@ function mesecon:lightstone_add(name, base_item, texture_off, texture_on)
minetest.register_node("mesecons_lightstone:lightstone_" .. name .. "_on", { minetest.register_node("mesecons_lightstone:lightstone_" .. name .. "_on", {
tile_images = {texture_on}, tile_images = {texture_on},
inventory_image = minetest.inventorycube(texture_on), inventory_image = minetest.inventorycube(texture_on),
groups = {cracky=2}, groups = {cracky=2,not_in_creative_inventory=1},
drop = "node mesecons_lightstone:lightstone_" .. name .. "_off 1", drop = "node mesecons_lightstone:lightstone_" .. name .. "_off 1",
light_source = LIGHT_MAX-2, light_source = LIGHT_MAX-2,
description=name.." Lightstone", description=name.." Lightstone",

View File

@ -1,4 +1,4 @@
-- The POWER_PLANT -- The POWER_PLANT
minetest.register_node("mesecons_powerplant:power_plant", { minetest.register_node("mesecons_powerplant:power_plant", {
drawtype = "plantlike", drawtype = "plantlike",
@ -7,7 +7,7 @@ minetest.register_node("mesecons_powerplant:power_plant", {
inventory_image = "jeija_power_plant.png", inventory_image = "jeija_power_plant.png",
paramtype = "light", paramtype = "light",
walkable = false, walkable = false,
groups = {snappy=3}, groups = {dig_immediate=3},
light_source = LIGHT_MAX-9, light_source = LIGHT_MAX-9,
description="Power Plant", description="Power Plant",
after_place_node = function(pos) after_place_node = function(pos)
@ -15,7 +15,11 @@ minetest.register_node("mesecons_powerplant:power_plant", {
end, end,
after_dig_node = function(pos) after_dig_node = function(pos)
mesecon:receptor_off(pos) mesecon:receptor_off(pos)
end end,
selection_box = {
type = "fixed",
fixed = {-0.1, -0.5, -0.1, 0.1, -0.5+0.6, 0.1},
},
}) })
minetest.register_craft({ minetest.register_craft({

View File

@ -34,7 +34,7 @@ minetest.register_node("mesecons_pressureplates:pressure_plate_wood_on", {
type = "fixed", type = "fixed",
fixed = {-0.45, -0.5, -0.45, 0.45, -0.48, 0.45}, fixed = {-0.45, -0.5, -0.45, 0.45, -0.48, 0.45},
}, },
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
drop='"mesecons_pressureplates:pressure_plate_wood_off" 1', drop='"mesecons_pressureplates:pressure_plate_wood_off" 1',
after_dig_node = function(pos) after_dig_node = function(pos)
mesecon:receptor_off(pos, mesecon:get_rules("pressureplate")) mesecon:receptor_off(pos, mesecon:get_rules("pressureplate"))
@ -116,7 +116,7 @@ minetest.register_node("mesecons_pressureplates:pressure_plate_stone_on", {
type = "fixed", type = "fixed",
fixed = {-0.45, -0.5, -0.45, 0.45, -0.48, 0.45}, fixed = {-0.45, -0.5, -0.45, 0.45, -0.48, 0.45},
}, },
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
drop='"mesecons_pressureplates:pressure_plate_stone_off" 1', drop='"mesecons_pressureplates:pressure_plate_stone_off" 1',
after_dig_node = function(pos) after_dig_node = function(pos)
mesecon:receptor_off(pos, mesecon:get_rules("pressureplate")) mesecon:receptor_off(pos, mesecon:get_rules("pressureplate"))

View File

@ -5,7 +5,7 @@ minetest.register_node("mesecons_random:removestone", {
inventory_image = minetest.inventorycube("jeija_removestone_inv.png"), inventory_image = minetest.inventorycube("jeija_removestone_inv.png"),
material = minetest.digprop_stonelike(1.0), material = minetest.digprop_stonelike(1.0),
groups = {cracky=3}, groups = {cracky=3},
description="Removestone", description="Removestone",
}) })
minetest.register_craft({ minetest.register_craft({

View File

@ -10,9 +10,9 @@ minetest.register_node("mesecons_switch:mesecon_switch_off", {
minetest.register_node("mesecons_switch:mesecon_switch_on", { minetest.register_node("mesecons_switch:mesecon_switch_on", {
tile_images = {"jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_on.png"}, tile_images = {"jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_on.png"},
paramtype2="facedir", paramtype2="facedir",
groups = {dig_immediate=2}, groups = {dig_immediate=2,not_in_creative_inventory=1},
drop='"mesecons_switch:mesecon_switch_off" 1', drop='"mesecons_switch:mesecon_switch_off" 1',
description="Switch", description="Switch",
after_dig_node = function(pos) after_dig_node = function(pos)
mesecon:receptor_off(pos) mesecon:receptor_off(pos)
end end

View File

@ -156,7 +156,7 @@ minetest.register_node("mesecons_temperest:mesecon_socket_on", {
paramtype = "light", paramtype = "light",
is_ground_content = true, is_ground_content = true,
tile_images = {"jeija_mesecon_socket_on.png"}, tile_images = {"jeija_mesecon_socket_on.png"},
groups = {dig_immediate=2}, groups = {dig_immediate=2,not_in_creative_inventory=1},
walkable = false, walkable = false,
selection_box = { selection_box = {
type = "fixed", type = "fixed",
@ -191,7 +191,7 @@ if ENABLE_TEMPEREST then
paramtype = "light", paramtype = "light",
is_ground_content = true, is_ground_content = true,
tile_images = {"jeija_mesecon_inverter_off.png"}, tile_images = {"jeija_mesecon_inverter_off.png"},
groups = {dig_immediate=2}, groups = {dig_immediate=2,not_in_creative_inventory=1},
walkable = false, walkable = false,
selection_box = { selection_box = {
type = "fixed", type = "fixed",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 201 B

After

Width:  |  Height:  |  Size: 207 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 B

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 227 B

After

Width:  |  Height:  |  Size: 229 B

View File

@ -31,7 +31,7 @@ minetest.register_node("mesecons_torch:mesecon_torch_on", {
walkable = false, walkable = false,
paramtype2 = "wallmounted", paramtype2 = "wallmounted",
legacy_wallmounted = true, legacy_wallmounted = true,
groups = {dig_immediate=2}, groups = {dig_immediate=2,not_in_creative_inventory=1},
light_source = LIGHT_MAX-5, light_source = LIGHT_MAX-5,
description="Mesecon Torch", description="Mesecon Torch",
after_place_node = function(pos) after_place_node = function(pos)

View File

@ -25,7 +25,7 @@ minetest.register_node("mesecons_walllever:wall_lever_on", {
selection_box = { selection_box = {
type = "wallmounted", type = "wallmounted",
}, },
groups = {dig_immediate=2}, groups = {dig_immediate=2,not_in_creative_inventory=1},
drop = '"mesecons_walllever:wall_lever_off" 1', drop = '"mesecons_walllever:wall_lever_off" 1',
description="Lever", description="Lever",
after_dig_node = function(pos, oldnode) after_dig_node = function(pos, oldnode)