Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
Anthony Zhang 2013-04-27 16:52:17 -04:00
commit 163384f308
15 changed files with 19 additions and 17 deletions

2
README

@ -14,7 +14,7 @@ Jordach: Sounds for the noteblock
minerd247: Some textures minerd247: Some textures
...other contributors ...other contributors
This is a mod for minetest-c55. This is a mod for minetest.
Copy the minetest-mod-mesecons directory into you game's mod folder Copy the minetest-mod-mesecons directory into you game's mod folder
(e.g. games/minetest_game/mods/minetest-mod-mesecons) (e.g. games/minetest_game/mods/minetest-mod-mesecons)

@ -117,7 +117,7 @@ minetest.register_node("mesecons_extrawires:vertical_off", {
minetest.register_node("mesecons_extrawires:vertical_top_on", { minetest.register_node("mesecons_extrawires:vertical_top_on", {
description = "Vertical mesecon", description = "Vertical mesecon",
drawtype = "nodebox", drawtype = "nodebox",
tiles = {"wires_full_on.png"}, tiles = {"wires_full_on.png","wires_full_on.png","wires_vertical_on.png"},
walkable = false, walkable = false,
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
@ -139,7 +139,7 @@ minetest.register_node("mesecons_extrawires:vertical_top_on", {
minetest.register_node("mesecons_extrawires:vertical_top_off", { minetest.register_node("mesecons_extrawires:vertical_top_off", {
description = "Vertical mesecon", description = "Vertical mesecon",
drawtype = "nodebox", drawtype = "nodebox",
tiles = {"wires_full_off.png"}, tiles = {"wires_full_off.png","wires_full_off.png","wires_vertical_off.png"},
walkable = false, walkable = false,
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
@ -162,7 +162,7 @@ minetest.register_node("mesecons_extrawires:vertical_top_off", {
minetest.register_node("mesecons_extrawires:vertical_bottom_on", { minetest.register_node("mesecons_extrawires:vertical_bottom_on", {
description = "Vertical mesecon", description = "Vertical mesecon",
drawtype = "nodebox", drawtype = "nodebox",
tiles = {"wires_full_on.png"}, tiles = {"wires_full_on.png","wires_full_on.png","wires_vertical_on.png"},
walkable = false, walkable = false,
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
@ -183,7 +183,7 @@ minetest.register_node("mesecons_extrawires:vertical_bottom_on", {
minetest.register_node("mesecons_extrawires:vertical_bottom_off", { minetest.register_node("mesecons_extrawires:vertical_bottom_off", {
description = "Vertical mesecon", description = "Vertical mesecon",
drawtype = "nodebox", drawtype = "nodebox",
tiles = {"wires_full_off.png"}, tiles = {"wires_full_off.png","wires_full_off.png","wires_vertical_off.png"},
walkable = false, walkable = false,
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,

@ -5,7 +5,7 @@ local pp_box_off = {
local pp_box_on = { local pp_box_on = {
type = "fixed", type = "fixed",
fixed = { -7/16, -8/16, -7/16, 7/16, -7/16, 7/16 }, fixed = { -7/16, -8/16, -7/16, 7/16, -7.5/16, 7/16 },
} }
pp_on_timer = function (pos, elapsed) pp_on_timer = function (pos, elapsed)
@ -49,7 +49,7 @@ end
-- image: inventory and wield image of the pressure plate -- image: inventory and wield image of the pressure plate
-- recipe: crafting recipe of the pressure plate -- recipe: crafting recipe of the pressure plate
function mesecon:register_pressure_plate(offstate, onstate, description, texture_off, texture_on, image, recipe) function mesecon:register_pressure_plate(offstate, onstate, description, textures_off, textures_on, image_w, image_i, recipe)
local ppspec = { local ppspec = {
offstate = offstate, offstate = offstate,
onstate = onstate onstate = onstate
@ -57,9 +57,9 @@ function mesecon:register_pressure_plate(offstate, onstate, description, texture
minetest.register_node(offstate, { minetest.register_node(offstate, {
drawtype = "nodebox", drawtype = "nodebox",
tiles = {texture_off}, tiles = textures_off,
inventory_image = texture_off, inventory_image = image_i,
wield_image = image, wield_image = image_w,
paramtype = "light", paramtype = "light",
selection_box = pp_box_off, selection_box = pp_box_off,
node_box = pp_box_off, node_box = pp_box_off,
@ -77,7 +77,7 @@ function mesecon:register_pressure_plate(offstate, onstate, description, texture
minetest.register_node(onstate, { minetest.register_node(onstate, {
drawtype = "nodebox", drawtype = "nodebox",
tiles = {texture_on}, tiles = textures_on,
paramtype = "light", paramtype = "light",
selection_box = pp_box_on, selection_box = pp_box_on,
node_box = pp_box_on, node_box = pp_box_on,
@ -110,16 +110,18 @@ mesecon:register_pressure_plate(
"mesecons_pressureplates:pressure_plate_wood_off", "mesecons_pressureplates:pressure_plate_wood_off",
"mesecons_pressureplates:pressure_plate_wood_on", "mesecons_pressureplates:pressure_plate_wood_on",
"Wooden Pressure Plate", "Wooden Pressure Plate",
"jeija_pressure_plate_wood_off.png", {"jeija_pressure_plate_wood_off.png","jeija_pressure_plate_wood_off.png","jeija_pressure_plate_wood_off_edges.png"},
"jeija_pressure_plate_wood_on.png", {"jeija_pressure_plate_wood_on.png","jeija_pressure_plate_wood_on.png","jeija_pressure_plate_wood_on_edges.png"},
"jeija_pressure_plate_wood_off.png", "jeija_pressure_plate_wood_wield.png",
"jeija_pressure_plate_wood_inv.png",
{{"default:wood", "default:wood"}}) {{"default:wood", "default:wood"}})
mesecon:register_pressure_plate( mesecon:register_pressure_plate(
"mesecons_pressureplates:pressure_plate_stone_off", "mesecons_pressureplates:pressure_plate_stone_off",
"mesecons_pressureplates:pressure_plate_stone_on", "mesecons_pressureplates:pressure_plate_stone_on",
"Stone Pressure Plate", "Stone Pressure Plate",
"jeija_pressure_plate_stone_off.png", {"jeija_pressure_plate_stone_off.png","jeija_pressure_plate_stone_off.png","jeija_pressure_plate_stone_off_edges.png"},
"jeija_pressure_plate_stone_on.png", {"jeija_pressure_plate_stone_on.png","jeija_pressure_plate_stone_on.png","jeija_pressure_plate_stone_on_edges.png"},
"jeija_pressure_plate_stone_off.png", "jeija_pressure_plate_stone_wield.png",
"jeija_pressure_plate_stone_inv.png",
{{"default:cobble", "default:cobble"}}) {{"default:cobble", "default:cobble"}})

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 648 B

After

Width:  |  Height:  |  Size: 555 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 292 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 680 B

After

Width:  |  Height:  |  Size: 579 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 716 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 750 B

After

Width:  |  Height:  |  Size: 663 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 295 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 772 B

After

Width:  |  Height:  |  Size: 675 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 716 B