From 9c204b508e6a716e38023e439fdb36a83ebb9715 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Fri, 11 Apr 2014 19:25:29 +0100 Subject: [PATCH] Cupcakes and Muffins --- depends.txt | 4 + init.lua | 168 ++++++++++++++++++++-- locale/template.txt | 21 +++ textures/food_lemon.png | Bin 0 -> 215 bytes textures/food_sweet_cupcake.png | Bin 0 -> 263 bytes textures/food_sweet_cupcake_choco.png | Bin 0 -> 259 bytes textures/food_sweet_cupcake_choco_mix.png | Bin 0 -> 353 bytes textures/food_sweet_cupcake_fairy.png | Bin 0 -> 344 bytes textures/food_sweet_cupcake_lemon.png | Bin 0 -> 338 bytes textures/food_sweet_cupcake_mix.png | Bin 0 -> 342 bytes textures/food_sweet_muffin_blueberry.png | Bin 0 -> 323 bytes textures/food_sweet_muffin_choco.png | Bin 0 -> 312 bytes 12 files changed, 184 insertions(+), 9 deletions(-) create mode 100644 textures/food_lemon.png create mode 100644 textures/food_sweet_cupcake.png create mode 100644 textures/food_sweet_cupcake_choco.png create mode 100644 textures/food_sweet_cupcake_choco_mix.png create mode 100644 textures/food_sweet_cupcake_fairy.png create mode 100644 textures/food_sweet_cupcake_lemon.png create mode 100644 textures/food_sweet_cupcake_mix.png create mode 100644 textures/food_sweet_muffin_blueberry.png create mode 100644 textures/food_sweet_muffin_choco.png diff --git a/depends.txt b/depends.txt index 48b3b46..e13a4bf 100644 --- a/depends.txt +++ b/depends.txt @@ -1 +1,5 @@ food +farming_plus? +plantlib? +bushes_classic? +bushes? diff --git a/init.lua b/init.lua index ee93f3a..8a39363 100644 --- a/init.lua +++ b/init.lua @@ -9,6 +9,10 @@ print("Sweet Foods - Version 0.1") +if not food or not food.version or food.version < 2.1 then + error("You need to update your version of the Food mod - it is too old") +end + -- Boilerplate to support localized strings if intllib mod is installed. local S if (minetest.get_modpath("intllib")) then @@ -20,13 +24,13 @@ end food.support("strawberry","farming_plus","farming_plus:strawberry_item") food.support("strawberry","plantlib","plantlib:strawberry") +food.support("strawberry","bushes_classic","bushes:strawberry") food.support("rhubarb","farming_plus","farming_plus:rhubarb_item") if minetest.setting_get("food_sweet_use_2d")==nil then minetest.setting_set("food_sweet_use_2d", "1") end - food.asupport("walnut",function() minetest.register_craftitem("food_sweet:walnut", { description = S("Walnut"), @@ -36,9 +40,9 @@ food.asupport("walnut",function() food.craft({ output = "food_sweet:walnut 4", recipe = { - {"","default:sand",""}, {"default:sand","","default:sand"}, - {"","default:sand",""} + {"","default:sand",""}, + {"default:sand","","default:sand"} } }) end) @@ -79,7 +83,7 @@ food.asupport("rhubarb",function() groups = {food_rhubarb = 1} }) food.craft({ - output = "food_sweet:rhubarb 4", + output = "food_sweet:rhubarb 10", recipe = { {"wool:red"}, {"wool:red"}, @@ -87,6 +91,21 @@ food.asupport("rhubarb",function() } }) end) +food.asupport("lemon",function() + minetest.register_craftitem("food_sweet:lemon", { + description = S("Lemon"), + inventory_image = "food_lemon.png", + groups = {food_lemon = 1} + }) + food.craft({ + output = "food_sweet:lemon 4", + recipe = { + {"","default:sand",""}, + {"default:sand","","default:sand"}, + {"","default:sand",""} + } + }) +end) -- Walnut and Coffee cake food.register("food_sweet:cake_walnut_coffee",{ @@ -142,7 +161,7 @@ minetest.register_craftitem("food_sweet:cake_cheese",{ description = S("Strawberry Cheese Cake"), inventory_image = "food_sweet_cake_cheese.png", on_use = food.item_eat(4), - groups={food=3,crumbly=3} + groups={food=3} }) minetest.register_craftitem("food_sweet:cakemix_cheese",{ description = S("Strawberry Cheese Cake Mix"), @@ -167,7 +186,7 @@ minetest.register_craftitem("food_sweet:cake_cheese_blueberry",{ description = S("Blueberry Cheese Cake"), inventory_image = "food_sweet_cake_cheese_blueberry.png", on_use = food.item_eat(4), - groups={food=3,crumbly=3} + groups={food=3} }) minetest.register_craftitem("food_sweet:cakemix_cheese_blueberry",{ description = S("Blueberry Cheese Cake Mix"), @@ -192,7 +211,7 @@ minetest.register_craftitem("food_sweet:cake_triple_choco",{ description = S("Triple Chocolate Cake"), inventory_image = "food_sweet_cake_triple_choco.png", on_use = food.item_eat(4), - groups={food=3,crumbly=3} + groups={food=3} }) minetest.register_craftitem("food_sweet:cakemix_triple_choco",{ description = S("Triple Chocolate Cake Mix"), @@ -217,7 +236,7 @@ minetest.register_craftitem("food_sweet:cake_wedding",{ description = S("Wedding Cake"), inventory_image = "food_sweet_cake_wedding.png", on_use = food.item_eat(4), - groups={food=3,crumbly=3} + groups={food=3} }) food.craft({ @@ -234,7 +253,7 @@ minetest.register_craftitem("food_sweet:crumble_rhubarb",{ description = S("Rhubarb Crumble"), inventory_image = "food_sweet_crumble_rhubarb.png", on_use = food.item_eat(4), - groups={food=3,crumbly=3} + groups={food=3} }) minetest.register_craftitem("food_sweet:crumble_rhubarb_raw",{ description = S("Raw Rhubarb Crumble"), @@ -253,3 +272,134 @@ food.craft({ {"group:food_flour","group:food_sugar","group:food_egg"} } }) + +-- Cup cake +minetest.register_craftitem("food_sweet:cupcake",{ + description = S("Cupcake"), + inventory_image = "food_sweet_cupcake.png", + on_use = food.item_eat(2), + groups={food=1} +}) +minetest.register_craftitem("food_sweet:cupcake_mix",{ + description = S("Cupcake Mix"), + inventory_image = "food_sweet_cupcake_mix.png" +}) +food.craft({ + type = "cooking", + output = "food_sweet:cupcake", + recipe = "food_sweet:cupcake_mix", + cooktime = 1 +}) +food.craft({ + output = "food_sweet:cupcake_mix 6", + recipe = { + {"group:food_flour","","group:food_egg"}, + {"","group:food_sugar",""} + } +}) + +-- Chocolate Cupcake +minetest.register_craftitem("food_sweet:cupcake_choco",{ + description = S("Chocolate Cupcake"), + inventory_image = "food_sweet_cupcake_choco.png", + on_use = food.item_eat(2), + groups={food=1} +}) +minetest.register_craftitem("food_sweet:cupcake_choco_mix",{ + description = S("Chocolate Cupcake Mix"), + inventory_image = "food_sweet_cupcake_choco_mix.png" +}) +food.craft({ + type = "cooking", + output = "food_sweet:cupcake_choco", + recipe = "food_sweet:cupcake_choco_mix", + cooktime = 1 +}) +food.craft({ + output = "food_sweet:cupcake_choco_mix 6", + recipe = { + {"group:food_flour","group:food_milk_chocolate","group:food_egg"}, + {"","group:food_sugar",""} + } +}) + +-- Fairy Cake +minetest.register_craftitem("food_sweet:cupcake_fairy",{ + description = S("Fairy Cake"), + inventory_image = "food_sweet_cupcake_fairy.png", + on_use = food.item_eat(2), + groups={food=1} +}) +food.craft({ + output = "food_sweet:cupcake_fairy", + recipe = { + {"group:food_sugar"}, + {"food_sweet:cupcake"} + } +}) + +-- Lemon Cake +minetest.register_craftitem("food_sweet:cupcake_lemon",{ + description = S("Lemon Drizzle Cupcake"), + inventory_image = "food_sweet_cupcake_lemon.png", + on_use = food.item_eat(2), + groups={food=1} +}) +food.craft({ + output = "food_sweet:cupcake_lemon", + recipe = { + {"group:food_lemon"}, + {"food_sweet:cupcake"} + } +}) + +-- Blueberry Muffin +minetest.register_craftitem("food_sweet:muffin_blueberry",{ + description = S("Blueberry Muffin"), + inventory_image = "food_sweet_muffin_blueberry.png", + on_use = food.item_eat(2), + groups={food=1} +}) +minetest.register_craftitem("food_sweet:muffin_blueberry_mix",{ + description = S("Blueberry Muffin Mix"), + inventory_image = "food_sweet_cupcake_mix.png" +}) +food.craft({ + type = "cooking", + output = "food_sweet:muffin_blueberry", + recipe = "food_sweet:muffin_blueberry_mix", + cooktime = 1 +}) +food.craft({ + output = "food_sweet:muffin_blueberry_mix 6", + recipe = { + {"group:food_flour","group:food_blueberry","group:food_egg"}, + {"","group:food_sugar",""} + } +}) + +-- Chocolate Chip Muffin +minetest.register_craftitem("food_sweet:muffin_choco",{ + description = S("Chocolate Chip Muffin"), + inventory_image = "food_sweet_muffin_choco.png", + on_use = food.item_eat(2), + groups={food=1} +}) +minetest.register_craftitem("food_sweet:muffin_choco_mix",{ + description = S("Chocolate Chip Muffin Mix"), + inventory_image = "food_sweet_cupcake_choco_mix.png" +}) +food.craft({ + type = "cooking", + output = "food_sweet:muffin_choco", + recipe = "food_sweet:muffin_choco_mix", + cooktime = 1 +}) +food.craft({ + output = "food_sweet:muffin_choco_mix 6", + recipe = { + {"","group:food_milk_chocolate",""}, + {"group:food_flour","group:food_milk_chocolate","group:food_egg"}, + {"","group:food_sugar",""} + } +}) diff --git a/locale/template.txt b/locale/template.txt index db34e3a..14a7d80 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -1,8 +1,12 @@ # template +# Supported Walnut = Strawberry = Blueberry = Rhubarb = +Lemon = + +# Cakes Walnut and Coffee Cake = Walnut and Coffee Cake Mix = Strawberry Cheese Cake = @@ -12,5 +16,22 @@ Blueberry Cheese Cake Mix = Triple Chocolate Cake = Triple Chocolate Cake Mix = Wedding Cake = + +# Crumbles Rhubarb Crumble = Raw Rhubarb Crumble = + +# Cupcake and derivs +Cupcake = +Cupcake Mix = +Chocolate Cupcake = +Chocolate Cupcake Mix = +Lemon Drizzle Cupcake = +Fairy Cake = + +# Muffins +Chocolate Chip Muffin = +Chocolate Chip Muffin Mix = +Blueberry Muffin = +Blueberry Muffin Mix = + diff --git a/textures/food_lemon.png b/textures/food_lemon.png new file mode 100644 index 0000000000000000000000000000000000000000..d6268401b9f1e216f25a43552b41a5c6d24e7bc2 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEr~7i~}9MAO6?3{kJeR zSoA9K;If~mKPSvF`}cqUH~USB8p~{VJo+3T(J^JG}U-FVdQ&MBb@ E0PA!{;Q#;t literal 0 HcmV?d00001 diff --git a/textures/food_sweet_cupcake.png b/textures/food_sweet_cupcake.png new file mode 100644 index 0000000000000000000000000000000000000000..de92785778daad721ef8b48cda20807c43ca9d47 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~`V)-nV=Y`%U5D8gCb z5n0T@z%2~Ij105pNB{-dOFVsD+3&G%3z(`J7dh_-3Qh5JaSX9Iotz-?sX=h|gSlHB z|8MME&9XjOCF1~ybM&a{hFjl0J>}+cmgv0Nb6UVH$RydgrE^uIN1u2=%m=4E9S@(L z7U$8A-*;fuM-Z#N^j6@J$P1$Xu4blJ{QYIheE788nn#OT7JYnncJ}}H{dH#*w6sn& z^lsa@(eYxlV8^RhuX=X;>0c+Au9FblasELgE5rR@uLll&EIWbjWAJqKb6Mw<&;$Su CmuVLO literal 0 HcmV?d00001 diff --git a/textures/food_sweet_cupcake_choco.png b/textures/food_sweet_cupcake_choco.png new file mode 100644 index 0000000000000000000000000000000000000000..75dd706cbde4dfa563875085468769023643f459 GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)1U;jxc1M6;sy$if|Tq zL>4nJa0`PlBg3pY5H=O_IoVcf-I&lqwL~o)|A=UAug7GNpudVJ9aeFEb zet2}0dyP~)koCamrCOH-_b#XDp5~Hq`|HjYY`n>~+Tviwp32Y9{$F1oZ`{$Uqpt($Z^I;~SkZfj1M2T~LZfgnPbVsZND5!p9`*~_k7XX@X^;1DDB zZu;iS*I!mmw)`fPaa*imfoATMCFi2gUNC+(l|f_aG_h+Z7y>5=nJg`Rm(cx2_-8Cv za$Kk6FW*DI<-~-0DqAJ1Vw{BK#J;lE%`tCt?Y$;-d5Yg1>Bk|l*CW@O7Ro%fni{m} rm(XS%;rah9Z_aL7eNkPf{(rB3=+@|SU!KP)fqd%e>gTe~DWM4fiVc9P literal 0 HcmV?d00001 diff --git a/textures/food_sweet_cupcake_fairy.png b/textures/food_sweet_cupcake_fairy.png new file mode 100644 index 0000000000000000000000000000000000000000..6a987589cf95bae0b3d777f9f8b7d3f4b49c5036 GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEKg8rsd>6V|z^lz8ffB%)v!DxDMfzc+G#~0c|5mjkURv&Hnf+X&iBIm}S!IzqOPrnk0@faLj9#Lqsbt5|SbxvmN$!vE)Po^x zj~}zx70xSf=a}y}S?SK6dASukm$50FpZ~hZ*Vp#-o`cpK#Z?&YtlnZN|3&zrNx{-B zAM=#st0+`}@-Vs2&Y(~k{7t$#U}zrEvO$@IfOtDl`=ik5_a*`Zs_PI``O z87JsF_F8>4i)6GepO`mUH0t%S6}J4l_ZglxTD(<_$2q53=J=uLB^q6G)@FCl_1z*^ dd(8eJW6p}?+p`Xyg;OXk;vd$@?2>`%WdyD`8 literal 0 HcmV?d00001 diff --git a/textures/food_sweet_cupcake_mix.png b/textures/food_sweet_cupcake_mix.png new file mode 100644 index 0000000000000000000000000000000000000000..799941229c7a7cc1bccbcfc086efd5066e9afa9a GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(}LN@O|akK%fX`fk$L9 z0|U1(2s1Lwnj--eWH0gbb!ETD!Yybfd`4(-D^L&#;@*W z*2b+KD?8RED93P3o-o6^Es|@xY}NMPcDk8z=)yYfxMv?OI^Ik% z*s{W{e2?5`^9uXtSCjp&mo6z>_$cv3)xbZu%iKSw%4Z&(0gWS$kg? dPuu_hm~^a6c<wo@gIoJKwVYsCcPJT3t%4nJa0`PlBg3pY5H=O_IoVcg3L;)Cv@Y0LPtGa978NlCnrc`9O&>ZSY>^< zUc$Os-G$f8a1EPJY5EU+MMcKv`zt;+H39)+EKeGTu-5AdQ;(c?cv2gJUyYn&ciL)qq%Nk?6jp0Z^W8GW9 zHgWy91I}`h#y)paFZqfvM_!ow-sq*;;n&yKOX`{3P7qa}F(L2Xo}d4}zP`@0Xwf2` z8yV8l(jvAJjVsozJJ+H8>w@Xy9@ZSLkCHYU7#OBbO5w{`Yk39eAqG!ZKbLh*2~7ab C6m2a4 literal 0 HcmV?d00001