Add files via upload

master
Gerold55 2019-02-24 02:56:05 -05:00 committed by GitHub
parent bf042c69c6
commit 956e35a76c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 314 additions and 211 deletions

View File

@ -10,7 +10,7 @@ minetest.register_craft({
minetest.register_craft({
output = 'ma_pops_furniture:ceiling_lamp',
recipe = {
{'default:stone', 'default:stone', 'default:stone'},
{'', 'default:stone', ''},
{'default:stone', 'default:meselamp', 'default:stone'},
{'default:stone', 'default:meselamp', 'default:stone'}
}
@ -176,24 +176,34 @@ minetest.register_craft({
{'','default:glass','',},
}
})
minetest.register_craft({
output = 'ma_pops_furniture:coffee_cup',
recipe = {
{'default:glass','','default:glass',},
{'default:glass','','default:glass',},
{'default:glass','default:glass','default:glass',},
}
})
--added craft
minetest.register_craft({
output = 'ma_pops_furniture:toaster',
recipe = {
{'','','',},
{'default:steel_ingot','default:mese_crystal','default:steel_ingot',},
{'default:steel_ingot','default:furnace','default:steel_ingot',},
{'default:steel_ingot','default:steel_ingot','default:steel_ingot',},
}
})
--added craft
minetest.register_craft({
output = 'ma_pops_furniture:sink',
output = 'ma_pops_furniture:trash_can',
recipe = {
{'default:steel_ingot','bucket:bucket_water','default:steel_ingot',},
{'','default:steel_ingot','',},
{'','default:steel_ingot','',},
{'default:steel_ingot','default:steel_ingot','default:steel_ingot',},
{'default:steel_ingot','bucket:bucket_lava','default:steel_ingot',},
{'default:steel_ingot','default:steel_ingot','default:steel_ingot',},
}
})
--added craft
minetest.register_craft({
output = 'ma_pops_furniture:kitchen_faucet',
@ -212,42 +222,85 @@ minetest.register_craft({
{'default:wood','default:wood','',},
}
})
--added craft
local counter_table = { --name, color, colorize(hex or color name:intensity(1-255))
{'Black', 'black', 'black:225'},
{'Blue', 'blue', 'blue:150'},
{'Brown', 'brown', 'brown:100'},
{'Cyan', 'cyan', 'cyan:150'},
{'Dark Green', 'dark_green', 'green:200'},
--{'Dark Grey', 'dark_grey', 'black:200'},
{'Green', 'green', '#32cd32:150'},
--{'Grey', 'grey', 'black:150'},
{'Magenta', 'magenta', 'magenta:200'},
{'Orange', 'orange', 'orange:150'},
{'Pink', 'pink', 'pink:150'},
{'Red', 'red', 'red:150'},
{'Violet', 'violet', 'violet:150'},
{'White', 'white', 'white:150'},
{'Yellow', 'yellow', 'yellow:150'},
}
for i in ipairs (counter_table) do
local name = counter_table[i][1]
local color = counter_table[i][2]
local hex = counter_table[i][3]
minetest.register_craft({
output = 'ma_pops_furniture:counter',
output = 'ma_pops_furniture:counter_'..color,
recipe = {
{'group:wood','group:wood','group:wood',},
{'group:wood','','group:wood',},
{'group:wood','dye:'..color,'group:wood',},
{'group:wood','group:wood','group:wood',},
}
})
--added craft
minetest.register_craft({
output = 'ma_pops_furniture:counter1',
recipe = {
{'group:wood','group:wood','group:wood',},
{'group:wood','group:wood','group:wood',},
{'group:wood','group:wood','group:wood',},
}
type = "shapeless",
output = 'ma_pops_furniture:counter1_'..color,
recipe =
{'ma_pops_furniture:counter'}
})
--added craft
minetest.register_craft({
type = "shapeless",
output = 'ma_pops_furniture:counter2_'..color,
recipe =
{'ma_pops_furniture:counter1_'..color}
})
minetest.register_craft({
type = "shapeless",
output = 'ma_pops_furniture:counter3_'..color,
recipe =
{'ma_pops_furniture:counter2_'..color}
})
minetest.register_craft({
output = 'ma_pops_furniture:upcabinet',
recipe = {
{'group:wood','group:wood','group:wood',},
{'group:wood','dye:'..color,'group:wood',},
{'group:wood','default:chest','group:wood',},
{'default:stone','group:wood','default:stone',},
{'group:wood','group:wood','group:wood',},
}
})
--added craft
minetest.register_craft({
output = 'ma_pops_furniture:upcabinet_corner',
recipe = {
{'group:wood','group:wood','group:wood',},
{'group:wood','group:wood','default:chest',},
{'group:wood','default:stone','default:stone',},
{'group:wood','dye:'..color,'',},
}
})
minetest.register_craft({
output = 'ma_pops_furniture:sink_'..color,
recipe = {
{'ma_pops_furniture:br_sink','ma_pops_furniture:counter_'..color,},
}
})
end
--added craft
minetest.register_craft({
output = 'ma_pops_furniture:fridge',
@ -449,6 +502,27 @@ minetest.register_craft({
{'wool:'..color, 'wool:'..color, 'wool:'..color, },
}
})
end
local sofa_table = { --color
{'black'},
{'blue'},
{'brown'},
{'cyan'},
{'dark_green'},
{'dark_grey'},
{'green'},
{'grey'},
{'magenta'},
{'orange'},
{'pink'},
{'red'},
{'violet'},
{'yellow'},
}
for i in ipairs (sofa_table) do
local color = sofa_table[i][1]
minetest.register_craft({
output = 'ma_pops_furniture:sofa_'..color,
@ -643,30 +717,78 @@ minetest.register_craft({
}
})
local lamp_table = { --name, color, colorize(hex or color name:intensity(1-255))
{'Black', 'black', 'black:225'},
{'Blue', 'blue', 'blue:225'},
{'Brown', 'brown', 'brown:225'},
{'Cyan', 'cyan', 'cyan:200'},
{'Dark Green', 'dark_green', 'green:225'},
{'Dark Grey', 'dark_grey', 'black:200'},
{'Green', 'green', '#32cd32:150'},
{'Grey', 'grey', 'black:100'},
{'Magenta', 'magenta', 'magenta:200'},
{'Orange', 'orange', 'orange:225'},
{'Pink', 'pink', 'pink:225'},
{'Red', 'red', 'red:225'},
{'Violet', 'violet', 'violet:225'},
{'White', 'white', 'white:1'},
{'Yellow', 'yellow', 'yellow:225'},
}
for i in ipairs (lamp_table) do
local name = lamp_table[i][1]
local color = lamp_table[i][2]
local hex = lamp_table[i][3]
minetest.register_craft({
output = 'ma_pops_furniture:lamp_off',
output = 'ma_pops_furniture:lamp_off_'..color,
recipe = {
{'wool:white','wool:white', 'wool:white'},
{'wool:white', 'default:torch', 'wool:white'},
{'wool:red', 'wool:red', 'wool:red'}
{'wool:'..color, 'wool:'..color, 'wool:'..color}
}
})
end
local curtain_table = { --name, color, colorize(hex or color name:intensity(1-255))
{'Black', 'black', 'black:225'},
{'Blue', 'blue', 'blue:225'},
{'Brown', 'brown', 'brown:225'},
{'Cyan', 'cyan', 'cyan:200'},
{'Dark Green', 'dark_green', 'green:225'},
{'Dark Grey', 'dark_grey', 'black:200'},
{'Green', 'green', '#32cd32:150'},
{'Grey', 'grey', 'black:100'},
{'Magenta', 'magenta', 'magenta:200'},
{'Orange', 'orange', 'orange:225'},
{'Pink', 'pink', 'pink:225'},
{'Red', 'red', 'red:225'},
{'Violet', 'violet', 'violet:225'},
{'White', 'white', 'white:1'},
{'Yellow', 'yellow', 'yellow:225'},
}
for i in ipairs (curtain_table) do
local name = curtain_table[i][1]
local color = curtain_table[i][2]
local hex = curtain_table[i][3]
minetest.register_craft({
output = 'ma_pops_furniture:curtains',
output = 'ma_pops_furniture:curtains_'..color,
recipe = {
{'default:acacia_tree','default:acacia_tree', 'default:acacia_tree'},
{'wool:red', '', 'wool:red'},
{'wool:red', '', 'wool:red'}
{'wool:'..color, '', 'wool:'..color},
{'wool:'..color, '', 'wool:'..color}
}
})
minetest.register_craft({
type = "shapeless",
output = 'ma_pops_furniture:curtains_2_tall',
output = 'ma_pops_furniture:curtains_2_tall_'..color,
recipe =
{'ma_pops_furniture:curtains', 'ma_pops_furniture:curtains'}
{'ma_pops_furniture:curtains_'..color, 'ma_pops_furniture:curtains_'..color}
})
end
minetest.register_craft({
output = 'ma_pops_furniture:blinds',
@ -743,7 +865,7 @@ minetest.register_craft({
output = 'ma_pops_furniture:computer',
recipe = {
{'default:stone','default:stone','default:stone',},
{'default:stone','default:mese_crystal','default:stone',},
{'default:glass','default:mese_crystal','default:stone',},
{'default:stone','default:copper_lump','default:stone',},
}
})
@ -794,9 +916,9 @@ end
minetest.register_craft({
output = 'ma_pops_furniture:birdbath',
recipe = {
{'','','',},
{'default:steel_ingot','bucket:bucket_water','default:steel_ingot',},
{'','default:steel_ingot','',},
{'default:stone','default:stone','default:stone',},
}
})
--added craft
@ -819,11 +941,10 @@ minetest.register_craft({
})
--added craft
minetest.register_craft({
type= "shapeless",
output = 'ma_pops_furniture:stone_path_1 5',
recipe = {
{'default:stone','','default:stone',},
{'','','',},
{'default:stone','','default:stone',},
{'default:stone','default:stone',},
}
})
@ -843,4 +964,4 @@ minetest.register_craft({
{'default:stick', '', 'default:steel_ingot'},
{'', 'default:stick', ''}
}
})
})

View File

@ -1,166 +1,157 @@
--microwave code by Wizzerine
--item_percent code by Noodlemire
local microwave_fs =
"size[8,7]"
.."button[6.5,1.5;1.5,2;btn_start;START]"
.."image[6.5,.2;1.5,.5;mp_mw_bar.png^[transformR270]"
.."list[current_player;main;0,3;8,1;]"
.."list[current_player;main;0,4.25;8,3;8]"
.."list[context;cook_slot;3.5,1.25;1,1;]"
.."label[3,0.5;Microwave]"
-- possibly add "fire" image?
local function get_active_microwave_fs(item_percent)
return "size[8,7]"
.."button[6.5,1.5;1.5,2;button_start;START]"
.."image[6.5,.2;1.5,.5;mp_mw_bar.png^[lowpart:"
..(item_percent)..":mp_mw_bar_on.png^[transformR270]"
.."list[current_player;main;0,3;8,1;]"
.."list[current_player;main;0,4.25;8,3;8]"
.."list[context;cook_slot;3.5,1.25;1,1;]"
.."label[3,0.5;Microwave]"
-- possibly add "fire" image?
end
--x,y;w,h
-- Adding recipe API so we don't end up hardcoding items
ma_pops_furniture.microwave = {}
local microwave = ma_pops_furniture.microwave
microwave.recipes = {}
function microwave.register_recipe(input, output) microwave.recipes[input] = output end
local function update_formspec(progress, goal, meta)
local formspec
if progress > 0 and progress <= goal then
local item_percent = math.floor(progress / goal * 100)
formspec = get_active_microwave_fs(item_percent)
else
formspec = microwave_fs
end
meta:set_string("formspec", formspec)
end
local function recalculate(pos)
local meta, timer = minetest.get_meta(pos), minetest.get_node_timer(pos)
local inv = meta:get_inventory()
local stack = inv:get_stack("cook_slot", 1)
local goal = 3 * stack:get_count()
local k = microwave.recipes[stack:get_name()]
if not k then return end
timer:stop()
update_formspec(0, goal, meta)
timer:start(1)
end
local function do_cook_all(pos)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
local stack = meta:get_inventory():get_stack("cook_slot", 1)
local food_uncooked = inv:remove_item("cook_slot", inv:get_stack("cook_slot", 1)) -- Clear the slot
local food_cooked = microwave.recipes[food_uncooked:get_name()] .. " " .. tostring(food_uncooked:get_count()) -- Get the cooked food
inv:add_item("cook_slot", food_cooked) -- Put the cooked food in the slot
end
minetest.register_node("ma_pops_furniture:microwave", {
description = "Microwave",
tiles = {"mp_mw_top.png", "mp_mw_bottom.png", "mp_mw_right.png", "mp_mw_left.png", "mp_mw_back.png", "mp_mw_front.png"},
paramtype2 = "facedir",
groups = {cracky = 2}, -- currently no pipeworks compat as I don't know how it works
sounds = default.node_sound_stone_defaults(),
drawtype = "nodebox",
node_box = {
type = "fixed",
fixed = {
{-0.4375, -0.4375, -0.3125, 0.4375, 0.0625, 0.3125},
{-0.375, -0.5, -0.25, 0.375, -0.4375, 0.25},
},
},
can_dig = function(pos, player)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
return inv:is_empty("cook_slot")
end,
on_timer = function(pos, elapsed)
local meta = minetest.get_meta(pos)
local stack = meta:get_inventory():get_stack("cook_slot", 1)
local goal = 3 * stack:get_count()
local cooking_time = meta:get_int("cooking_time") or 0
cooking_time = cooking_time + 1
update_formspec(cooking_time, goal, meta)
meta:set_int("cooking_time", cooking_time)
--Keep cooking until there is nothing left to cook.
if cooking_time <= goal then
return true
else
do_cook_all(pos)
meta:set_int("cooking_time", 0)
update_formspec(0, goal, meta)
return false
end
end,
--on_metadata_inventory_put = recalculate,
--on_metadata_inventory_take = recalculate,
on_construct = function(pos)
local meta = minetest.get_meta(pos)
meta:set_string("formspec", microwave_fs)
local inv = meta:get_inventory()
inv:set_size("cook_slot", 1)
end,
on_receive_fields = function(pos, _, fields)
if fields.quit then return end
if fields.btn_start then
recalculate(pos)
end
end,
on_blast = function(pos)
local drops = {}
default.get_inventory_drops(pos, "cook_slot", drops)
table.insert(drops, "ma_pops_furniture:microwave")
minetest.remove_node(pos)
return drops
end,
allow_metadata_inventory_put = function(pos, list, index, stack, player)
return microwave.recipes[stack:get_name()] and stack:get_count() or 0
end,
--Only allow items to be taken if the microwave hasn't started yet
allow_metadata_inventory_take = function(pos, listname, index, stack, player)
if not minetest.get_node_timer(pos):is_started() then
return stack:get_count()
else
return 0
end
end
})
minetest.register_craft({
output = "ma_pops_furniture:microwave",
recipe = {
{"default:steel_ingot", "default:mese_crystal", "default:steel_ingot"},
{"default:steel_ingot", "", "default:steel_ingot"},
{"default:steel_ingot", "default:mese_crystal", "default:steel_ingot"}
}
})
-- Recipe Registration
microwave.register_recipe("default:ice", "default:water_source")
-- No milk bucket as this doesn't support substitutes for now
microwave.register_recipe("mobs_mc:chicken_raw", "test:chicken_cooked")
--[[ We don't need to check mod existance when registering recipe
Recipe won't even be executed if there is no raw chicken in input ]]--
microwave.register_recipe("mobs_mc:beef_raw", "test:beef_cooked")
microwave.register_recipe("farming:coffee_cup", "farming:coffee_cup_hot") -- What a crutch there was...
-- Add needed recipes as you go, note that other mods can add more recipes too
--microwave code by Wizzerine
--item_percent code by Noodlemire
local microwave_fs =
"size[8,7]"
.."button[6.5,1.5;1.5,2;btn_start;START]"
.."image[6.5,.2;1.5,.5;mp_mw_bar.png^[transformR270]"
.."list[current_player;main;0,3;8,1;]"
.."list[current_player;main;0,4.25;8,3;8]"
.."list[context;cook_slot;3.5,1.25;1,1;]"
.."label[3,0.5;Microwave]"
-- possibly add "fire" image?
local function get_active_microwave_fs(item_percent)
return "size[8,7]"
.."button[6.5,1.5;1.5,2;button_start;START]"
.."image[6.5,.2;1.5,.5;mp_mw_bar.png^[lowpart:"
..(item_percent)..":mp_mw_bar_on.png^[transformR270]"
.."list[current_player;main;0,3;8,1;]"
.."list[current_player;main;0,4.25;8,3;8]"
.."list[context;cook_slot;3.5,1.25;1,1;]"
.."label[3,0.5;Microwave]"
-- possibly add "fire" image?
end
--x,y;w,h
-- Adding recipe API so we don't end up hardcoding items
ma_pops_furniture.microwave = {}
local microwave = ma_pops_furniture.microwave
microwave.recipes = {}
function microwave.register_recipe(input, output) microwave.recipes[input] = output end
local function update_formspec(progress, goal, meta)
local formspec
if progress > 0 and progress <= goal then
local item_percent = math.floor(progress / goal * 100)
formspec = get_active_microwave_fs(item_percent)
else
formspec = microwave_fs
end
meta:set_string("formspec", formspec)
end
local function recalculate(pos)
local meta, timer = minetest.get_meta(pos), minetest.get_node_timer(pos)
local inv = meta:get_inventory()
local stack = inv:get_stack("cook_slot", 1)
local goal = 3 * stack:get_count()
local k = microwave.recipes[stack:get_name()]
if not k then return end
timer:stop()
update_formspec(0, goal, meta)
timer:start(1)
end
local function do_cook_all(pos)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
local stack = meta:get_inventory():get_stack("cook_slot", 1)
local food_uncooked = inv:remove_item("cook_slot", inv:get_stack("cook_slot", 1)) -- Clear the slot
local food_cooked = microwave.recipes[food_uncooked:get_name()] .. " " .. tostring(food_uncooked:get_count()) -- Get the cooked food
inv:add_item("cook_slot", food_cooked) -- Put the cooked food in the slot
end
minetest.register_node("ma_pops_furniture:microwave", {
description = "Microwave",
tiles = {"mp_mw_top.png", "mp_mw_bottom.png", "mp_mw_right.png", "mp_mw_left.png", "mp_mw_back.png", "mp_mw_front.png"},
paramtype2 = "facedir",
groups = {cracky = 2}, -- currently no pipeworks compat as I don't know how it works
sounds = default.node_sound_stone_defaults(),
drawtype = "nodebox",
node_box = {
type = "fixed",
fixed = {
{-0.4375, -0.4375, -0.3125, 0.4375, 0.0625, 0.3125},
{-0.375, -0.5, -0.25, 0.375, -0.4375, 0.25},
},
},
can_dig = function(pos, player)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
return inv:is_empty("cook_slot")
end,
on_timer = function(pos, elapsed)
local meta = minetest.get_meta(pos)
local stack = meta:get_inventory():get_stack("cook_slot", 1)
local goal = 3 * stack:get_count()
local cooking_time = meta:get_int("cooking_time") or 0
cooking_time = cooking_time + 1
update_formspec(cooking_time, goal, meta)
meta:set_int("cooking_time", cooking_time)
--Keep cooking until there is nothing left to cook.
if cooking_time <= goal then
return true
else
do_cook_all(pos)
meta:set_int("cooking_time", 0)
update_formspec(0, goal, meta)
return false
end
end,
--on_metadata_inventory_put = recalculate,
--on_metadata_inventory_take = recalculate,
on_construct = function(pos)
local meta = minetest.get_meta(pos)
meta:set_string("formspec", microwave_fs)
local inv = meta:get_inventory()
inv:set_size("cook_slot", 1)
end,
on_receive_fields = function(pos, _, fields)
if fields.quit then return end
if fields.btn_start then
recalculate(pos)
end
end,
on_blast = function(pos)
local drops = {}
default.get_inventory_drops(pos, "cook_slot", drops)
table.insert(drops, "ma_pops_furniture:microwave")
minetest.remove_node(pos)
return drops
end,
allow_metadata_inventory_put = function(pos, list, index, stack, player)
return microwave.recipes[stack:get_name()] and stack:get_count() or 0
end,
--Only allow items to be taken if the microwave hasn't started yet
allow_metadata_inventory_take = function(pos, listname, index, stack, player)
if not minetest.get_node_timer(pos):is_started() then
return stack:get_count()
else
return 0
end
end
})
-- Recipe Registration
microwave.register_recipe("default:ice", "default:water_source")
-- No milk bucket as this doesn't support substitutes for now
microwave.register_recipe("mobs_mc:chicken_raw", "test:chicken_cooked")
--[[ We don't need to check mod existance when registering recipe
Recipe won't even be executed if there is no raw chicken in input ]]--
microwave.register_recipe("mobs_mc:beef_raw", "test:beef_cooked")
microwave.register_recipe("farming:coffee_cup", "farming:coffee_cup_hot") -- What a crutch there was...
-- Add needed recipes as you go, note that other mods can add more recipes too

View File

@ -175,21 +175,12 @@ minetest.register_node("ma_pops_furniture:toaster_with_toast", {
end
end
})
minetest.register_craft({
output = 'ma_pops_furniture:toaster',
recipe = {
{'','','',},
{'default:steel_ingot','default:mese_crystal','default:steel_ingot',},
{'default:steel_ingot','bucket:bucket_lava','default:steel_ingot',},
}
})
--Slice of Bread (only if not farming one used)
if not minetest.registered_items["farming:bread_slice"] then
minetest.register_craft({
output = 'ma_pops_furniture:breadslice 2',
type = "shapeless",
recipe = {"farming:bread"}
recipe = {"farming:bread", "ma_pops_furniture:knife"},
})
end