From d8fe6a2661e6bc20903df80bd59b6046abf01117 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 17 Feb 2017 22:27:33 +0100 Subject: [PATCH] Fishing rod reacts on rightclick --- mods/ITEMS/mcl_fishing/init.lua | 182 ++++++++++++++++---------------- 1 file changed, 92 insertions(+), 90 deletions(-) diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua index 1222d11ada..e0c0dcc73c 100644 --- a/mods/ITEMS/mcl_fishing/init.lua +++ b/mods/ITEMS/mcl_fishing/init.lua @@ -1,96 +1,98 @@ +local go_fishing = function(itemstack, user, pointed_thing) + if pointed_thing and pointed_thing.under then + local node = minetest.get_node(pointed_thing.under) + if string.find(node.name, "mcl_core:water") then + local itemname + local itemcount = 1 + local itemwear = 0 + local r = math.random(1, 100) + if r <= 85 then + -- Fish + r = math.random(1, 100) + if r <= 60 then + itemname = "mcl_fishing:fish_raw" + elseif r <= 85 then + itemname = "mcl_fishing:salmon_raw" + elseif r <= 87 then + itemname = "mcl_fishing:clownfish_raw" + else + itemname = "mcl_fishing:pufferfish_raw" + end + elseif r <= 95 then + -- Junk + r = math.random(1, 83) + if r <= 10 then + itemname = "mcl_core:bowl" + elseif r <= 12 then + itemname = "mcl_fishing:fishing_rod" + itemwear = math.random(6554, 65535) -- 10%-100% damaged + elseif r <= 22 then + itemname = "mcl_mobitems:leather" + elseif r <= 32 then + itemname = "3d_armor:boots_leather" + itemwear = math.random(6554, 65535) -- 10%-100% damaged + elseif r <= 42 then + itemname = "mcl_mobitems:rotten_flesh" + elseif r <= 47 then + itemname = "mcl_core:stick" + elseif r <= 52 then + itemname = "mcl_mobitems:string" + elseif r <= 62 then + itemname = "mcl_potions:glass_bottle" + --TODO itemname = "mcl_potions:bottle_water" + elseif r <= 72 then + itemname = "mcl_mobitems:bone" + elseif r <= 73 then + itemname = "mcl_dye:black" + itemcount = 10 + else + -- TODO: Tripwire hook + itemname = "mcl_mobitems:string" + end + else + -- Treasure + r = math.random(1, 6) + if r == 1 then + -- TODO: Enchanted + itemname = "mcl_throwing:bow" + itemwear = math.random(49144, 65535) -- 75%-100% damaged + elseif r == 2 then + -- TODO: Enchanted book + itemname = "mcl_books:book" + elseif r == 3 then + -- TODO: Enchanted + itemname = "mcl_fishing:fishing_rod" + itemwear = math.random(49144, 65535) -- 75%-100% damaged + elseif r == 4 then + itemname = "mobs:nametag" + elseif r == 5 then + itemname = "mcl_mobitems:saddle" + elseif r == 6 then + itemname = "mcl_flowers:waterlily" + end + end + local inv = user:get_inventory() + local item = {name=itemname, count=itemcount, wear=itemwear, metadata=""} + if inv:room_for_item("main", item) then + inv:add_item("main", item) + end + if not minetest.setting_get("creative_mode") then + itemstack:add_wear(66000/65) -- 65 uses + end + return itemstack + end + end + return nil +end + -- Fishing Rod minetest.register_tool("mcl_fishing:fishing_rod", { description = "Fishing Rod", - groups = { tool=1 }, - inventory_image = "mcl_fishing_fishing_rod.png", - stack_max = 1, - liquids_pointable = true, - on_use = function (itemstack, user, pointed_thing) - if pointed_thing and pointed_thing.under then - local node = minetest.get_node(pointed_thing.under) - if string.find(node.name, "mcl_core:water") then - local itemname - local itemcount = 1 - local itemwear = 0 - local r = math.random(1, 100) - if r <= 85 then - -- Fish - r = math.random(1, 100) - if r <= 60 then - itemname = "mcl_fishing:fish_raw" - elseif r <= 85 then - itemname = "mcl_fishing:salmon_raw" - elseif r <= 87 then - itemname = "mcl_fishing:clownfish_raw" - else - itemname = "mcl_fishing:pufferfish_raw" - end - elseif r <= 95 then - -- Junk - r = math.random(1, 83) - if r <= 10 then - itemname = "mcl_core:bowl" - elseif r <= 12 then - itemname = "mcl_fishing:fishing_rod" - itemwear = math.random(6554, 65535) -- 10%-100% damaged - elseif r <= 22 then - itemname = "mcl_mobitems:leather" - elseif r <= 32 then - itemname = "3d_armor:boots_leather" - itemwear = math.random(6554, 65535) -- 10%-100% damaged - elseif r <= 42 then - itemname = "mcl_mobitems:rotten_flesh" - elseif r <= 47 then - itemname = "mcl_core:stick" - elseif r <= 52 then - itemname = "mcl_mobitems:string" - elseif r <= 62 then - itemname = "mcl_potions:glass_bottle" - --TODO itemname = "mcl_potions:bottle_water" - elseif r <= 72 then - itemname = "mcl_mobitems:bone" - elseif r <= 73 then - itemname = "mcl_dye:black" - itemcount = 10 - else - -- TODO: Tripwire hook - itemname = "mcl_mobitems:string" - end - else - -- Treasure - r = math.random(1, 6) - if r == 1 then - -- TODO: Enchanted - itemname = "mcl_throwing:bow" - itemwear = math.random(49144, 65535) -- 75%-100% damaged - elseif r == 2 then - -- TODO: Enchanted book - itemname = "mcl_books:book" - elseif r == 3 then - -- TODO: Enchanted - itemname = "mcl_fishing:fishing_rod" - itemwear = math.random(49144, 65535) -- 75%-100% damaged - elseif r == 4 then - itemname = "mobs:nametag" - elseif r == 5 then - itemname = "mcl_mobitems:saddle" - elseif r == 6 then - itemname = "mcl_flowers:waterlily" - end - end - local inv = user:get_inventory() - local item = {name=itemname, count=itemcount, wear=itemwear, metadata=""} - if inv:room_for_item("main", item) then - inv:add_item("main", item) - end - if not minetest.setting_get("creative_mode") then - itemstack:add_wear(66000/65) -- 65 uses - end - return itemstack - end - end - return nil - end, + groups = { tool=1 }, + inventory_image = "mcl_fishing_fishing_rod.png", + stack_max = 1, + liquids_pointable = true, + on_place = go_fishing, }) minetest.register_craft({