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

fixed the drink names in barrels and silos.

Browse Source
This commit is contained in:
NathanSalapat 2017-02-04 08:20:26 -06:00
parent d54a3d045a
commit a6f5fea008
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drink_machines.lua
View File

@ -259,15 +259,16 @@ function drinks.drinks_liquid_sub(liq_vol, ves_typ, ves_vol, pos)
return return
else else
local fruit = meta:get_string('fruit') local fruit = meta:get_string('fruit')
local fruit_name = meta:get_string('fruit_name')
local inv = meta:get_inventory() local inv = meta:get_inventory()
local fullness = fullness - liq_vol local fullness = fullness - liq_vol
meta:set_string('fullness', fullness) meta:set_string('fullness', fullness)
meta:set_string('infotext', (math.floor((fullness/ves_vol)*100))..' % full of '..fruit..' juice.') meta:set_string('infotext', (math.floor((fullness/ves_vol)*100))..' % full of '..fruit_name..' juice.')
if ves_vol == 128 then if ves_vol == 128 then
meta:set_string('formspec', drinks.liquid_storage_formspec(fruit, fullness, 128)) meta:set_string('formspec', drinks.liquid_storage_formspec(fruit_name, fullness, 128))
end end
if ves_vol == 256 then if ves_vol == 256 then
meta:set_string('formspec', drinks.liquid_storage_formspec(fruit, fullness, 256)) meta:set_string('formspec', drinks.liquid_storage_formspec(fruit_name, fullness, 256))
end end
if ves_typ == 'jcu' or ves_typ == 'jbo' or ves_typ == 'jbu' then if ves_typ == 'jcu' or ves_typ == 'jbo' or ves_typ == 'jbu' then
inv:set_stack('dst', 1, 'drinks:'..ves_typ..'_'..fruit) inv:set_stack('dst', 1, 'drinks:'..ves_typ..'_'..fruit)
@ -288,16 +289,17 @@ function drinks.drinks_liquid_add(liq_vol, ves_typ, ves_vol, pos)
return return
else else
local fruit = meta:get_string('fruit') local fruit = meta:get_string('fruit')
local fruit_name = meta:get_string('fruit_name')
local inv = meta:get_inventory() local inv = meta:get_inventory()
local fullness = fullness + liq_vol local fullness = fullness + liq_vol
meta:set_string('fullness', fullness) meta:set_string('fullness', fullness)
inv:set_stack('src', 1, ves_typ) inv:set_stack('src', 1, ves_typ)
meta:set_string('infotext', (math.floor((fullness/ves_vol)*100))..' % full of '..fruit..' juice.') meta:set_string('infotext', (math.floor((fullness/ves_vol)*100))..' % full of '..fruit_name..' juice.')
if ves_vol == 256 then if ves_vol == 256 then
meta:set_string('formspec', drinks.liquid_storage_formspec(fruit, fullness, 256)) meta:set_string('formspec', drinks.liquid_storage_formspec(fruit_name, fullness, 256))
end end
if ves_vol == 128 then if ves_vol == 128 then
meta:set_string('formspec', drinks.liquid_storage_formspec(fruit, fullness, 128)) meta:set_string('formspec', drinks.liquid_storage_formspec(fruit_name, fullness, 128))
end end
end end
end end
@ -375,11 +377,13 @@ minetest.register_node('drinks:liquid_barrel', {
local instack = inv:get_stack("src", 1) local instack = inv:get_stack("src", 1)
local outstack = inv:get_stack('dst', 1) local outstack = inv:get_stack('dst', 1)
local outputstack = outstack:get_name() local outputstack = outstack:get_name()
local fruit_name = minetest.registered_craftitems[instack:get_name()] local inputstack = instack:get_name()
local fruit = fruit_name.juice_type local fruit = string.sub(inputstack, 12, -1)
local fruit_in = meta:get_string('fruit') local fruit_in = meta:get_string('fruit')
if fruit_in == 'empty' then if fruit_in == 'empty' then
meta:set_string('fruit', fruit) meta:set_string('fruit', fruit)
local fruit_name = minetest.registered_craftitems[instack:get_name()]
meta:set_string('fruit_name', string.lower(fruit_name.juice_type))
local vessel = string.sub(inputstack, 8, 10) local vessel = string.sub(inputstack, 8, 10)
drinks.drinks_barrel(pos, inputstack) drinks.drinks_barrel(pos, inputstack)
end end
@ -407,11 +411,11 @@ minetest.register_node('drinks:liquid_barrel', {
if fields['purge'] then if fields['purge'] then
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local fullness = 0 local fullness = 0
local fruit = 'no' local fruit_name = 'no'
meta:set_string('fullness', 0) meta:set_string('fullness', 0)
meta:set_string('fruit', 'empty') meta:set_string('fruit', 'empty')
meta:set_string('infotext', 'Empty Drink Barrel') meta:set_string('infotext', 'Empty Drink Barrel')
meta:set_string('formspec', drinks.liquid_storage_formspec(fruit, fullness, 128)) meta:set_string('formspec', drinks.liquid_storage_formspec(fruit_name, fullness, 128))
end end
end, end,
can_dig = function(pos) can_dig = function(pos)
@ -475,11 +479,13 @@ minetest.register_node('drinks:liquid_silo', {
local instack = inv:get_stack("src", 1) local instack = inv:get_stack("src", 1)
local outstack = inv:get_stack('dst', 1) local outstack = inv:get_stack('dst', 1)
local outputstack = outstack:get_name() local outputstack = outstack:get_name()
local fruit_name = minetest.registered_craftitems[instack:get_name()] local inputstack = instack:get_name()
local fruit = fruit_name.juice_type local fruit = string.sub(inputstack, 12, -1)
local fruit_in = meta:get_string('fruit') local fruit_in = meta:get_string('fruit')
if fruit_in == 'empty' then if fruit_in == 'empty' then
meta:set_string('fruit', fruit) meta:set_string('fruit', fruit)
local fruit_name = minetest.registered_craftitems[instack:get_name()]
meta:set_string('fruit_name', string.lower(fruit_name.juice_type))
local vessel = string.sub(inputstack, 8, 10) local vessel = string.sub(inputstack, 8, 10)
drinks.drinks_silo(pos, inputstack) drinks.drinks_silo(pos, inputstack)
end end
@ -507,11 +513,11 @@ minetest.register_node('drinks:liquid_silo', {
if fields['purge'] then if fields['purge'] then
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local fullness = 0 local fullness = 0
local fruit = 'no' local fruit_name = 'no'
meta:set_string('fullness', 0) meta:set_string('fullness', 0)
meta:set_string('fruit', 'empty') meta:set_string('fruit', 'empty')
meta:set_string('infotext', 'Empty Drink Silo') meta:set_string('infotext', 'Empty Drink Silo')
meta:set_string('formspec', drinks.liquid_storage_formspec(fruit, fullness, 256)) meta:set_string('formspec', drinks.liquid_storage_formspec(fruit_name, fullness, 256))
end end
end, end,
can_dig = function(pos) can_dig = function(pos)

4
formspecs.lua
View File

@ -1,10 +1,10 @@
function drinks.liquid_storage_formspec(fruit, fullness, max) function drinks.liquid_storage_formspec(fruit_name, fullness, max)
local formspec = local formspec =
'size[8,8]'.. 'size[8,8]'..
'label[0,0;Fill with the drink of your choice,]'.. 'label[0,0;Fill with the drink of your choice,]'..
'label[0,.4;you can only add more of the same type of drink.]'.. 'label[0,.4;you can only add more of the same type of drink.]'..
'label[4.5,1.2;Add liquid ->]'.. 'label[4.5,1.2;Add liquid ->]'..
'label[.5,1.2;Storing '..fruit..' juice.]'.. 'label[.5,1.2;Storing '..fruit_name..' juice.]'..
'label[.5,1.65;Holding '..(fullness/2)..' of '..(max/2)..' cups.]'.. 'label[.5,1.65;Holding '..(fullness/2)..' of '..(max/2)..' cups.]'..
'label[4.5,2.25;Take liquid ->]'.. 'label[4.5,2.25;Take liquid ->]'..
'label[2,3.2;(This empties the container completely)]'.. 'label[2,3.2;(This empties the container completely)]'..