minetest-mods/drinks-cd2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added another lookup table, and discovered a bug.

Browse Source
This commit is contained in:
NathanSalapat 2017-03-25 17:18:56 -05:00
parent 7771ff6207
commit 7e2e466f1e
4 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drink_machines.lua
View File

@ -315,13 +315,13 @@ end
function drinks.drinks_barrel(pos, inputstack)
local meta = minetest.get_meta(pos)
local vessel = string.sub(inputstack, 8, 10)
drinks.drinks_liquid_add(drinks.volume[vessel].size, drinks.volume[vessel].name, 128, pos)
drinks.drinks_liquid_add(drinks.shortname[vessel].size, drinks.shortname[vessel].name, 128, pos)
end
function drinks.drinks_silo(pos, inputstack)
local meta = minetest.get_meta(pos)
local vessel = string.sub(inputstack, 8, 10)
drinks.drinks_liquid_add(drinks.volume[vessel].size, drinks.volume[vessel].name, 256, pos)
drinks.drinks_liquid_add(drinks.shortname[vessel].size, drinks.shortname[vessel].name, 256, pos)
end
minetest.register_node('drinks:liquid_barrel', {
@ -375,7 +375,7 @@ minetest.register_node('drinks:liquid_barrel', {
if fruit_in == 'empty' then
meta:set_string('fruit', fruit)
local fruit_name = minetest.registered_nodes[instack:get_name()]
meta:set_string('fruit_name', string.lower(fruit_type.juice_type))
meta:set_string('fruit_name', string.lower(fruit_name.juice_type))
local vessel = string.sub(inputstack, 8, 10)
drinks.drinks_barrel(pos, inputstack)
end
@ -383,18 +383,8 @@ minetest.register_node('drinks:liquid_barrel', {
local vessel = string.sub(inputstack, 8, 10)
drinks.drinks_barrel(pos, inputstack)
end
if outputstack == 'vessels:drinking_glass' then
drinks.drinks_liquid_sub(2, 'jcu', 128, pos)
elseif outputstack == 'vessels:glass_bottle' then
drinks.drinks_liquid_sub(4, 'jbo', 128, pos)
elseif outputstack == 'vessels:steel_bottle' then
drinks.drinks_liquid_sub(4, 'jsb', 128, pos)
elseif outputstack == 'bucket:bucket_empty' then
drinks.drinks_liquid_sub(16, 'jbu', 128, pos)
elseif outputstack == 'thirsty:steel_canteen' then
drinks.drinks_liquid_sub(20, 'thirsty:steel_canteen', 128, pos)
elseif outputstack == 'thirsty:bronze_canteen' then
drinks.drinks_liquid_sub(30, 'thirsty:bronze_canteen', 128, pos)
if drinks.longname[outputstack] then
drinks.drinks_liquid_sub(drinks.longname[outputstack].size, drinks.longname[outputstack].name, 128, pos)
end
end,
on_receive_fields = function(pos, formname, fields, sender)
@ -475,7 +465,7 @@ minetest.register_node('drinks:liquid_silo', {
if fruit_in == 'empty' then
meta:set_string('fruit', fruit)
local fruit_name = minetest.registered_nodes[instack:get_name()]
meta:set_string('fruit_name', string.lower(fruit_type.juice_type))
meta:set_string('fruit_name', string.lower(fruit_name.juice_type))
local vessel = string.sub(inputstack, 8, 10)
drinks.drinks_silo(pos, inputstack)
end
@ -483,18 +473,8 @@ minetest.register_node('drinks:liquid_silo', {
local vessel = string.sub(inputstack, 8, 10)
drinks.drinks_silo(pos, inputstack)
end
if outputstack == 'vessels:drinking_glass' then
drinks.drinks_liquid_sub(2, 'jcu', 256, pos)
elseif outputstack == 'vessels:glass_bottle' then
drinks.drinks_liquid_sub(4, 'jbo', 256, pos)
elseif outputstack == 'vessels:steel_bottle' then
drinks.drinks_liquid_sub(4, 'jsb', 256, pos)
elseif outputstack == 'bucket:bucket_empty' then
drinks.drinks_liquid_sub(16, 'jbu', 256, pos)
elseif outputstack == 'thirsty:steel_canteen' then
drinks.drinks_liquid_sub(20, 'thirsty:steel_canteen', 256, pos)
elseif outputstack == 'thirsty:bronze_canteen' then
drinks.drinks_liquid_sub(30, 'thirsty:bronze_canteen', 256, pos)
if drinks.longname[outputstack] then
drinks.drinks_liquid_sub(drinks.longname[outputstack].size, drinks.longname[outputstack].name, 256, pos)
end
end,
on_receive_fields = function(pos, formname, fields, sender)

3
drinks.lua
View File

@ -44,8 +44,9 @@ drinks.register_item('drinks:jsb_'..desc, 'vessels:steel_bottle',{
end,
})
minetest.register_craftitem('drinks:jbu_'..desc, {
drinks.register_item('drinks:jbu_'..desc, 'vessels:steel_bottle', {
description = 'Bucket of '..craft..' Juice',
groups = {drink = 1},
juice_type = craft,
inventory_image = 'bucket.png^(drinks_bucket_contents.png^[colorize:'..color..':200)',
stack_max = 1,

3
drinks2.lua
View File

@ -40,8 +40,9 @@ drinks.register_item( 'drinks:jsb_'..desc, 'vessels:steel_bottle', {
end,
})
minetest.register_craftitem('drinks:jbu_'..desc, {
drinks.register_item('drinks:jbu_'..desc, 'bucket:bucket_empty',{
description = 'Bucket of '..craft..' Juice',
groups = {drink=1},
juice_type = craft,
inventory_image = 'bucket.png^(drinks_bucket_contents.png^[colorize:'..color..':200)',
stack_max = 1,

10
init.lua
View File

@ -1,12 +1,20 @@
drinks = {
drink_table = {},
juiceable = {},
volume = {
shortname = {
['jcu'] = {size = 2, name = 'vessels:drinking_glass'},
['jbo'] = {size = 4, name = 'vessels:glass_bottle'},
['jsb'] = {size = 4, name = 'vessels:steel_bottle'},
['jbu'] = {size = 16, name = 'bucket:bucket_empty'}
},
longname = {
['vessels:drinking_glass'] = {size = 2, name = 'jcu'},
['vessels:glass_bottle'] = {size = 4, name = 'jbo'},
['vessels:steel_bottle'] = {size = 4, name = 'jsb'},
['bucket:bucket_empty'] = {size = 16, name = 'jbu'},
['thirsty:steel_canteen'] = {size = 20, name = 'thirsty:steel_canteen'},
['thirsty:bronze_canteen'] = {size = 30, name = 'thirsty:bronze_canteen'},
},
}