diff --git a/changelog.txt b/changelog.txt index ac73c66..f243c93 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +4-29-15: +Kabobs are here, craft with three mussels, three oysters, and a stick, once crafted enjoy raw, or cook for more health. + 4-25-15: Wells added, they require a hole in the ground three nodes deep to be placed on top. Just click on the inside of the hole, in the top node. They need to be placed in dirt. Right click on a well top and put in a bucket or canteen to get some water. The bucket will act exactly as any other bucket with water, the canteen with water can be cooked to purify and then be drank. Drinking dirty water can result in a loss of health. diff --git a/crafting.lua b/crafting.lua index b217b73..a5d04c0 100644 --- a/crafting.lua +++ b/crafting.lua @@ -16,6 +16,12 @@ minetest.register_craft({ } }) +minetest.register_craft({ + type = 'shapeless', + output = 'default:stick 9', + recipe = {'survival:barrel'} +}) + minetest.register_craft({ output = 'survival:machete_wood 1', recipe = { @@ -109,6 +115,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'survival:raw_kabob 1', + recipe = { + {'survival:mussel_raw', 'survival:mussel_raw', 'survival:mussel_raw'}, + {'survival:oyster_raw', 'survival:oyster_raw', 'survival:oyster_raw'}, + {'group:stick', '', ''}, + } +}) + minetest.register_craft({ type = 'cooking', output = 'survival:slug_cooked', @@ -174,3 +189,10 @@ minetest.register_craft({ cooktime = 30, replacements = {{'survival:bucket_sap', 'bucket:bucket_empty'}}, }) + +minetest.register_craft({ + type = 'cooking', + output = 'survival:cooked_kabob', + recipe = 'survival:raw_kabob', + cooktime = 7, +}) diff --git a/craftitem.lua b/craftitem.lua index fe0a6b7..54b7629 100644 --- a/craftitem.lua +++ b/craftitem.lua @@ -8,3 +8,4 @@ minetest.register_craftitem('survival:bucket_sap', { inventory_image = 'survival_bucket_sap.png', stack_max = 1, }) + diff --git a/depends.txt b/depends.txt index 5d7d2ee..d782b89 100644 --- a/depends.txt +++ b/depends.txt @@ -2,3 +2,4 @@ farming default wool beds +thirsty? diff --git a/drinking.lua b/drinking.lua index 028386c..2b4e5a4 100644 --- a/drinking.lua +++ b/drinking.lua @@ -36,7 +36,12 @@ minetest.register_craftitem('survival:canteen_water_dirty', { on_use = function(pos, player, itemstack) local hp_gain = math.random(-5,1) local hp = player:get_hp() - player:set_hp(hp + hp_gain) - return 'survival:canteen_empty' + if hp_gain <= 0 then + player:set_hp(hp + hp_gain) + return 'survival:canteen_empty' +-- else + --drink was water with the thirsty mods API + --both the if and else statements should also trigger wear on the canteen. + end end }) diff --git a/foods.lua b/foods.lua index cb7f822..8a9fb7b 100644 --- a/foods.lua +++ b/foods.lua @@ -97,3 +97,15 @@ minetest.register_craftitem('survival:sugar', { inventory_image = 'survival_sugar.png', on_use = minetest.item_eat(.1) }) + +minetest.register_craftitem('survival:raw_kabob', { + description = 'uncooked seafood kabob', + inventory_image = 'survival_raw_kabob.png', + on_use = minetest.item_eat(1) +}) + +minetest.register_craftitem('survival:cooked_kabob', { + description = 'seafood kabob', + inventory_image = 'survival_cooked_kabob.png', + on_use = minetest.item_eat(2.5) +}) diff --git a/nodes.lua b/nodes.lua index e6086f0..460462b 100644 --- a/nodes.lua +++ b/nodes.lua @@ -377,6 +377,10 @@ minetest.register_node('survival:well_top', { inv:set_stack('pail', 1,'survival:canteen_water_dirty') timer:stop() return + elseif inv:contains_item('pail', 'thirsty:steel_canteen') then --make sure the canteen is still there + inv:set_stack('pail', 1,({name='thirsty:steel_canteen', wear=1,})) + timer:stop() + return end end, on_metadata_inventory_put = function(pos, listname, index, stack, player) @@ -387,6 +391,8 @@ minetest.register_node('survival:well_top', { timer:start(7) elseif inv:contains_item('pail', 'survival:canteen_empty') then timer:start(6) + elseif inv:contains_item('pail', 'thirsty:steel_canteen') then + timer:start(6) end end, on_metadata_inventory_take = function(pos, listname, index, stack, player) @@ -414,6 +420,8 @@ minetest.register_node('survival:well_top', { return 1 elseif stack:get_name() == ('survival:canteen_empty') then return 1 + elseif stack:get_name() == ('thirsty:steel_canteen') then + return 1 else return 0 end diff --git a/textures/survival_cooked_kabob.png b/textures/survival_cooked_kabob.png new file mode 100644 index 0000000..dec684e Binary files /dev/null and b/textures/survival_cooked_kabob.png differ diff --git a/textures/survival_raw_kabob.png b/textures/survival_raw_kabob.png new file mode 100644 index 0000000..6cca6f3 Binary files /dev/null and b/textures/survival_raw_kabob.png differ