summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeija <norrepli@googlemail.com>2012-08-01 07:45:07 -0700
committerJeija <norrepli@googlemail.com>2012-08-01 07:45:07 -0700
commit150da24db6947306ae09340bb80249f922a84af8 (patch)
treed673343390b9ce57f333104df69081e343314c5d
parent7568182f4ae2a3cb4ede1c1f81fd26ae9252b841 (diff)
parent20d1b9dd524931204e8a69eefaf60a534247acf9 (diff)
downloadmesecons-150da24db6947306ae09340bb80249f922a84af8.tar
mesecons-150da24db6947306ae09340bb80249f922a84af8.tar.gz
mesecons-150da24db6947306ae09340bb80249f922a84af8.tar.bz2
mesecons-150da24db6947306ae09340bb80249f922a84af8.tar.xz
mesecons-150da24db6947306ae09340bb80249f922a84af8.zip
Merge pull request #6 from Kotolegokot/master
Some modifications and fixed.
-rw-r--r--mesecons/init.lua2
-rw-r--r--mesecons_battery/init.lua10
-rw-r--r--mesecons_blinkyplant/init.lua14
-rw-r--r--mesecons_button/init.lua2
-rw-r--r--mesecons_delayer/init.lua18
-rw-r--r--mesecons_detector/init.lua2
-rw-r--r--mesecons_hydroturbine/init.lua4
-rw-r--r--mesecons_lamp/init.lua2
-rw-r--r--mesecons_lightstone/init.lua2
-rw-r--r--mesecons_powerplant/init.lua10
-rw-r--r--mesecons_pressureplates/init.lua4
-rw-r--r--mesecons_random/init.lua2
-rw-r--r--mesecons_switch/init.lua4
-rw-r--r--mesecons_temperest/init.lua4
-rw-r--r--mesecons_textures/textures/jeija_blinky_plant_off.pngbin201 -> 207 bytes
-rw-r--r--mesecons_textures/textures/jeija_blinky_plant_on.pngbin209 -> 214 bytes
-rw-r--r--mesecons_textures/textures/jeija_power_plant.pngbin227 -> 229 bytes
-rw-r--r--mesecons_torch/init.lua2
-rw-r--r--mesecons_walllever/init.lua2
19 files changed, 46 insertions, 38 deletions
diff --git a/mesecons/init.lua b/mesecons/init.lua
index a6b9d9a..b67e88a 100644
--- a/mesecons/init.lua
+++ b/mesecons/init.lua
@@ -126,7 +126,7 @@ minetest.register_node("mesecons:mesecon_on", {
type = "fixed",
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',
light_source = LIGHT_MAX-11,
})
diff --git a/mesecons_battery/init.lua b/mesecons_battery/init.lua
index b7a5ed6..f87ca6d 100644
--- a/mesecons_battery/init.lua
+++ b/mesecons_battery/init.lua
@@ -9,9 +9,9 @@ for i = 1, 5 do
type = "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.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.4, 0.499, 0.499, 0.499 },
{-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",
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.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.4, 0.499, 0.499, 0.499 },
{-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",
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",
})
mesecon:add_receptor_node("mesecons_battery:battery_discharging_"..i)
diff --git a/mesecons_blinkyplant/init.lua b/mesecons_blinkyplant/init.lua
index 3e6adc2..105a4db 100644
--- a/mesecons_blinkyplant/init.lua
+++ b/mesecons_blinkyplant/init.lua
@@ -7,8 +7,12 @@ minetest.register_node("mesecons_blinkyplant:blinky_plant_off", {
inventory_image = "jeija_blinky_plant_off.png",
paramtype = "light",
walkable = false,
- groups = {snappy=2},
+ groups = {dig_immediate=3},
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", {
@@ -18,13 +22,17 @@ minetest.register_node("mesecons_blinkyplant:blinky_plant_on", {
inventory_image = "jeija_blinky_plant_off.png",
paramtype = "light",
walkable = false,
- groups = {snappy=2},
+ groups = {dig_immediate=3, not_in_creative_inventory=1},
drop='"mesecons_blinkyplant:blinky_plant_off" 1',
light_source = LIGHT_MAX-7,
description = "Blinky Plant",
after_dig_node = function(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({
diff --git a/mesecons_button/init.lua b/mesecons_button/init.lua
index fbf7c0f..aba1f5f 100644
--- a/mesecons_button/init.lua
+++ b/mesecons_button/init.lua
@@ -32,7 +32,7 @@ minetest.register_node("mesecons_button:button_on", {
type = "fixed",
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',
description = "Button",
after_dig_node = function(pos, oldnode)
diff --git a/mesecons_delayer/init.lua b/mesecons_delayer/init.lua
index 1a0da70..03d73c2 100644
--- a/mesecons_delayer/init.lua
+++ b/mesecons_delayer/init.lua
@@ -35,7 +35,7 @@ minetest.register_node("mesecons_delayer:delayer_off_2", {
type = "fixed",
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",
paramtype2 = "facedir",
sunlight_propagates = true,
@@ -57,7 +57,7 @@ minetest.register_node("mesecons_delayer:delayer_off_3", {
type = "fixed",
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",
paramtype2 = "facedir",
sunlight_propagates = true,
@@ -79,7 +79,7 @@ minetest.register_node("mesecons_delayer:delayer_off_4", {
type = "fixed",
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",
paramtype2 = "facedir",
sunlight_propagates = true,
@@ -87,10 +87,6 @@ minetest.register_node("mesecons_delayer:delayer_off_4", {
drop = 'mesecons_delayer:delayer_off_1',
})
-
-
-
-
minetest.register_node("mesecons_delayer:delayer_on_1", {
description = "Delayer",
drawtype = "nodebox",
@@ -105,7 +101,7 @@ minetest.register_node("mesecons_delayer:delayer_on_1", {
type = "fixed",
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",
paramtype2 = "facedir",
sunlight_propagates = true,
@@ -127,7 +123,7 @@ minetest.register_node("mesecons_delayer:delayer_on_2", {
type = "fixed",
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",
paramtype2 = "facedir",
sunlight_propagates = true,
@@ -149,7 +145,7 @@ minetest.register_node("mesecons_delayer:delayer_on_3", {
type = "fixed",
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",
paramtype2 = "facedir",
sunlight_propagates = true,
@@ -171,7 +167,7 @@ minetest.register_node("mesecons_delayer:delayer_on_4", {
type = "fixed",
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",
paramtype2 = "facedir",
sunlight_propagates = true,
diff --git a/mesecons_detector/init.lua b/mesecons_detector/init.lua
index b429557..5f4d212 100644
--- a/mesecons_detector/init.lua
+++ b/mesecons_detector/init.lua
@@ -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"},
paramtype = "light",
walkable = true,
- groups = {cracky=3},
+ groups = {cracky=3,not_in_creative_inventory=1},
drop = 'mesecons_detector:object_detector_off',
description="Player Detector",
after_dig_node = function(pos)
diff --git a/mesecons_hydroturbine/init.lua b/mesecons_hydroturbine/init.lua
index 2f49f5c..6be3007 100644
--- a/mesecons_hydroturbine/init.lua
+++ b/mesecons_hydroturbine/init.lua
@@ -26,8 +26,8 @@ minetest.register_node("mesecons_hydroturbine:hydro_turbine_on", {
drawtype = "nodebox",
tile_images = {"jeija_hydro_turbine_on.png"},
drop = '"mesecons_hydroturbine:hydro_turbine_off" 1',
- groups = {dig_immediate=2},
- description="Water Turbine",
+ groups = {dig_immediate=2,not_in_creative_inventory=1},
+ description="Water Turbine",
paramtype = "light",
selection_box = {
type = "fixed",
diff --git a/mesecons_lamp/init.lua b/mesecons_lamp/init.lua
index fdee6fa..fcceeed 100644
--- a/mesecons_lamp/init.lua
+++ b/mesecons_lamp/init.lua
@@ -14,7 +14,7 @@ minetest.register_node("mesecons_lamp:lamp_on", {
--type = "fixed",
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',
})
diff --git a/mesecons_lightstone/init.lua b/mesecons_lightstone/init.lua
index 863405b..de1a9d0 100644
--- a/mesecons_lightstone/init.lua
+++ b/mesecons_lightstone/init.lua
@@ -8,7 +8,7 @@ function mesecon:lightstone_add(name, base_item, texture_off, texture_on)
minetest.register_node("mesecons_lightstone:lightstone_" .. name .. "_on", {
tile_images = {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",
light_source = LIGHT_MAX-2,
description=name.." Lightstone",
diff --git a/mesecons_powerplant/init.lua b/mesecons_powerplant/init.lua
index b7e4cde..6e3f263 100644
--- a/mesecons_powerplant/init.lua
+++ b/mesecons_powerplant/init.lua
@@ -1,4 +1,4 @@
--- The POWER_PLANT
+ -- The POWER_PLANT
minetest.register_node("mesecons_powerplant:power_plant", {
drawtype = "plantlike",
@@ -7,7 +7,7 @@ minetest.register_node("mesecons_powerplant:power_plant", {
inventory_image = "jeija_power_plant.png",
paramtype = "light",
walkable = false,
- groups = {snappy=3},
+ groups = {dig_immediate=3},
light_source = LIGHT_MAX-9,
description="Power Plant",
after_place_node = function(pos)
@@ -15,7 +15,11 @@ minetest.register_node("mesecons_powerplant:power_plant", {
end,
after_dig_node = function(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({
diff --git a/mesecons_pressureplates/init.lua b/mesecons_pressureplates/init.lua
index dc09981..ae213c6 100644
--- a/mesecons_pressureplates/init.lua
+++ b/mesecons_pressureplates/init.lua
@@ -34,7 +34,7 @@ minetest.register_node("mesecons_pressureplates:pressure_plate_wood_on", {
type = "fixed",
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',
after_dig_node = function(pos)
mesecon:receptor_off(pos, mesecon:get_rules("pressureplate"))
@@ -116,7 +116,7 @@ minetest.register_node("mesecons_pressureplates:pressure_plate_stone_on", {
type = "fixed",
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',
after_dig_node = function(pos)
mesecon:receptor_off(pos, mesecon:get_rules("pressureplate"))
diff --git a/mesecons_random/init.lua b/mesecons_random/init.lua
index 2ef3af1..ef4b419 100644
--- a/mesecons_random/init.lua
+++ b/mesecons_random/init.lua
@@ -5,7 +5,7 @@ minetest.register_node("mesecons_random:removestone", {
inventory_image = minetest.inventorycube("jeija_removestone_inv.png"),
material = minetest.digprop_stonelike(1.0),
groups = {cracky=3},
- description="Removestone",
+ description="Removestone",
})
minetest.register_craft({
diff --git a/mesecons_switch/init.lua b/mesecons_switch/init.lua
index b61dd8c..a531459 100644
--- a/mesecons_switch/init.lua
+++ b/mesecons_switch/init.lua
@@ -10,9 +10,9 @@ minetest.register_node("mesecons_switch:mesecon_switch_off", {
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"},
paramtype2="facedir",
- groups = {dig_immediate=2},
+ groups = {dig_immediate=2,not_in_creative_inventory=1},
drop='"mesecons_switch:mesecon_switch_off" 1',
- description="Switch",
+ description="Switch",
after_dig_node = function(pos)
mesecon:receptor_off(pos)
end
diff --git a/mesecons_temperest/init.lua b/mesecons_temperest/init.lua
index 5779f2b..bacc5f9 100644
--- a/mesecons_temperest/init.lua
+++ b/mesecons_temperest/init.lua
@@ -156,7 +156,7 @@ minetest.register_node("mesecons_temperest:mesecon_socket_on", {
paramtype = "light",
is_ground_content = true,
tile_images = {"jeija_mesecon_socket_on.png"},
- groups = {dig_immediate=2},
+ groups = {dig_immediate=2,not_in_creative_inventory=1},
walkable = false,
selection_box = {
type = "fixed",
@@ -191,7 +191,7 @@ if ENABLE_TEMPEREST then
paramtype = "light",
is_ground_content = true,
tile_images = {"jeija_mesecon_inverter_off.png"},
- groups = {dig_immediate=2},
+ groups = {dig_immediate=2,not_in_creative_inventory=1},
walkable = false,
selection_box = {
type = "fixed",
diff --git a/mesecons_textures/textures/jeija_blinky_plant_off.png b/mesecons_textures/textures/jeija_blinky_plant_off.png
index 4c545f8..8ee9dbe 100644
--- a/mesecons_textures/textures/jeija_blinky_plant_off.png
+++ b/mesecons_textures/textures/jeija_blinky_plant_off.png
Binary files differ
diff --git a/mesecons_textures/textures/jeija_blinky_plant_on.png b/mesecons_textures/textures/jeija_blinky_plant_on.png
index 89acfa3..b4fc16c 100644
--- a/mesecons_textures/textures/jeija_blinky_plant_on.png
+++ b/mesecons_textures/textures/jeija_blinky_plant_on.png
Binary files differ
diff --git a/mesecons_textures/textures/jeija_power_plant.png b/mesecons_textures/textures/jeija_power_plant.png
index 0c92dd0..6528f57 100644
--- a/mesecons_textures/textures/jeija_power_plant.png
+++ b/mesecons_textures/textures/jeija_power_plant.png
Binary files differ
diff --git a/mesecons_torch/init.lua b/mesecons_torch/init.lua
index f37ca31..9e03233 100644
--- a/mesecons_torch/init.lua
+++ b/mesecons_torch/init.lua
@@ -31,7 +31,7 @@ minetest.register_node("mesecons_torch:mesecon_torch_on", {
walkable = false,
paramtype2 = "wallmounted",
legacy_wallmounted = true,
- groups = {dig_immediate=2},
+ groups = {dig_immediate=2,not_in_creative_inventory=1},
light_source = LIGHT_MAX-5,
description="Mesecon Torch",
after_place_node = function(pos)
diff --git a/mesecons_walllever/init.lua b/mesecons_walllever/init.lua
index 4f27a00..144c734 100644
--- a/mesecons_walllever/init.lua
+++ b/mesecons_walllever/init.lua
@@ -25,7 +25,7 @@ minetest.register_node("mesecons_walllever:wall_lever_on", {
selection_box = {
type = "wallmounted",
},
- groups = {dig_immediate=2},
+ groups = {dig_immediate=2,not_in_creative_inventory=1},
drop = '"mesecons_walllever:wall_lever_off" 1',
description="Lever",
after_dig_node = function(pos, oldnode)