From c07fcc7d937b7803a185942366af9488e71e5c4c Mon Sep 17 00:00:00 2001 From: TenPlus1 Date: Thu, 10 Mar 2016 17:47:15 +0000 Subject: [PATCH] Added ability to ferment barley into beer --- README.md | 3 +- init.lua | 87 ++++++++++++------ textures/wine.png | Bin 374 -> 0 bytes textures/wine_beer_glass.png | Bin 0 -> 227 bytes textures/{bottle_wine.png => wine_bottle.png} | Bin textures/wine_glass.png | Bin 374 -> 374 bytes 6 files changed, 62 insertions(+), 28 deletions(-) delete mode 100644 textures/wine.png create mode 100644 textures/wine_beer_glass.png rename textures/{bottle_wine.png => wine_bottle.png} (100%) diff --git a/README.md b/README.md index af3c402..e7ffa14 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,5 @@ Changelog: 0.1 - Initial release 0.2 - Added protection checks to barrel 0.3 - New barrel model from cottages mod (thanks Napiophelios) - - Wine glass can be placed \ No newline at end of file + - Wine glass can be placed +0.4 - Added ability to ferment barley from farming redo into beer \ No newline at end of file diff --git a/init.lua b/init.lua index e4d1015..96c29f1 100644 --- a/init.lua +++ b/init.lua @@ -1,17 +1,12 @@ ---[[ wine glass -minetest.register_craftitem("wine:glass_wine", { - description = "Glass of Wine", - inventory_image = "wine.png", - on_use = minetest.item_eat(2), -})]] +-- glass of wine minetest.register_node("wine:glass_wine", { description = "Glass of Wine", drawtype = "plantlike", visual_scale = 0.8, - tiles = {"wine.png"}, - inventory_image = "wine.png", - wield_image = "wine.png", + tiles = {"wine_glass.png"}, + inventory_image = "wine_glass.png", + wield_image = "wine_glass.png", paramtype = "light", is_ground_content = false, sunlight_propagates = true, @@ -29,8 +24,8 @@ minetest.register_node("wine:glass_wine", { minetest.register_node("wine:bottle_wine", { description = "Bottle of Wine", drawtype = "plantlike", - tiles = {"bottle_wine.png"}, - inventory_image = "bottle_wine.png", + tiles = {"wine_bottle.png"}, + inventory_image = "wine_bottle.png", paramtype = "light", sunlight_propagates = true, walkable = false, @@ -57,6 +52,27 @@ minetest.register_craft({ recipe = {"wine:bottle_wine"}, }) +-- glass of beer (thanks to RiverKpocc @ deviantart.com for image) +minetest.register_node("wine:glass_beer", { + description = "Glass of Beer", + drawtype = "torchlike", --"plantlike", + visual_scale = 0.8, + tiles = {"wine_beer_glass.png"}, + inventory_image = "wine_beer_glass.png", + wield_image = "wine_beer_glass.png", + paramtype = "light", + is_ground_content = false, + sunlight_propagates = true, + walkable = false, + selection_box = { + type = "fixed", + fixed = {-0.2, -0.5, -0.2, 0.2, 0.3, 0.2} + }, + groups = {vessel = 1, dig_immediate = 3, attached_node = 1}, + sounds = default.node_sound_glass_defaults(), + on_use = minetest.item_eat(2), +}) + -- Wine barrel winebarrel_formspec = "size[8,9]" .. default.gui_bg..default.gui_bg_img..default.gui_slots @@ -69,9 +85,7 @@ winebarrel_formspec = "size[8,9]" .. "listring[current_player;main]" minetest.register_node("wine:wine_barrel", { - description = "Winebarrel", --- tiles = {"barrel_side.png", "barrel_side.png", "barrel_side.png^[transformR90", --- "barrel_side.png^[transformR90", "barrel_bottom.png", "barrel_front.png"}, + description = "Fermenting Barrel", tiles = {"wine_barrel.png" }, drawtype = "mesh", mesh = "wine_barrel.obj", @@ -83,7 +97,7 @@ minetest.register_node("wine:wine_barrel", { on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", winebarrel_formspec) - meta:set_string("infotext", "Wine Barrel") + meta:set_string("infotext", "Fermenting Barrel") meta:set_float("status", 0.0) local inv = meta:get_inventory() inv:set_size("src", 1) @@ -159,7 +173,7 @@ minetest.register_craft({ -- Wine barrel abm minetest.register_abm({ nodenames = {"wine:wine_barrel"}, - interval = 5.0, + interval = 5, chance = 1, catch_up = false, @@ -168,15 +182,21 @@ minetest.register_abm({ local meta = minetest.get_meta(pos) local inv = meta:get_inventory() - -- make sure only grapes are fermented in barrel + -- is barrel empty? + if inv:is_empty("src") then + return + end + + -- does it contain grapes or barley? if not inv:contains_item("src", ItemStack("farming:grapes")) - and not inv:is_empty("src") then + and not inv:contains_item("src", ItemStack("farming:barley")) then return end -- is barrel full - if not inv:room_for_item("dst", "farming:grapes") then - meta:set_string("infotext", "Wine Barrel (FULL)") + if not inv:room_for_item("dst", "wine:glass_wine") + or not inv:room_for_item("dst", "wine:glass_beer") then + meta:set_string("infotext", "Fermenting Barrel (FULL)") return end @@ -187,18 +207,31 @@ minetest.register_abm({ -- fermenting (change status) if status < 100 then - meta:set_string("infotext", "Wine Barrel (fermented: " .. status .. "%)") + meta:set_string("infotext", "Fermenting Barrel (" .. status .. "% Done)") meta:set_float("status", status + 5) - else --fermented (take grapes and add glass of wine) - inv:remove_item("src", "farming:grapes") - inv:add_item("dst", "wine:glass_wine") - meta:set_float("status", 0.0) + else + + if inv:contains_item("src", "farming:grapes") then + + --fermented (take grapes and add glass of wine) + inv:remove_item("src", "farming:grapes") + inv:add_item("dst", "wine:glass_wine") + meta:set_float("status", 0.0) + + elseif inv:contains_item("src", "farming:barley") then + + --fermented (take barley and add glass of beer) + inv:remove_item("src", "farming:barley") + inv:add_item("dst", "wine:glass_beer") + meta:set_float("status", 0.0) + + end end else - meta:set_string("infotext", "Wine Barrel") + meta:set_string("infotext", "Fermenting Barrel") end end, }) -print ("[MOD] Wine mod loaded") \ No newline at end of file +print ("[MOD] Wine mod loaded") diff --git a/textures/wine.png b/textures/wine.png deleted file mode 100644 index 3f2f4353407b20677425624bf6e29f3cdd24bfd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgg)ZW$(7;e{z_*MLH@nIRD+&iT2y zsd*(pE(3#eQEFmIYKlU6W=V#EyQgnJie4%^Q2eZ?i(`nz>9dm!`3@QIxb7De7J79m zWJ1D2k(dVWg8sg}g0>8a$!?37Wdqc&@lEMHe_>0@HBH%#DJMPOOn-4(a8kkAy=A^G zR@KR>=lvN{I2bAgOgj?=mHCxgT-P+Y&zpVY+v8yWHw<@<+}^uu?|B#Dvs0cVebcm= zUv^_%xDn9xp0iBZ_dSYh$klXxeV0Ly{q}q&AJ18vgxXbN9qXBL7BUD}3o|)nEm-zt z`g{HGYabte4Ei2>{a@1#f3wd^zbjWhSMc1dHZSTx+M@o$(#oe=p0j1-HG+KX>FVdQ I&MBb@0NLV)i2wiq diff --git a/textures/wine_beer_glass.png b/textures/wine_beer_glass.png new file mode 100644 index 0000000000000000000000000000000000000000..e53041ae25af2649728fa12a18478af8fe1d487c GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(aRb*i3?rK~*EBe%Yu`OHI z-#MXr>%y$-H!uGGabe;5E8Re4j3q&S!3+-1ZlnP@Wu7jMAsp9r&l+;I8t@$Zctv=N z(vE%V8h4kn3sg0I=eTP;Wu4>^=_zuz*T1Mg+0Vmyv5A9s?Y2LRHMvW@+?{2kHFtJx zHc8X}w0Fw0qo-H#dBinIHPpZEKEf~bzxkZl>{|X+EFVs0buK$0!yjW7+|&N{eQ$B? Zy}#dN?TuChod>#r!PC{xWt~$(69BEwT_FGf literal 0 HcmV?d00001 diff --git a/textures/bottle_wine.png b/textures/wine_bottle.png similarity index 100% rename from textures/bottle_wine.png rename to textures/wine_bottle.png diff --git a/textures/wine_glass.png b/textures/wine_glass.png index 24485bade50bd60c737340d5379d510930e97883..3f2f4353407b20677425624bf6e29f3cdd24bfd1 100644 GIT binary patch delta 206 zcmV;<05Sje0`>xsVg?-(p=4&(k!Ujk&5@iVe<#)sl#S2Ow1n0v9kFD|N$i*C+Yyp* zt-W?lL^^w8CC^U)WC#Fx5H*Qm5hD*Gghi}^N1mJ5_Ty7e>;T-v+r7HI&qNc=l;mRe zDLkKc*sfPH7ytlCnl%T$;$DDlDMjnu01*exsVg?=({Z0jgk!Ujk)sdVdf2Xb;C>x)Fv;^wVGGZxG65CJCw<9Fs z+UMCd5oz5Gl{h~EkUjw9LDU3>WsE$C5SFnD9-!L@0Q;NnYysTBOA*tpMtzeenyJXy zwYT&ga7~l07*qo IM6N<$g39Sz8~^|S