Merge pull request #8 from samuel-p/master

fixed farming:pumkin and added some more fruits
master
Nathan Salapat 2020-04-02 19:28:33 -05:00 committed by GitHub
commit 1a665743ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions

View File

@ -77,8 +77,10 @@ longname = {
if minetest.get_modpath('default') then
drinks.juiceable['apple'] = true -- Name of fruit to make juiceable.
drinks.juiceable['cactus'] = true
drinks.juiceable['blueberries'] = true
table.insert(drinks.drink_table, {'apple', 'Apple', '#ecff56'})
table.insert(drinks.drink_table, {'cactus', 'Cactus', '#96F97B'})
table.insert(drinks.drink_table, {'blueberries', 'Blueberry', '#521dcb'})
end
if minetest.get_modpath('bushes_classic') then
@ -132,9 +134,13 @@ if minetest.get_modpath('farming') then
drinks.juiceable['carrot'] = true
drinks.juiceable['cucumber'] = true
drinks.juiceable['grapes'] = true
drinks.juiceable['pumpkin'] = true
drinks.juiceable['pumpkin_8'] = true
drinks.juiceable['pumpkin_slice'] = true
drinks.juiceable['raspberries'] = true
drinks.juiceable['rhubarb'] = true
drinks.juiceable['blueberries'] = true
drinks.juiceable['pineapple'] = true
drinks.juiceable['pineapple_ring'] = true
table.insert(drinks.drink_table, {'melon', 'Melon', '#ef4646'})
table.insert(drinks.drink_table, {'tomato', 'Tomato', '#990000'})
table.insert(drinks.drink_table, {'carrot', 'Carrot', '#ed9121'})
@ -143,6 +149,10 @@ if minetest.get_modpath('farming') then
table.insert(drinks.drink_table, {'pumpkin', 'Pumpkin', '#ffc04c'})
table.insert(drinks.drink_table, {'raspberries', 'Raspberry', '#C70039'})
table.insert(drinks.drink_table, {'rhubarb', 'Rhubarb', '#fb8461'})
table.insert(drinks.drink_table, {'blueberries', 'Blueberry', '#521dcb'})
table.insert(drinks.drink_table, {'pineapple', 'Pineapple', '#dcd611'})
minetest.register_alias_force('farming:carrot_juice', 'drinks:jcu_carrot')
minetest.register_alias_force('farming:pineapple_juice', 'drinks:jcu_pineapple')
end
if minetest.get_modpath('fruit') then
@ -159,6 +169,7 @@ end
if minetest.get_modpath('ethereal') then
drinks.juiceable['banana'] = true
drinks.juiceable['coconut'] = true
drinks.juiceable['coconut_slice'] = true
drinks.juiceable['orange'] = true
drinks.juiceable['strawberry'] = true
table.insert(drinks.drink_table, {'banana', 'Banana', '#eced9f'})