summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRubenwardy <anjayward@gmail.com>2012-09-10 20:04:10 +0100
committerRubenwardy <anjayward@gmail.com>2012-09-10 20:04:10 +0100
commitb336aaa2b489ceee8e5bc803dabc3052d2bbd63a (patch)
tree5fcf17f5f4e15e259fa33b73056604e69a899a39
parentcf48b7dbadc2afc84613aa6c31b4c4bf8f95c177 (diff)
Moved stuff around and added hot chocolate
-rw-r--r--dairy.lua33
-rw-r--r--drinks/hot.lua (renamed from drinks.lua)79
-rw-r--r--drinks/juice.lua50
-rw-r--r--drinks/milkshakes.lua17
-rw-r--r--food/baking.lua (renamed from baking.lua)8
-rw-r--r--food/meats.lua (renamed from meats.lua)3
-rw-r--r--food/sandwich.lua (renamed from sandwich.lua)16
-rw-r--r--init.lua39
-rw-r--r--snacks/cakes.lua (renamed from cakes.lua)6
-rw-r--r--snacks/crumbles.lua (renamed from crumbles.lua)2
-rw-r--r--snacks/tarts.lua (renamed from tarts.lua)2
-rw-r--r--support.lua15
-rw-r--r--textures/food_choco_dark.pngbin0 -> 480 bytes
-rw-r--r--textures/food_choco_milk.pngbin0 -> 479 bytes
-rw-r--r--textures/food_chocolate_powder.pngbin0 -> 510 bytes
-rw-r--r--textures/food_clay_mug.pngbin0 -> 596 bytes
-rw-r--r--textures/food_hotchoco.pngbin0 -> 772 bytes
-rw-r--r--textures/food_ms_banana.pngbin0 -> 308 bytes
-rw-r--r--textures/food_ms_chocolate.pngbin0 -> 336 bytes
-rw-r--r--textures/food_ms_strawberry.pngbin0 -> 324 bytes
-rw-r--r--tools/oven.lua (renamed from oven.lua)6
21 files changed, 183 insertions, 93 deletions
diff --git a/dairy.lua b/dairy.lua
index 50f581c..68c02db 100644
--- a/dairy.lua
+++ b/dairy.lua
@@ -38,6 +38,12 @@ minetest.register_craft({
})
+--
+--
+-- CHOCOLATE
+--
+--
+
minetest.register_craftitem("food:chocolate_dark", {
description = "Dark Chocolate",
@@ -47,10 +53,15 @@ minetest.register_craftitem("food:chocolate_dark", {
minetest.register_craftitem("food:chocolate_milk", {
description = "Milk Chocolate",
- inventory_image = "food_choco_dark.png",
+ inventory_image = "food_choco_milk.png",
on_use = minetest.item_eat(3),
})
+minetest.register_craftitem("food:chocolate_powder", {
+ description = "Chocolate Powder",
+ inventory_image = "food_choco_powder.png",
+})
+
minetest.register_craft({
output = '"food:chocolate_dark" 1',
recipe = {
@@ -59,10 +70,26 @@ minetest.register_craft({
})
minetest.register_craft({
+ output = '"food:chocolate_powder" 1',
+ recipe = {
+ {"food:cocoa","food:cocoa","food:cocoa"},
+ {"food:cocoa","food:cocoa","food:cocoa"},
+ {"food:cocoa","food:cocoa","food:cocoa"},
+ }
+})
+
+minetest.register_craft({
output = '"food:chocolate_milk" 1',
recipe = {
- {"",'"food:milk"',""},
- {'"food:cocoa"','"food:cocoa"','"food:cocoa"'},
+ {"","food:milk",""},
+ {"food:cocoa","food:cocoa","food:cocoa"},
+ }
+})
+
+minetest.register_craft({
+ output = '"food:chocolate_milk" 1',
+ recipe = {
+ {"","food:milk","food:chocolate_dark"},
}
})
diff --git a/drinks.lua b/drinks/hot.lua
index 339f915..57c5c79 100644
--- a/drinks.lua
+++ b/drinks/hot.lua
@@ -2,61 +2,16 @@
-- A mod written by rubenwardy that adds
-- food to the minetest game
-- =====================================
--- >> rubenfood/drinks.lua
--- adds drinks
+-- >> rubenfood/drinks/hot.lua
+-- adds hot drinks
-- =====================================
--- [regis-food] Apple Juice
--- [craft] Cactus Juice
--- [regis-food] Cactus Juice
--- [craft] Cactus Juice
+-- [regis-food] Coffee
+-- [craft] Coffe
+-- [regis-food] Hot Chocolate
+-- [craft] Hot Chocolate
-- =====================================
-print ("RubenFood [Master] - Loading Juices")
-
---------------------------Apple Juice--------------------------
-minetest.register_craftitem("food:apple_juice", {
- description = "Apple Juice",
- inventory_image = "food_juice_apple.png",
- on_use = minetest.item_eat(2)
-})
-
-minetest.register_craft({
- output = '"food:apple_juice" 4',
- recipe = {
- {"","",""},
- {"","default:apple",""},
- {"","food:cup",""},
- }
-})
-
-
-
-
-
-----------------------cactus juice----------------------------
-minetest.register_node("food:cactus_juice", {
- description = "Cactuz Juice",
- inventory_image = "food_juice_cactus.png",
- on_use = minetest.item_eat(2),
-})
-
-minetest.register_craft({
- output = '"food:cactus_juice" 4',
- recipe = {
- {'""','""','""'},
- {'""','"default:cactus"','""'},
- {'""','"food:cup"','""'},
- }
-})
-
-
-
-
-
-
-
-
-
+print ("RubenFood [Master] - Loading Hot")
-----------------------------Coffee-----------------------------
@@ -72,7 +27,7 @@ minetest.register_craftitem("food:coffeebean_cooked",{
inventory_image = "food_coffee_cooked.png",
})
-minetest.register_node("food:coffee", {
+minetest.register_craftitem("food:coffee", {
description = "Coffee",
inventory_image = "food_coffee_cup.png",
on_use = minetest.item_eat(10),
@@ -105,3 +60,21 @@ minetest.register_craft({
+-------------------------Hot Chocolate--------------------------
+
+minetest.register_craftitem("food:hotchoco", {
+ description = "Hot Chocolate",
+ inventory_image = "food_hotchoco.png",
+ on_use = minetest.item_eat(4),
+})
+
+minetest.register_craft({
+output = '"food:hotchoco" 1 ',
+recipe = {
+{"food:chocolate_powder"},
+{"food:milk"},
+{"food:mug"},
+},
+})
+
+
diff --git a/drinks/juice.lua b/drinks/juice.lua
new file mode 100644
index 0000000..b6d93ab
--- /dev/null
+++ b/drinks/juice.lua
@@ -0,0 +1,50 @@
+-- RUBENFOOD MOD
+-- A mod written by rubenwardy that adds
+-- food to the minetest game
+-- =====================================
+-- >> rubenfood/drinks/juice.lua
+-- adds juices
+-- =====================================
+-- [regis-food] Apple Juice
+-- [craft] Cactus Juice
+-- [regis-food] Cactus Juice
+-- [craft] Cactus Juice
+-- =====================================
+
+print ("RubenFood [Master] - Loading Juices")
+
+--------------------------Apple Juice--------------------------
+minetest.register_craftitem("food:apple_juice", {
+ description = "Apple Juice",
+ inventory_image = "food_juice_apple.png",
+ on_use = minetest.item_eat(2)
+})
+
+minetest.register_craft({
+ output = '"food:apple_juice" 4',
+ recipe = {
+ {"","",""},
+ {"","default:apple",""},
+ {"","food:cup",""},
+ }
+})
+
+
+
+
+
+----------------------cactus juice----------------------------
+minetest.register_craftitem("food:cactus_juice", {
+ description = "Cactuz Juice",
+ inventory_image = "food_juice_cactus.png",
+ on_use = minetest.item_eat(2),
+})
+
+minetest.register_craft({
+ output = '"food:cactus_juice" 4',
+ recipe = {
+ {'""','""','""'},
+ {'""','"default:cactus"','""'},
+ {'""','"food:cup"','""'},
+ }
+}) \ No newline at end of file
diff --git a/drinks/milkshakes.lua b/drinks/milkshakes.lua
new file mode 100644
index 0000000..ffb8c56
--- /dev/null
+++ b/drinks/milkshakes.lua
@@ -0,0 +1,17 @@
+-- RUBENFOOD MOD
+-- A mod written by rubenwardy that adds
+-- food to the minetest game
+-- =====================================
+-- >> rubenfood/drinks/milkshakes.lua
+-- adds drinks
+-- =====================================
+--
+-- =====================================
+
+print ("RubenFood [Master] - Loading Milk Shakes")
+
+minetest.register_craftitem("food:ms_chocolate", {
+ description = "Chocolate Milkshake",
+ inventory_image = "food_ms_chocolate.png",
+ on_use = minetest.item_eat(4)
+}) \ No newline at end of file
diff --git a/baking.lua b/food/baking.lua
index 41b8eb6..9496c68 100644
--- a/baking.lua
+++ b/food/baking.lua
@@ -2,10 +2,16 @@
-- A mod written by rubenwardy that adds
-- food to the minetest game
-- =====================================
--- >> rubenfood/baking.lua
+-- >> rubenfood/food/baking.lua
-- adds bread and pies
-- =====================================
-- [regis-food] Bread
+-- [regis-food] Bread Slice
+-- [craft] Bread Slice
+-- [regis-food] Bun
+-- [craft] Bun
+-- [regis-item] Bun Dough
+-- [craft] Bun Dough
-- =====================================
print "RubenFood [Master] - Loading Bread"
diff --git a/meats.lua b/food/meats.lua
index 091ba77..a4e67e8 100644
--- a/meats.lua
+++ b/food/meats.lua
@@ -2,10 +2,11 @@
-- A mod written by rubenwardy that adds
-- food to the minetest game
-- ======================================
--- >> rubenfood/meats.lua
+-- >> rubenfood/food/meats.lua
-- adds meat products
-- ======================================
-- [regis-food] Meat
+-- [craft] Meat
-- ======================================
minetest.register_craftitem("food:meat", {
diff --git a/sandwich.lua b/food/sandwich.lua
index 9151bdd..ba824e9 100644
--- a/sandwich.lua
+++ b/food/sandwich.lua
@@ -2,13 +2,15 @@
-- A mod written by rubenwardy that adds
-- food to the minetest game
-- ======================================
--- >> rubenfood/sandwich.lua
+-- >> rubenfood/food/sandwich.lua
-- adds sandwich
-- ======================================
--- [regis-food] Cheese
--- [craft] Cheese
--- [regis-item] Butter
--- [craft] Butter
+-- [regis-food] Cheese Sandwich
+-- [craft] Cheese Sandwich
+-- [regis-food] Venison Sandwich
+-- [craft] Venison Sandwich
+-- [regis-food] Burger
+-- [craft] Burger
-- ======================================
print "RubenFood [Master] - Loading Sandwiches"
@@ -31,6 +33,8 @@ minetest.register_craftitem("food:burger", {
on_use = minetest.item_eat(10),
})
+
+
minetest.register_craft({
output = '"food:sw_meat" 1',
recipe = {
@@ -49,6 +53,8 @@ minetest.register_craft({
}
})
+
+
minetest.register_craft({
output = '"food:burger" 1',
recipe = {
diff --git a/init.lua b/init.lua
index 6035626..fb5bc88 100644
--- a/init.lua
+++ b/init.lua
@@ -14,18 +14,20 @@ print ("food: Loading mainframe: [Master]")
----------------------Load Files-----------------------------
dofile(minetest.get_modpath("food").."/support.lua")
-dofile(minetest.get_modpath("food").."/oven.lua")
+dofile(minetest.get_modpath("food").."/tools/oven.lua")
dofile(minetest.get_modpath("food").."/dairy.lua")
-dofile(minetest.get_modpath("food").."/meats.lua")
-dofile(minetest.get_modpath("food").."/sandwich.lua")
-dofile(minetest.get_modpath("food").."/baking.lua")
+dofile(minetest.get_modpath("food").."/food/meats.lua")
+dofile(minetest.get_modpath("food").."/food/sandwich.lua")
+dofile(minetest.get_modpath("food").."/food/baking.lua")
-dofile(minetest.get_modpath("food").."/crumbles.lua")
-dofile(minetest.get_modpath("food").."/cakes.lua")
-dofile(minetest.get_modpath("food").."/tarts.lua")
+dofile(minetest.get_modpath("food").."/snacks/crumbles.lua")
+dofile(minetest.get_modpath("food").."/snacks/cakes.lua")
+dofile(minetest.get_modpath("food").."/snacks/tarts.lua")
-dofile(minetest.get_modpath("food").."/drinks.lua")
+dofile(minetest.get_modpath("food").."/drinks/juice.lua")
+dofile(minetest.get_modpath("food").."/drinks/hot.lua")
+dofile(minetest.get_modpath("food").."/drinks/milkshakes.lua")
@@ -36,14 +38,27 @@ minetest.register_craftitem("food:mug",{
inventory_image = "food_mug.png",
})
+minetest.register_craftitem("food:clay_mug",{
+ description = "Clay Mug",
+ inventory_image = "food_clay_mug.png",
+})
+
minetest.register_craft({
- output = '"food:cup" 4',
+ output = '"food:clay_mug" 1',
recipe = {
- {"default:glass"},
- {"default:glass"},
+ {"default:clay_lump","","default:clay_lump"},
+ {"default:clay_lump","","default:clay_lump"},
+ {"default:clay_lump","default:clay_lump","default:clay_lump"},
}
})
+minetest.register_craft({
+ type = "cooking",
+ output = "food:mug",
+ recipe = "food:clay_mug",
+})
+
+
-----------------------------Sugar------------------------------
minetest.register_craftitem("food:sugar", {
description = "Sugar",
@@ -58,7 +73,7 @@ minetest.register_craft({
})
----------------------------Cigerete----------------------------
-minetest.register_node("food:cigarette", {
+minetest.register_craftitem("food:cigarette", {
description = "Cigarette",
inventory_image = "food_cigar.png",
on_use = minetest.item_eat(-4),
diff --git a/cakes.lua b/snacks/cakes.lua
index e06cd0f..549bbab 100644
--- a/cakes.lua
+++ b/snacks/cakes.lua
@@ -2,11 +2,15 @@
-- A mod written by rubenwardy that adds
-- food to the minetest game
-- =====================================
--- >> rubenfood/cakes.lua
+-- >> rubenfood/snacks/cakes.lua
-- adds cakes
-- =====================================
-- [regis-food] Plain Cake
+-- [craft] Plain Cake
-- [regis-food] Chocolate Cake
+-- [craft] Chocolate Cake
+-- [regis-food] Carrot Cake
+-- [craft] Chocolate Cake
-- =====================================
print("RubenFood [Master] - Loading Cakes")
diff --git a/crumbles.lua b/snacks/crumbles.lua
index 402140c..4a1ab9c 100644
--- a/crumbles.lua
+++ b/snacks/crumbles.lua
@@ -2,7 +2,7 @@
-- A mod written by rubenwardy that adds
-- food to the minetest game
-- =====================================
--- >> rubenfood/crumbles.lua
+-- >> rubenfood/snacks/crumbles.lua
-- adds crumbles
-- =====================================
-- [regis-food] Rhubarb Crumble
diff --git a/tarts.lua b/snacks/tarts.lua
index 905f6f1..b985e03 100644
--- a/tarts.lua
+++ b/snacks/tarts.lua
@@ -2,7 +2,7 @@
-- A mod written by rubenwardy that adds
-- food to the minetest game
-- ======================================
--- >> rubenfood/tarts.lua
+-- >> rubenfood/snacks/tarts.lua
-- adds diary products
-- ======================================
-- [regis-food] Strawberry Tart
diff --git a/support.lua b/support.lua
index 07839d9..baf33b2 100644
--- a/support.lua
+++ b/support.lua
@@ -55,18 +55,9 @@ minetest.register_craftitem("food:rhubarb", {
end)
node_implement("farming","farming:cocoa_bean","food:cocoa",function()
-minetest.register_node("food:cocoa", {
- description = "Cocoa",
- tiles = {"farming_cocoa.png"},
- visual_scale = 0.5,
- inventory_image = "farming_cocoa.png",
- wield_image = "farming_cocoa.png",
- drawtype = "torchlike",
- paramtype = "light",
- sunlight_propagates = true,
- walkable = false,
- groups = {fleshy=3,dig_immediate=3,flammable=2},
- sounds = default.node_sound_defaults(),
+minetest.register_craftitem("food:cocoa", {
+ description = "Cocoa Bean",
+ inventory_image = "farming_cocoa_bean.png",
})
end)
diff --git a/textures/food_choco_dark.png b/textures/food_choco_dark.png
new file mode 100644
index 0000000..3e1df7b
--- /dev/null
+++ b/textures/food_choco_dark.png
Binary files differ
diff --git a/textures/food_choco_milk.png b/textures/food_choco_milk.png
new file mode 100644
index 0000000..bbfa37e
--- /dev/null
+++ b/textures/food_choco_milk.png
Binary files differ
diff --git a/textures/food_chocolate_powder.png b/textures/food_chocolate_powder.png
new file mode 100644
index 0000000..49840ed
--- /dev/null
+++ b/textures/food_chocolate_powder.png
Binary files differ
diff --git a/textures/food_clay_mug.png b/textures/food_clay_mug.png
new file mode 100644
index 0000000..73eeecf
--- /dev/null
+++ b/textures/food_clay_mug.png
Binary files differ
diff --git a/textures/food_hotchoco.png b/textures/food_hotchoco.png
new file mode 100644
index 0000000..6edbab7
--- /dev/null
+++ b/textures/food_hotchoco.png
Binary files differ
diff --git a/textures/food_ms_banana.png b/textures/food_ms_banana.png
new file mode 100644
index 0000000..19e9310
--- /dev/null
+++ b/textures/food_ms_banana.png
Binary files differ
diff --git a/textures/food_ms_chocolate.png b/textures/food_ms_chocolate.png
new file mode 100644
index 0000000..f7fbeec
--- /dev/null
+++ b/textures/food_ms_chocolate.png
Binary files differ
diff --git a/textures/food_ms_strawberry.png b/textures/food_ms_strawberry.png
new file mode 100644
index 0000000..6c2cbb6
--- /dev/null
+++ b/textures/food_ms_strawberry.png
Binary files differ
diff --git a/oven.lua b/tools/oven.lua
index 0d1a14b..8c9f805 100644
--- a/oven.lua
+++ b/tools/oven.lua
@@ -2,10 +2,10 @@
-- A mod written by rubenwardy that adds
-- food to the minetest game
-- ======================================
--- >> rubenfood/diary.lua
+-- >> rubenfood/tools/oven.lua
-- adds diary products
-- ======================================
--- [regis-furnace] Rings
+-- todo [regis-furnace] Rings
-- [regis-furnace] Oven
-- ======================================
@@ -172,7 +172,7 @@ minetest.register_abm({
end
if fuel.time <= 0 then
- meta:set_string("infotext","Furnace out of fuel")
+ meta:set_string("infotext","Oven is out of fuel")
hacky_swap_node(pos,"food:oven")
meta:set_string("formspec", oven_inactive_formspec)
return