diff --git a/mods/_misc/aliases.lua b/mods/_misc/aliases.lua index fdd408e3..33296865 100755 --- a/mods/_misc/aliases.lua +++ b/mods/_misc/aliases.lua @@ -25,3 +25,6 @@ minetest.register_alias("torches:wand", "default:torch") -- Remove copper_rail from moreores => utilisation des rail_copper du mod carts minetest.register_alias("moreores:copper_rail", "carts:rail_copper") +-- Old fishing mod to the new fishing mod +minetest.register_alias("fishing:fish", "fishing:fish_cooked") +minetest.register_alias("fishing:worm", "fishing:bait_worm") \ No newline at end of file diff --git a/mods/fishing/.gitattributes b/mods/fishing/.gitattributes new file mode 100755 index 00000000..412eeda7 --- /dev/null +++ b/mods/fishing/.gitattributes @@ -0,0 +1,22 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/mods/fishing/.gitignore b/mods/fishing/.gitignore new file mode 100755 index 00000000..b9d6bd92 --- /dev/null +++ b/mods/fishing/.gitignore @@ -0,0 +1,215 @@ +################# +## Eclipse +################# + +*.pydevproject +.project +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.classpath +.settings/ +.loadpath + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + + +################# +## Visual Studio +################# + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results + +[Dd]ebug/ +[Rr]elease/ +x64/ +build/ +[Bb]in/ +[Oo]bj/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.log +*.scc + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +*.ncrunch* +.*crunch*.local.xml + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.Publish.xml +*.pubxml + +# NuGet Packages Directory +## TODO: If you have NuGet Package Restore enabled, uncomment the next line +#packages/ + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +sql/ +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.[Pp]ublish.xml +*.pfx +*.publishsettings + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +App_Data/*.mdf +App_Data/*.ldf + +############# +## Windows detritus +############# + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Mac crap +.DS_Store + + +############# +## Python +############# + +*.py[co] + +# Packages +*.egg +*.egg-info +dist/ +build/ +eggs/ +parts/ +var/ +sdist/ +develop-eggs/ +.installed.cfg + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox + +#Translations +*.mo + +#Mr Developer +.mr.developer.cfg diff --git a/mods/fishing/bobber.lua b/mods/fishing/bobber.lua new file mode 100755 index 00000000..5600c58b --- /dev/null +++ b/mods/fishing/bobber.lua @@ -0,0 +1,310 @@ +----------------------------------------------------------------------------------------------- +-- Fishing - Mossmanikin's version - Bobber 0.1.7 +-- License (code & textures): WTFPL +-- Contains code from: fishing (original), mobs, throwing, volcano +-- Supports: 3d_armor, animal_clownfish, animal_fish_blue_white, animal_rat, flowers_plus, mobs, seaplants +----------------------------------------------------------------------------------------------- + +local PoLeWeaR = (65535/(30-(math.random(15, 29)))) +local BooTSWear = (2000*(math.random(20, 29))) +-- Here's what you can catch +local CaTCH = { +-- MoD iTeM WeaR MeSSaGe ("You caught "..) GeTBaiTBack NRMiN CHaNCe (../120) + {"fishing", "fish_raw", 0, "a Fish.", false, 1, 60}, + {"animal_clownfish", "clownfish", 0, "a Clownfish.", false, 61, 10}, + {"animal_fish_blue_white", "fish_blue_white", 0, "a Blue white fish.", false, 71, 10}, + {"default", "stick", 0, "a Twig.", true, 81, 2}, + {"mobs", "rat", 0, "a Rat.", false, 83, 1}, + {"animal_rat", "rat", 0, "a Rat.", false, 84, 1}, + {"", "rat", 0, "a Rat.", false, 85, 1}, + {"flowers_plus", "seaweed", 0, "some Seaweed.", true, 86, 20}, + {"seaplants", "kelpgreen", 0, "a Green Kelp.", true, 106, 10}, + {"farming", "string", 0, "a String.", true, 116, 2}, + {"fishing", "pole", PoLeWeaR, "an old Fishing Pole.", true, 118, 2}, + {"3d_armor", "boots_wood", BooTSWear, "some very old Boots.", true, 120, 1}, + {"trunks", "twig_1", 0, "a Twig.", true, 121, 2}, +} +minetest.register_alias("flowers_plus:seaweed", "flowers:seaweed") -- exception + +local PLaNTS = { + -- MoD* iTeM MeSSaGe ("You caught "..) + {"flowers", "waterlily", "a Waterlily." }, + {"flowers", "waterlily_225", "a Waterlily." }, + {"flowers", "waterlily_45", "a Waterlily." }, + {"flowers", "waterlily_675", "a Waterlily." }, + {"flowers", "waterlily_s1", "a Waterlily." }, + {"flowers", "waterlily_s2", "a Waterlily." }, + {"flowers", "waterlily_s3", "a Waterlily." }, + {"flowers", "waterlily_s4", "a Waterlily." }, + {"flowers", "seaweed", "some Seaweed."}, + {"flowers", "seaweed_2", "some Seaweed."}, + {"flowers", "seaweed_3", "some Seaweed."}, + {"flowers", "seaweed_4", "some Seaweed."}, + {"trunks", "twig_1", "a Twig." }, + {"trunks", "twig_2", "a Twig." }, + {"trunks", "twig_3", "a Twig." }, + {"trunks", "twig_4", "a Twig." }, + {"trunks", "twig_5", "a Twig." }, + {"trunks", "twig_7", "a Twig." }, + {"trunks", "twig_8", "a Twig." }, + {"trunks", "twig_9", "a Twig." }, + {"trunks", "twig_10", "a Twig." }, + {"trunks", "twig_11", "a Twig." }, + {"trunks", "twig_12", "a Twig." }, + {"trunks", "twig_13", "a Twig." }, +} +-- *as used in the node name + +local MoBS = { -- not in use + -- iTeM MeSSaGe ("You caught "..) + {"animal_clownfish:clownfish", "a Clownfish." }, + {"animal_fish_blue_white:fish_blue_white", "a Blue white fish."}, +} + +minetest.register_node("fishing:bobber_box", { + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { +-- { left, bottom, front, right, top , back} + {-8/16, -8/16, 0, 8/16, 8/16, 0}, -- feathers + {-2/16, -8/16, -2/16, 2/16, -4/16, 2/16}, -- bobber + } + }, + tiles = { + "fishing_bobber_top.png", + "fishing_bobber_bottom.png", + "fishing_bobber.png", + "fishing_bobber.png", + "fishing_bobber.png", + "fishing_bobber.png^[transformFX" + }, -- + groups = {not_in_creative_inventory=1}, +}) + +local FISHING_BOBBER_ENTITY={ + hp_max = 605, + water_damage = 1, + physical = true, + timer = 0, + env_damage_timer = 0, + visual = "wielditem", + visual_size = {x=1/3, y=1/3, z=1/3}, + textures = {"fishing:bobber_box"}, + -- {left ,bottom, front, right, top , back} + collisionbox = {-2/16, -4/16, -2/16, 2/16, 0/16, 2/16}, + view_range = 7, +-- DESTROY BOBBER WHEN PUNCHING IT + on_punch = function (self, puncher, time_from_last_punch, tool_capabilities, dir) + local player = puncher:get_player_name() + local inv = puncher:get_inventory() + if MESSAGES == true then minetest.chat_send_player(player, "You didn't catch anything.", false) end -- fish escaped + if not minetest.setting_getbool("creative_mode") then + if inv:room_for_item("main", {name="fishing:bait_worm", count=1, wear=0, metadata=""}) then + inv:add_item("main", {name="fishing:bait_worm", count=1, wear=0, metadata=""}) + if MESSAGES == true then minetest.chat_send_player(player, "The bait is still there.", false) end -- bait still there + end + end + -- make sound and remove bobber + minetest.sound_play("fishing_bobber1", { + pos = self.object:getpos(), + gain = 0.5, + }) + self.object:remove() + end, +-- WHEN RIGHTCLICKING THE BOBBER THE FOLLOWING HAPPENS (CLICK AT THE RIGHT TIME WHILE HOLDING A FISHING POLE) + on_rightclick = function (self, clicker) + local item = clicker:get_wielded_item() + local player = clicker:get_player_name() + if item:get_name() == "fishing:pole" then + local inv = clicker:get_inventory() + local say = minetest.chat_send_player + local pos = self.object:getpos() + -- catch visible plant + if minetest.get_node(pos).name ~= "air" then + for i in ipairs(PLaNTS) do + local PLaNT = PLaNTS[i][1]..":"..PLaNTS[i][2] + local MeSSaGe = PLaNTS[i][3] + local DRoP = minetest.registered_nodes[PLaNT].drop + if minetest.get_node(pos).name == PLaNT then + minetest.add_node({x=pos.x, y=pos.y, z=pos.z}, {name="air"}) + if inv:room_for_item("main", {name=DRoP, count=1, wear=0, metadata=""}) then + inv:add_item("main", {name=DRoP, count=1, wear=0, metadata=""}) + if MESSAGES == true then say(player, "You caught "..MeSSaGe, false) end -- caught Plant + end + if not minetest.setting_getbool("creative_mode") then + if inv:room_for_item("main", {name="fishing:bait_worm", count=1, wear=0, metadata=""}) then + inv:add_item("main", {name="fishing:bait_worm", count=1, wear=0, metadata=""}) + if MESSAGES == true then say(player, "The bait is still there.", false) end -- bait still there + end + end + end + end + --end + elseif minetest.get_node(pos).name == "air" then + -- catch visible fish and invisible stuff + if self.object:get_hp() <= 300 then + if math.random(1, 100) < FISH_CHANCE then + local chance = math.random(1, 122) -- ><((((º> + for i in pairs(CaTCH) do + local MoD = CaTCH[i][1] + local iTeM = CaTCH[i][2] + local WeaR = CaTCH[i][3] + local MeSSaGe = CaTCH[i][4] + local GeTBaiTBack = CaTCH[i][5] + local NRMiN = CaTCH[i][6] + local CHaNCe = CaTCH[i][7] + local NRMaX = NRMiN + CHaNCe - 1 + if chance <= NRMaX and chance >= NRMiN then + if minetest.get_modpath(MoD) ~= nil then + -- remove visible fish, if there + local find_fish = minetest.get_objects_inside_radius({x=pos.x,y=pos.y+0.5,z=pos.z}, 1) + for k, obj in pairs(find_fish) do + if obj:get_luaentity() ~= nil and obj:get_luaentity().name == "animal_fish_blue_white:fish_blue_white" then + MoD = "animal_fish_blue_white" + iTeM = "fish_blue_white" + WeaR = 0 + MeSSaGe = "a Blue white fish." + obj:remove() + end + end + -- add (in)visible fish to inventory + if inv:room_for_item("main", {name=MoD..":"..iTeM, count=1, wear=WeaR, metadata=""}) then + inv:add_item("main", {name=MoD..":"..iTeM, count=1, wear=WeaR, metadata=""}) + if MESSAGES == true then say(player, "You caught "..MeSSaGe, false) end -- caught somethin' + end + if not minetest.setting_getbool("creative_mode") then + if GeTBaiTBack == true then + if inv:room_for_item("main", {name="fishing:bait_worm", count=1, wear=0, metadata=""}) then + inv:add_item("main", {name="fishing:bait_worm", count=1, wear=0, metadata=""}) + if MESSAGES == true then say(player, "The bait is still there.", false) end -- bait still there? + end + end + end + else + if inv:room_for_item("main", {name="fishing:fish_raw", count=1, wear=0, metadata=""}) then + inv:add_item("main", {name="fishing:fish_raw", count=1, wear=0, metadata=""}) + if MESSAGES == true then say(player, "You caught a Fish.", false) end -- caught Fish + end + end + end + end + else --if math.random(1, 100) > FISH_CHANCE then + if MESSAGES == true then say(player, "Your fish escaped.", false) end -- fish escaped + end + end + if self.object:get_hp() > 300 and minetest.get_node(pos).name == "air" then + if MESSAGES == true then say(player, "You didn't catch anything.", false) end -- fish escaped + if not minetest.setting_getbool("creative_mode") then + if math.random(1, 2) == 1 then + if inv:room_for_item("main", {name="fishing:bait_worm", count=1, wear=0, metadata=""}) then + inv:add_item("main", {name="fishing:bait_worm", count=1, wear=0, metadata=""}) + if MESSAGES == true then say(player, "The bait is still there.", false) end -- bait still there + end + end + end + end + end + end + -- weither player has fishing pole or not + -- make sound and remove bobber + minetest.sound_play("fishing_bobber1", { + pos = self.object:getpos(), + gain = 0.5, + }) + self.object:remove() + end, +-- AS SOON AS THE BOBBER IS PLACED IT WILL ACT LIKE + on_step = function(self, dtime) + local pos = self.object:getpos() + if BOBBER_CHECK_RADIUS > 0 then + local objs = minetest.get_objects_inside_radius(pos, BOBBER_CHECK_RADIUS) + for k, obj in pairs(objs) do + if obj:get_luaentity() ~= nil then + if obj:get_luaentity().name == "fishing:bobber_entity" then + if obj:get_luaentity() ~= self then + self.object:remove() + end + end + end + end + end + + if math.random(1, 4) == 1 then + self.object:setyaw(self.object:getyaw()+((math.random(0,360)-180)/2880*math.pi)) + end + for _,player in pairs(minetest.get_connected_players()) do + local s = self.object:getpos() + local p = player:getpos() + local dist = ((p.x-s.x)^2 + (p.y-s.y)^2 + (p.z-s.z)^2)^0.5 + if dist > self.view_range then + -- make sound and remove bobber + minetest.sound_play("fishing_bobber1", { + pos = self.object:getpos(), + gain = 0.5, + }) + self.object:remove() + end + end + + if self.object:get_hp() > 310 then + local find_fish = minetest.get_objects_inside_radius({x=pos.x,y=pos.y+0.5,z=pos.z}, 1) + for k, obj in pairs(find_fish) do + if obj:get_luaentity() ~= nil then + if obj:get_luaentity().name == "animal_fish_blue_white:fish_blue_white" then + if math.random(1, 30) == 1 then + self.object:set_hp(310) + end + end + end + end + end + + + local do_env_damage = function(self) + self.object:set_hp(self.object:get_hp()-self.water_damage) + if self.object:get_hp() == 600 then + self.object:moveto({x=pos.x,y=pos.y-0.015625,z=pos.z}) + elseif self.object:get_hp() == 595 then + self.object:moveto({x=pos.x,y=pos.y+0.015625,z=pos.z}) + elseif self.object:get_hp() == 590 then + self.object:moveto({x=pos.x,y=pos.y+0.015625,z=pos.z}) + elseif self.object:get_hp() == 585 then + self.object:moveto({x=pos.x,y=pos.y-0.015625,z=pos.z}) + self.object:set_hp(self.object:get_hp()-(math.random(1, 275))) + elseif self.object:get_hp() == 300 then + minetest.sound_play("fishing_bobber1", { + pos = self.object:getpos(), + gain = 0.5, + }) + minetest.add_particlespawner(30, 0.5, -- for how long (?) -- Particles on splash + {x=pos.x,y=pos.y-0.0625,z=pos.z}, {x=pos.x,y=pos.y,z=pos.z}, -- position min, pos max + {x=-2,y=-0.0625,z=-2}, {x=2,y=3,z=2}, -- velocity min, vel max + {x=0,y=-9.8,z=0}, {x=0,y=-9.8,z=0}, + 0.3, 1.2, + 0.25, 0.5, -- min size, max size + false, "default_snow.png") + self.object:moveto({x=pos.x,y=pos.y-0.0625,z=pos.z}) + elseif self.object:get_hp() == 295 then + self.object:moveto({x=pos.x,y=pos.y+0.0625,z=pos.z}) + elseif self.object:get_hp() == 290 then + self.object:moveto({x=pos.x,y=pos.y+0.0625,z=pos.z}) + elseif self.object:get_hp() == 285 then + self.object:moveto({x=pos.x,y=pos.y-0.1,z=pos.z}) + elseif self.object:get_hp() < 284 then + self.object:moveto({x=pos.x+(0.001*(math.random(-8, 8))),y=pos.y,z=pos.z+(0.001*(math.random(-8, 8)))}) + self.object:setyaw(self.object:getyaw()+((math.random(0,360)-180)/1440*math.pi)) + elseif self.object:get_hp() == 0 then + -- make sound and remove bobber + minetest.sound_play("fishing_bobber1", { + pos = self.object:getpos(), + gain = 0.5, + }) + self.object:remove() + end + end + do_env_damage(self) + end, +} + +minetest.register_entity("fishing:bobber_entity", FISHING_BOBBER_ENTITY) \ No newline at end of file diff --git a/mods/fishing/bobber_shark.lua b/mods/fishing/bobber_shark.lua new file mode 100755 index 00000000..858f5327 --- /dev/null +++ b/mods/fishing/bobber_shark.lua @@ -0,0 +1,223 @@ +----------------------------------------------------------------------------------------------- +-- Fishing - Mossmanikin's version - Bobber Shark 0.0.6 +-- License (code & textures): WTFPL +----------------------------------------------------------------------------------------------- + +-- Here's what you can catch if you use a fish as bait +local CaTCH_BiG = { +-- MoD iTeM WeaR MeSSaGe ("You caught "..) GeTBaiTBack NRMiN CHaNCe (../120) + {"fishing", "shark", 0, "a small Shark.", false, 1, 2}, + {"fishing", "pike", 0, "a Northern Pike.", false, 3, 3} +} + +local PLaNTS = { + -- MoD* iTeM MeSSaGe ("You caught "..) + {"flowers", "waterlily", "a Waterlily." }, + {"flowers", "waterlily_225", "a Waterlily." }, + {"flowers", "waterlily_45", "a Waterlily." }, + {"flowers", "waterlily_675", "a Waterlily." }, + {"flowers", "waterlily_s1", "a Waterlily." }, + {"flowers", "waterlily_s2", "a Waterlily." }, + {"flowers", "waterlily_s3", "a Waterlily." }, + {"flowers", "waterlily_s4", "a Waterlily." }, + {"flowers", "seaweed", "some Seaweed."}, + {"flowers", "seaweed_2", "some Seaweed."}, + {"flowers", "seaweed_3", "some Seaweed."}, + {"flowers", "seaweed_4", "some Seaweed."}, + {"trunks", "twig_1", "a Twig." }, + {"trunks", "twig_2", "a Twig." }, + {"trunks", "twig_3", "a Twig." }, + {"trunks", "twig_4", "a Twig." }, + {"trunks", "twig_5", "a Twig." }, + {"trunks", "twig_7", "a Twig." }, + {"trunks", "twig_8", "a Twig." }, + {"trunks", "twig_9", "a Twig." }, + {"trunks", "twig_10", "a Twig." }, + {"trunks", "twig_11", "a Twig." }, + {"trunks", "twig_12", "a Twig." }, + {"trunks", "twig_13", "a Twig." }, +} +-- *as used in the node name + +local FISHING_BOBBER_ENTITY_SHARK={ + hp_max = 605, + water_damage = 1, + physical = true, + timer = 0, + env_damage_timer = 0, + visual = "wielditem", + visual_size = {x=1/3, y=1/3, z=1/3}, + textures = {"fishing:bobber_box"}, + -- {left ,bottom, front, right, top , back} + collisionbox = {-2/16, -4/16, -2/16, 2/16, 0/16, 2/16}, + view_range = 7, +-- DESTROY BOBBER WHEN PUNCHING IT + on_punch = function (self, puncher, time_from_last_punch, tool_capabilities, dir) + local player = puncher:get_player_name() + if MESSAGES == true then minetest.chat_send_player(player, "Your fish escaped.", false) end -- fish escaped + minetest.sound_play("fishing_bobber1", { + pos = self.object:getpos(), + gain = 0.5, + }) + self.object:remove() + end, +-- WHEN RIGHTCLICKING THE BOBBER THE FOLLOWING HAPPENS (CLICK AT THE RIGHT TIME WHILE HOLDING A FISHING POLE) + on_rightclick = function (self, clicker) + local item = clicker:get_wielded_item() + local player = clicker:get_player_name() + local say = minetest.chat_send_player + if item:get_name() == "fishing:pole" then + local inv = clicker:get_inventory() + local pos = self.object:getpos() + -- catch visible plant + if minetest.get_node(pos).name ~= "air" then + for i in ipairs(PLaNTS) do + local PLaNT = PLaNTS[i][1]..":"..PLaNTS[i][2] + local MeSSaGe = PLaNTS[i][3] + local DRoP = minetest.registered_nodes[PLaNT].drop + if minetest.get_node(pos).name == PLaNT then + minetest.add_node({x=pos.x, y=pos.y, z=pos.z}, {name="air"}) + if inv:room_for_item("main", {name=DRoP, count=1, wear=0, metadata=""}) then + inv:add_item("main", {name=DRoP, count=1, wear=0, metadata=""}) + if MESSAGES == true then say(player, "You caught "..MeSSaGe, false) end -- caught Plant + end + if not minetest.setting_getbool("creative_mode") then + if inv:room_for_item("main", {name="fishing:fish_raw", count=1, wear=0, metadata=""}) then + inv:add_item("main", {name="fishing:bait_worm", count=1, wear=0, metadata=""}) + if MESSAGES == true then say(player, "The bait is still there.", false) end -- bait still there + end + end + end + end + end + --elseif minetest.get_node(pos).name == "air" then + if self.object:get_hp() <= 300 then + if math.random(1, 100) < SHARK_CHANCE then + local chance = math.random(1, 5) -- ><((((º> + for i in pairs(CaTCH_BiG) do + local MoD = CaTCH_BiG[i][1] + local iTeM = CaTCH_BiG[i][2] + local WeaR = CaTCH_BiG[i][3] + local MeSSaGe = CaTCH_BiG[i][4] + local GeTBaiTBack = CaTCH_BiG[i][5] + local NRMiN = CaTCH_BiG[i][6] + local CHaNCe = CaTCH_BiG[i][7] + local NRMaX = NRMiN + CHaNCe - 1 + if chance <= NRMaX and chance >= NRMiN then + if minetest.get_modpath(MoD) ~= nil then + if inv:room_for_item("main", {name=MoD..":"..iTeM, count=1, wear=WeaR, metadata=""}) then + inv:add_item("main", {name=MoD..":"..iTeM, count=1, wear=WeaR, metadata=""}) + if MESSAGES == true then say(player, "You caught "..MeSSaGe, false) end -- caught somethin' + end + if not minetest.setting_getbool("creative_mode") then + if GeTBaiTBack == true then + if inv:room_for_item("main", {name="fishing:fish_raw", count=1, wear=0, metadata=""}) then + inv:add_item("main", {name="fishing:fish_raw", count=1, wear=0, metadata=""}) + if MESSAGES == true then say(player, "The bait is still there.", false) end -- bait still there? + end + end + end + end + end + end + else --if math.random(1, 100) > FISH_CHANCE then + if MESSAGES == true then say(player, "Your fish escaped.", false) end -- fish escaped + end + end + if self.object:get_hp() > 300 and minetest.get_node(pos).name == "air" then + if MESSAGES == true then say(player, "You didn't catch any fish.", false) end -- fish escaped + if not minetest.setting_getbool("creative_mode") then + if math.random(1, 3) == 1 then + if inv:room_for_item("main", {name="fishing:fish_raw", count=1, wear=0, metadata=""}) then + inv:add_item("main", {name="fishing:fish_raw", count=1, wear=0, metadata=""}) + if MESSAGES == true then say(player, "The bait is still there.", false) end -- bait still there + end + end + end + end + --end + else + if MESSAGES == true then say(player, "Your fish escaped.", false) end -- fish escaped + end + minetest.sound_play("fishing_bobber1", { + pos = self.object:getpos(), + gain = 0.5, + }) + self.object:remove() + end, +-- AS SOON AS THE BOBBER IS PLACED IT WILL ACT LIKE + on_step = function(self, dtime) + local pos = self.object:getpos() + if BOBBER_CHECK_RADIUS > 0 then + local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, BOBBER_CHECK_RADIUS) + for k, obj in pairs(objs) do + if obj:get_luaentity() ~= nil then + if obj:get_luaentity().name == "fishing:bobber_entity_shark" then + if obj:get_luaentity() ~= self then + self.object:remove() + end + end + end + end + end + if math.random(1, 4) == 1 then + self.object:setyaw(self.object:getyaw()+((math.random(0,360)-180)/2880*math.pi)) + end + for _,player in pairs(minetest.get_connected_players()) do + local s = self.object:getpos() + local p = player:getpos() + local dist = ((p.x-s.x)^2 + (p.y-s.y)^2 + (p.z-s.z)^2)^0.5 + if dist > self.view_range then + minetest.sound_play("fishing_bobber1", { + pos = self.object:getpos(), + gain = 0.5, + }) + self.object:remove() + end + end + local do_env_damage = function(self) + self.object:set_hp(self.object:get_hp()-self.water_damage) + if self.object:get_hp() == 600 then + self.object:moveto({x=pos.x,y=pos.y-0.015625,z=pos.z}) + elseif self.object:get_hp() == 595 then + self.object:moveto({x=pos.x,y=pos.y+0.015625,z=pos.z}) + elseif self.object:get_hp() == 590 then + self.object:moveto({x=pos.x,y=pos.y+0.015625,z=pos.z}) + elseif self.object:get_hp() == 585 then + self.object:moveto({x=pos.x,y=pos.y-0.015625,z=pos.z}) + self.object:set_hp(self.object:get_hp()-(math.random(1, 200))) + elseif self.object:get_hp() == 300 then + minetest.sound_play("fishing_bobber1", { + pos = self.object:getpos(), + gain = 0.7, + }) + minetest.add_particlespawner(40, 0.5, -- for how long (?) -- Particles on splash + {x=pos.x,y=pos.y-0.0625,z=pos.z}, {x=pos.x,y=pos.y-0.2,z=pos.z}, -- position min, pos max + {x=-3,y=-0.0625,z=-3}, {x=3,y=5,z=3}, -- velocity min, vel max + {x=0,y=-9.8,z=0}, {x=0,y=-9.8,z=0}, + 0.3, 2.4, + 0.25, 0.5, -- min size, max size + false, "default_snow.png") + self.object:moveto({x=pos.x,y=pos.y-0.625,z=pos.z}) + elseif self.object:get_hp() == 295 then + self.object:moveto({x=pos.x,y=pos.y+0.425,z=pos.z}) + elseif self.object:get_hp() == 290 then + self.object:moveto({x=pos.x,y=pos.y+0.0625,z=pos.z}) + elseif self.object:get_hp() == 285 then + self.object:moveto({x=pos.x,y=pos.y-0.0625,z=pos.z}) + elseif self.object:get_hp() < 284 then + self.object:moveto({x=pos.x+(0.001*(math.random(-8, 8))),y=pos.y,z=pos.z+(0.001*(math.random(-8, 8)))}) + self.object:setyaw(self.object:getyaw()+((math.random(0,360)-180)/720*math.pi)) + elseif self.object:get_hp() == 0 then + minetest.sound_play("fishing_bobber1", { + pos = self.object:getpos(), + gain = 0.5, + }) + self.object:remove() + end + end + do_env_damage(self) + end, +} + +minetest.register_entity("fishing:bobber_entity_shark", FISHING_BOBBER_ENTITY_SHARK) \ No newline at end of file diff --git a/mods/fishing/crafting.lua b/mods/fishing/crafting.lua new file mode 100755 index 00000000..247e190d --- /dev/null +++ b/mods/fishing/crafting.lua @@ -0,0 +1,95 @@ +----------------------------------------------------------------------------------------------- +-- Fishing - Mossmanikin's version - Recipes 0.0.8 +----------------------------------------------------------------------------------------------- +-- License (code & textures): WTFPL +-- Contains code from: animal_clownfish, animal_fish_blue_white, fishing (original), stoneage +-- Looked at code from: +-- Dependencies: default, farming +-- Supports: animal_clownfish, animal_fish_blue_white, animal_rat, mobs +----------------------------------------------------------------------------------------------- + +----------------------------------------------------------------------------------------------- +-- Fishing Pole +----------------------------------------------------------------------------------------------- +-- mc style +minetest.register_craft({ + output = "fishing:pole", + recipe = { + {"", "", "default:stick" }, + {"", "default:stick", "farming:string"}, + {"default:stick", "", "farming:string"}, + } +}) + +minetest.register_craft({ + output = "fishing:pole", + recipe = { + {"", "", "default:stick" }, + {"", "default:stick", "moreblocks:rope"}, + {"default:stick", "", "moreblocks:rope"}, + } +}) + +minetest.register_craft({ + output = "fishing:pole", + recipe = { + {"", "", "default:stick" }, + {"", "default:stick", "ropes:rope" }, + {"default:stick", "", "ropes:rope" }, + } +}) + + +----------------------------------------------------------------------------------------------- +-- Roasted Fish +----------------------------------------------------------------------------------------------- +minetest.register_craft({ + type = "cooking", + output = "fishing:fish", + recipe = "fishing:fish_raw", + cooktime = 2, +}) + +----------------------------------------------------------------------------------------------- +-- Wheat Seed +----------------------------------------------------------------------------------------------- +minetest.register_craft({ + type = "shapeless", + output = "farming:seed_wheat", + recipe = {"farming:wheat"}, +}) +----------------------------------------------------------------------------------------------- +-- Sushi +----------------------------------------------------------------------------------------------- +minetest.register_craft({ + type = "shapeless", + output = "fishing:sushi", + recipe = {"fishing:fish_raw","farming:seed_wheat","flowers:seaweed"}, +}) + +minetest.register_craft({ + type = "shapeless", + output = "fishing:sushi", + recipe = {"fishing:fish_raw","farming:seed_wheat","seaplants:kelpgreen"}, + +}) + +----------------------------------------------------------------------------------------------- +-- Roasted Shark +----------------------------------------------------------------------------------------------- +minetest.register_craft({ + type = "cooking", + output = "fishing:shark_cooked", + recipe = "fishing:shark", + cooktime = 2, +}) + +----------------------------------------------------------------------------------------------- +-- Roasted Pike +----------------------------------------------------------------------------------------------- +minetest.register_craft({ + type = "cooking", + output = "fishing:pike_cooked", + recipe = "fishing:pike", + cooktime = 2, +}) diff --git a/mods/fishing/depends.txt b/mods/fishing/depends.txt index 331d858c..d77ba253 100755 --- a/mods/fishing/depends.txt +++ b/mods/fishing/depends.txt @@ -1 +1,2 @@ -default \ No newline at end of file +default +farming diff --git a/mods/fishing/fishes.lua b/mods/fishing/fishes.lua new file mode 100755 index 00000000..1290e1c2 --- /dev/null +++ b/mods/fishing/fishes.lua @@ -0,0 +1,70 @@ +----------------------------------------------------------------------------------------------- +-- Fishing - Mossmanikin's version - Fishes 0.0.4 +-- License (code & textures): WTFPL +----------------------------------------------------------------------------------------------- + +----------------------------------------------------------------------------------------------- +-- Fish +----------------------------------------------------------------------------------------------- +minetest.register_craftitem("fishing:fish_raw", { + description = "Fish", + groups = {}, + inventory_image = "fishing_fish.png", + on_use = minetest.item_eat(2), +}) + ----------------------------------------------------- + -- Roasted Fish + ----------------------------------------------------- + minetest.register_craftitem("fishing:fish", { + description = "Roasted Fish", + groups = {}, + inventory_image = "fishing_fish_cooked.png", + on_use = minetest.item_eat(4), + }) + ----------------------------------------------------- + -- Sushi + ----------------------------------------------------- + minetest.register_craftitem("fishing:sushi", { + description = "Sushi (Hoso Maki)", + groups = {}, + inventory_image = "fishing_sushi.png", + on_use = minetest.item_eat(6), + }) + +----------------------------------------------------------------------------------------------- +-- Whatthef... it's a freakin' Shark! +----------------------------------------------------------------------------------------------- +minetest.register_craftitem("fishing:shark", { + description = "Shark", + groups = {}, + inventory_image = "fishing_shark.png", + on_use = minetest.item_eat(2), +}) + ----------------------------------------------------- + -- Roasted Shark + ----------------------------------------------------- + minetest.register_craftitem("fishing:shark_cooked", { + description = "Roasted Shark", + groups = {}, + inventory_image = "fishing_shark_cooked.png", + on_use = minetest.item_eat(6), + }) + +----------------------------------------------------------------------------------------------- +-- Pike +----------------------------------------------------------------------------------------------- +minetest.register_craftitem("fishing:pike", { + description = "Northern Pike", + groups = {}, + inventory_image = "fishing_pike.png", + on_use = minetest.item_eat(2), +}) + ----------------------------------------------------- + -- Roasted Pike + ----------------------------------------------------- + minetest.register_craftitem("fishing:pike_cooked", { + description = "Roasted Northern Pike", + groups = {}, + inventory_image = "fishing_pike_cooked.png", + on_use = minetest.item_eat(6), + }) \ No newline at end of file diff --git a/mods/fishing/fishing.lua b/mods/fishing/fishing.lua deleted file mode 100755 index c5cf5d92..00000000 --- a/mods/fishing/fishing.lua +++ /dev/null @@ -1,86 +0,0 @@ --- Raw Fish (Thanks to Altairas for her Fish image on DeviantArt) -minetest.register_craftitem("fishing:fish_raw", { - description = "Raw Fish", - inventory_image = "fish_raw.png", - on_use = minetest.item_eat(2), -}) - --- Cooked Fish -minetest.register_craftitem("fishing:fish_cooked", { - description = "Cooked Fish", - inventory_image = "fish_cooked.png", - on_use = minetest.item_eat(5), -}) - --- Worm -minetest.register_craftitem("fishing:worm", { - description = "Worm", - inventory_image = "worm.png", -}) - --- Fishing Rod -minetest.register_craftitem("fishing:fishing_rod", { - description = "Fishing Rod", - inventory_image = "fishing_rod.png", - stack_max = 1, - liquids_pointable = true, -}) - --- Fishing Rod (Baited) -minetest.register_craftitem("fishing:fishing_rod_baited", { - description = "Baited Fishing Rod", - inventory_image = "fishing_rod_baited.png", - wield_image = "fishing_rod_wield.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, "default:water_source") then - if math.random(1, 100) < 5 then - local inv = user:get_inventory() - if inv:room_for_item("main", {name="fishing:fish_raw"}) then - inv:add_item("main", {name="fishing:fish_raw"}) - return {name="fishing:fishing_rod"} - else - minetest.chat_send_player(user:get_player_name(), "Your Fish Got Away! Inventory Too Full") - end - end - end - end - end, -}) - --- Fishing Rod -minetest.register_craft({ - output = "fishing:fishing_rod", - recipe = { - {"","","default:stick"}, - {"", "default:stick", "farming:string"}, - {"default:stick", "", "farming:string"}, - } -}) - --- Sift through 4 Dirt Blocks to find Worm -minetest.register_craft({ - output = "fishing:worm", - recipe = { - {"default:dirt","default:dirt"}, - {"default:dirt","default:dirt"}, - } -}) - --- Cooking Fish -minetest.register_craft({ - type = "cooking", - output = "fishing:fish_cooked", - recipe = "fishing:fish_raw", - cooktime = 2, -}) - --- Baiting Fishing Rod -minetest.register_craft({ - type = "shapeless", - output = "fishing:fishing_rod_baited", - recipe = {"fishing:fishing_rod", "fishing:worm"}, -}) diff --git a/mods/fishing/init.lua b/mods/fishing/init.lua index 575988e6..6487db9e 100755 --- a/mods/fishing/init.lua +++ b/mods/fishing/init.lua @@ -1,16 +1,344 @@ ---[[ - Fishing mod extraced out of: +----------------------------------------------------------------------------------------------- +local title = "Fishing - Mossmanikin's version" +local version = "0.2.3" +local mname = "fishing" +----------------------------------------------------------------------------------------------- +-- original by wulfsdad (http://forum.minetest.net/viewtopic.php?id=4375) +-- this version by Mossmanikin (https://forum.minetest.net/viewtopic.php?id=6480) +-- License (code & textures): WTFPL +-- Contains code from: animal_clownfish, animal_fish_blue_white, fishing (original), stoneage +-- Looked at code from: default, farming +-- Dependencies: default +-- Supports: animal_clownfish, animal_fish_blue_white, animal_rat, mobs +----------------------------------------------------------------------------------------------- - Minetest Ethereal Mod 1.08 (https://forum.minetest.net/viewtopic.php?f=11&t=7656) +-- todo: item wear done +-- automatic re-baiting option done (but not optional) +-- different types of fish, done, but not finished +-- add sound done +-- bobber done +-- change rainworms filling inv & make 'em disappear done - Created by ChinChow +-- placable fishing rod for decoration done +-- make bobber move slowly while fish on hook done +-- catch bigger fish with smaller done, but not finished +-- change color of bobber when fish on hook done - Updated by TenPlus1 +----------------------------------------------------------------------------------------------- - Extracted with little changes by Xanthin +dofile(minetest.get_modpath("fishing").."/settings.txt") +dofile(minetest.get_modpath("fishing").."/bobber.lua") +dofile(minetest.get_modpath("fishing").."/bobber_shark.lua") +dofile(minetest.get_modpath("fishing").."/crafting.lua") +dofile(minetest.get_modpath("fishing").."/fishes.lua") +dofile(minetest.get_modpath("fishing").."/worm.lua") +dofile(minetest.get_modpath("fishing").."/trophies.lua") -]] +----------------------------------------------------------------------------------------------- +-- Fishing Pole +----------------------------------------------------------------------------------------------- -fishing = {} -dofile(minetest.get_modpath("fishing").."/fishing.lua") ---dofile(minetest.get_modpath("fishing").."/sealife.lua") +local function rod_wear(itemstack, user, pointed_thing, uses) + itemstack:add_wear(65535/(uses-1)) + return itemstack +end + +minetest.register_tool("fishing:pole", { + + description = "Fishing Pole", + groups = {}, + inventory_image = "fishing_pole.png", + wield_image = "fishing_pole.png^[transformFXR270", + stack_max = 1, + liquids_pointable = true, + on_use = function (itemstack, user, pointed_thing) + if pointed_thing and pointed_thing.under then + local pt = pointed_thing + local node = minetest.get_node(pt.under) + if string.find(node.name, "default:water") then + local player = user:get_player_name() + local inv = user:get_inventory() + if inv:get_stack("main", user:get_wield_index()+1):get_name() == "fishing:bait_worm" then + if not minetest.setting_getbool("creative_mode") then + inv:remove_item("main", "fishing:bait_worm") + end + minetest.sound_play("fishing_bobber2", { + pos = pt.under, + gain = 0.5, + }) + minetest.add_entity({interval = 1,x=pt.under.x, y=pt.under.y+(45/64), z=pt.under.z}, "fishing:bobber_entity") + + if WEAR_OUT == true + and not minetest.setting_getbool("creative_mode") then + return rod_wear(itemstack, user, pointed_thing, 30) + else + return {name="fishing:pole", count=1, wear=0, metadata=""} + end + end + if inv:get_stack("main", user:get_wield_index()+1):get_name() == "fishing:fish_raw" then + if not minetest.setting_getbool("creative_mode") then + inv:remove_item("main", "fishing:fish_raw") + end + minetest.sound_play("fishing_bobber2", { + pos = pt.under, + gain = 0.5, + }) + minetest.add_entity({interval = 1,x=pt.under.x, y=pt.under.y+(45/64), z=pt.under.z}, "fishing:bobber_entity_shark") + + if WEAR_OUT == true + and not minetest.setting_getbool("creative_mode") then + return rod_wear(itemstack, user, pointed_thing, 30) + else + return {name="fishing:pole", count=1, wear=0, metadata=""} + end + end + end + end + return nil + end, + on_place = function(itemstack, placer, pointed_thing) + local pt = pointed_thing + if minetest.get_node(pt.under).name~="default:water_source" and minetest.get_node(pt.under).name~="default:water_flowing" then + local wear = itemstack:get_wear() + --print (wear) + local direction = minetest.dir_to_facedir(placer:get_look_dir()) + --local meta1 = minetest.get_meta(pt.under) + local meta = minetest.get_meta(pt.above) + minetest.set_node(pt.above, {name="fishing:pole_deco", param2=direction}) + --meta1:set_int("wear", wear) + meta:set_int("wear", wear) + if not minetest.setting_getbool("creative_mode") then + itemstack:take_item() + end + end + return itemstack + end, +}) + +if SIMPLE_DECO_FISHING_POLE == true then +minetest.register_node("fishing:pole_deco", { + description = "Fishing Pole", + inventory_image = "fishing_pole.png", + wield_image = "fishing_pole.png^[transformFXR270", + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + tiles = { + "fishing_pole_simple.png", + "fishing_pole_simple.png", + "fishing_pole_simple.png", + "fishing_pole_simple.png^[transformFX", + }, + groups = { + snappy=3, + flammable=2, + not_in_creative_inventory=1 + }, + node_box = { + type = "fixed", + fixed = { + { 0 , -1/2 , 0 , 0 , 1/2 , 1 }, + } + }, + selection_box = { + type = "fixed", + fixed = { + {-1/16 , -1/2 , 0 , 1/16 , 1/2 , 1 }, + } + }, + sounds = default.node_sound_wood_defaults(), + on_dig = function(pos, node, digger) + if digger:is_player() and digger:get_inventory() then + local meta = minetest.env:get_meta(pos) + local wear_out = meta:get_int("wear") + digger:get_inventory():add_item("main", {name="fishing:pole", count=1, wear=wear_out, metadata=""}) + end + minetest.remove_node(pos) + end, +}) + +else +minetest.register_node("fishing:pole_deco", { + description = "Fishing Pole", + inventory_image = "fishing_pole.png", + wield_image = "fishing_pole.png^[transformFXR270", + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + tiles = { + "fishing_pole_top.png", + "fishing_pole_bottom.png", + "fishing_pole_deco.png", -- right + "fishing_pole_deco.png^[transformFX", -- left + "fishing_pole_back.png", + "fishing_pole_front.png" + }, + node_box = { + type = "fixed", +-- { left , bottom , front , right , top , back } + fixed = { + {-1/32 , -1/16 , 14/16 , 1/32 , 6/16 , 15/16}, + {-1/32 , -3/16 , 13/16 , 1/32 , -1/16 , 14/16}, + {-1/32 , -4/16 , 12/16 , 1/32 , -3/16 , 13/16}, + {-1/32 , -5/16 , 11/16 , 1/32 , -4/16 , 12/16}, + {-1/32 , -6/16 , 9/16 , 1/32 , -5/16 , 11/16}, + {-1/32 , -5/16 , 9/16 , 1/32 , -4/16 , 10/16}, + -- stick + {-1/32 , 6/16 , 12/16 , 1/32 , 7/16 , 15/16}, -- top + {-1/32 , 5/16 , 11/16 , 1/32 , 7/16 , 12/16}, + {-1/32 , 5/16 , 10/16 , 1/32 , 6/16 , 11/16}, + {-1/32 , 4/16 , 9/16 , 1/32 , 6/16 , 10/16}, + {-1/32 , 3/16 , 8/16 , 1/32 , 5/16 , 9/16}, + {-1/32 , 2/16 , 7/16 , 1/32 , 4/16 , 8/16}, + {-1/32 , 1/16 , 6/16 , 1/32 , 3/16 , 7/16}, + {-1/32 , 0 , 5/16 , 1/32 , 2/16 , 6/16}, + {-1/32 , -2/16 , 4/16 , 1/32 , 1/16 , 5/16}, + {-1/32 , -3/16 , 3/16 , 1/32 , 0 , 4/16}, + {-1/32 , -5/16 , 2/16 , 1/32 , -1/16 , 3/16}, + {-1/32 , -7/16 , 1/16 , 1/32 , -3/16 , 2/16}, + {-1/32 , -1/2 , 0 , 1/32 , -5/16 , 1/16}, -- bottom + } + }, + selection_box = { + type = "fixed", + fixed = { + {-1/16 , -1/2 , 0 , 1/16 , 1/2 , 1 }, + } + }, + groups = { + snappy=3, + flammable=2, + not_in_creative_inventory=1 + }, + sounds = default.node_sound_wood_defaults(), + on_dig = function(pos, node, digger) + if digger:is_player() and digger:get_inventory() then + local meta = minetest.get_meta(pos) + local wear_out = meta:get_int("wear") + digger:get_inventory():add_item("main", {name="fishing:pole", count=1, wear=wear_out, metadata=""}) + end + minetest.remove_node(pos) + end, +}) + +end +----------------------------------------------------------------------------------------------- +-- GETTING WORMS +----------------------------------------------------------------------------------------------- +-- get worms from digging in dirt: +if NEW_WORM_SOURCE == false then + +minetest.register_node(":default:dirt", { + description = "Dirt", + tiles = {"default_dirt.png"}, + is_ground_content = true, + groups = {crumbly=3}, + sounds = default.node_sound_dirt_defaults(), + after_dig_node = function (pos, oldnode, oldmetadata, digger) + if math.random(1, 100) < WORM_CHANCE then + local tool_in_use = digger:get_wielded_item():get_name() + if tool_in_use == "" or tool_in_use == "default:dirt" then + if WORM_IS_MOB == true then + minetest.add_entity({x = pos.x, y = pos.y+0.4, z = pos.z}, "fishing:bait_worm_entity") + else + local inv = digger:get_inventory() + if inv:room_for_item("main", {name="fishing:bait_worm", count=1, wear=0, metadata=""}) then + inv:add_item("main", {name="fishing:bait_worm", count=1, wear=0, metadata=""}) + end + end + end + end + end, +}) + +else +-- get worms from digging with hoes: + +-- turns nodes with group soil=1 into soil +local function hoe_on_use(itemstack, user, pointed_thing, uses) + local pt = pointed_thing + -- check if pointing at a node + if not pt then + return + end + if pt.type ~= "node" then + return + end + + local under = minetest.get_node(pt.under) + local p = {x=pt.under.x, y=pt.under.y+1, z=pt.under.z} + local above = minetest.get_node(p) + + -- return if any of the nodes is not registered + if not minetest.registered_nodes[under.name] then + return + end + if not minetest.registered_nodes[above.name] then + return + end + + -- check if the node above the pointed thing is air + if above.name ~= "air" then + return + end + + -- check if pointing at dirt + if minetest.get_item_group(under.name, "soil") ~= 1 then + return + end + + -- turn the node into soil, play sound, get worm and wear out item + minetest.set_node(pt.under, {name="farming:soil"}) + minetest.sound_play("default_dig_crumbly", { + pos = pt.under, + gain = 0.5, + }) + + if math.random(1, 100) < WORM_CHANCE then + if WORM_IS_MOB == true then + minetest.add_entity({x=pt.under.x, y=pt.under.y+0.4, z=pt.under.z}, "fishing:bait_worm_entity") + else + local inv = user:get_inventory() + if inv:room_for_item("main", {name="fishing:bait_worm", count=1, wear=0, metadata=""}) then + inv:add_item("main", {name="fishing:bait_worm", count=1, wear=0, metadata=""}) + end + end + end + itemstack:add_wear(65535/(uses-1)) + return itemstack +end + +-- didn't change the hoes, just here because hoe_on_use is local +minetest.register_tool(":farming:hoe_wood", { + description = "Wooden Hoe", + inventory_image = "farming_tool_woodhoe.png", + on_use = function(itemstack, user, pointed_thing) + return hoe_on_use(itemstack, user, pointed_thing, 30) + end, +}) +minetest.register_tool(":farming:hoe_stone", { + description = "Stone Hoe", + inventory_image = "farming_tool_stonehoe.png", + on_use = function(itemstack, user, pointed_thing) + return hoe_on_use(itemstack, user, pointed_thing, 90) + end, +}) +minetest.register_tool(":farming:hoe_steel", { + description = "Steel Hoe", + inventory_image = "farming_tool_steelhoe.png", + on_use = function(itemstack, user, pointed_thing) + return hoe_on_use(itemstack, user, pointed_thing, 200) + end, +}) +minetest.register_tool(":farming:hoe_bronze", { + description = "Bronze Hoe", + inventory_image = "farming_tool_bronzehoe.png", + on_use = function(itemstack, user, pointed_thing) + return hoe_on_use(itemstack, user, pointed_thing, 220) + end, +}) + +end +----------------------------------------------------------------------------------------------- +print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...") +----------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/mods/fishing/license.txt b/mods/fishing/license.txt deleted file mode 100755 index 94a9ed02..00000000 --- a/mods/fishing/license.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/mods/fishing/settings.txt b/mods/fishing/settings.txt new file mode 100755 index 00000000..259d822b --- /dev/null +++ b/mods/fishing/settings.txt @@ -0,0 +1,9 @@ +MESSAGES = true +FISH_CHANCE = 60 +NEW_WORM_SOURCE = true +WORM_IS_MOB = true +WORM_CHANCE = 66 +WEAR_OUT = true +BOBBER_CHECK_RADIUS = 5 +SIMPLE_DECO_FISHING_POLE = true +SHARK_CHANCE = 30 diff --git a/mods/fishing/sounds/SoundLicense.txt b/mods/fishing/sounds/SoundLicense.txt new file mode 100755 index 00000000..49017e9b --- /dev/null +++ b/mods/fishing/sounds/SoundLicense.txt @@ -0,0 +1,4 @@ +These sounds are used for the Mod for Minetest; Fishing - Mossmanikin's version. +The included sounds are http://creativecommons.org/licenses/by-nc-sa/3.0/ + +--"fishing_bobber1" & "fishing_bobber2" sampled from "01260 water swimming splashing 1.wav", Attribution Noncommercial License, Robinhood76, http://www.freesound.org/people/Robinhood76/sounds/79657/ \ No newline at end of file diff --git a/mods/fishing/sounds/fishing_bobber1.ogg b/mods/fishing/sounds/fishing_bobber1.ogg new file mode 100755 index 00000000..6c86a0cb Binary files /dev/null and b/mods/fishing/sounds/fishing_bobber1.ogg differ diff --git a/mods/fishing/sounds/fishing_bobber2.ogg b/mods/fishing/sounds/fishing_bobber2.ogg new file mode 100755 index 00000000..932cf0bf Binary files /dev/null and b/mods/fishing/sounds/fishing_bobber2.ogg differ diff --git a/mods/fishing/textures/alternates/fishing_bobber.png b/mods/fishing/textures/alternates/fishing_bobber.png new file mode 100755 index 00000000..e741dd01 Binary files /dev/null and b/mods/fishing/textures/alternates/fishing_bobber.png differ diff --git a/mods/fishing/textures/alternates/fishing_bobber_bottom.png b/mods/fishing/textures/alternates/fishing_bobber_bottom.png new file mode 100755 index 00000000..e3404aab Binary files /dev/null and b/mods/fishing/textures/alternates/fishing_bobber_bottom.png differ diff --git a/mods/fishing/textures/alternates/fishing_bobber_top.png b/mods/fishing/textures/alternates/fishing_bobber_top.png new file mode 100755 index 00000000..b4b4a4ec Binary files /dev/null and b/mods/fishing/textures/alternates/fishing_bobber_top.png differ diff --git a/mods/fishing/textures/alternates/fishing_pole.png b/mods/fishing/textures/alternates/fishing_pole.png new file mode 100755 index 00000000..4625a09d Binary files /dev/null and b/mods/fishing/textures/alternates/fishing_pole.png differ diff --git a/mods/fishing/textures/animal_clownfish_clownfish_item.png b/mods/fishing/textures/animal_clownfish_clownfish_item.png new file mode 100755 index 00000000..69f0fcc6 Binary files /dev/null and b/mods/fishing/textures/animal_clownfish_clownfish_item.png differ diff --git a/mods/fishing/textures/animal_fish_blue_white_fish_blue_white_item.png b/mods/fishing/textures/animal_fish_blue_white_fish_blue_white_item.png new file mode 100755 index 00000000..5f8224e7 Binary files /dev/null and b/mods/fishing/textures/animal_fish_blue_white_fish_blue_white_item.png differ diff --git a/mods/fishing/textures/coral2.png b/mods/fishing/textures/coral2.png deleted file mode 100755 index bee95611..00000000 Binary files a/mods/fishing/textures/coral2.png and /dev/null differ diff --git a/mods/fishing/textures/coral3.png b/mods/fishing/textures/coral3.png deleted file mode 100755 index 15d31ac6..00000000 Binary files a/mods/fishing/textures/coral3.png and /dev/null differ diff --git a/mods/fishing/textures/coral4.png b/mods/fishing/textures/coral4.png deleted file mode 100755 index 4fb343c4..00000000 Binary files a/mods/fishing/textures/coral4.png and /dev/null differ diff --git a/mods/fishing/textures/fish_cooked.png b/mods/fishing/textures/fish_cooked.png deleted file mode 100755 index 2a330ea0..00000000 Binary files a/mods/fishing/textures/fish_cooked.png and /dev/null differ diff --git a/mods/fishing/textures/fish_raw.png b/mods/fishing/textures/fish_raw.png deleted file mode 100755 index 9842b585..00000000 Binary files a/mods/fishing/textures/fish_raw.png and /dev/null differ diff --git a/mods/fishing/textures/fishing_bobber.png b/mods/fishing/textures/fishing_bobber.png new file mode 100755 index 00000000..42bfe697 Binary files /dev/null and b/mods/fishing/textures/fishing_bobber.png differ diff --git a/mods/fishing/textures/fishing_bobber_bottom.png b/mods/fishing/textures/fishing_bobber_bottom.png new file mode 100755 index 00000000..32a54f74 Binary files /dev/null and b/mods/fishing/textures/fishing_bobber_bottom.png differ diff --git a/mods/fishing/textures/fishing_bobber_feather_1.png b/mods/fishing/textures/fishing_bobber_feather_1.png new file mode 100755 index 00000000..9eff3f8d Binary files /dev/null and b/mods/fishing/textures/fishing_bobber_feather_1.png differ diff --git a/mods/fishing/textures/fishing_bobber_top.png b/mods/fishing/textures/fishing_bobber_top.png new file mode 100755 index 00000000..039620ba Binary files /dev/null and b/mods/fishing/textures/fishing_bobber_top.png differ diff --git a/mods/fishing/textures/fishing_deco_pike.png b/mods/fishing/textures/fishing_deco_pike.png new file mode 100755 index 00000000..fc6079e9 Binary files /dev/null and b/mods/fishing/textures/fishing_deco_pike.png differ diff --git a/mods/fishing/textures/fishing_fish.png b/mods/fishing/textures/fishing_fish.png new file mode 100755 index 00000000..1cf74acb Binary files /dev/null and b/mods/fishing/textures/fishing_fish.png differ diff --git a/mods/fishing/textures/fishing_fish_cooked.png b/mods/fishing/textures/fishing_fish_cooked.png new file mode 100755 index 00000000..709d8f2a Binary files /dev/null and b/mods/fishing/textures/fishing_fish_cooked.png differ diff --git a/mods/fishing/textures/fishing_pike.png b/mods/fishing/textures/fishing_pike.png new file mode 100755 index 00000000..5c7885f3 Binary files /dev/null and b/mods/fishing/textures/fishing_pike.png differ diff --git a/mods/fishing/textures/fishing_pike_cooked.png b/mods/fishing/textures/fishing_pike_cooked.png new file mode 100755 index 00000000..7d66e7ca Binary files /dev/null and b/mods/fishing/textures/fishing_pike_cooked.png differ diff --git a/mods/fishing/textures/fishing_pole.png b/mods/fishing/textures/fishing_pole.png new file mode 100755 index 00000000..bbb196bb Binary files /dev/null and b/mods/fishing/textures/fishing_pole.png differ diff --git a/mods/fishing/textures/fishing_pole_back.png b/mods/fishing/textures/fishing_pole_back.png new file mode 100755 index 00000000..7b584789 Binary files /dev/null and b/mods/fishing/textures/fishing_pole_back.png differ diff --git a/mods/fishing/textures/fishing_pole_bottom.png b/mods/fishing/textures/fishing_pole_bottom.png new file mode 100755 index 00000000..6f52ca8c Binary files /dev/null and b/mods/fishing/textures/fishing_pole_bottom.png differ diff --git a/mods/fishing/textures/fishing_pole_deco.png b/mods/fishing/textures/fishing_pole_deco.png new file mode 100755 index 00000000..9224988c Binary files /dev/null and b/mods/fishing/textures/fishing_pole_deco.png differ diff --git a/mods/fishing/textures/fishing_pole_front.png b/mods/fishing/textures/fishing_pole_front.png new file mode 100755 index 00000000..e8aa3d67 Binary files /dev/null and b/mods/fishing/textures/fishing_pole_front.png differ diff --git a/mods/fishing/textures/fishing_pole_simple.png b/mods/fishing/textures/fishing_pole_simple.png new file mode 100755 index 00000000..afa5b192 Binary files /dev/null and b/mods/fishing/textures/fishing_pole_simple.png differ diff --git a/mods/fishing/textures/fishing_pole_top.png b/mods/fishing/textures/fishing_pole_top.png new file mode 100755 index 00000000..1408eac7 Binary files /dev/null and b/mods/fishing/textures/fishing_pole_top.png differ diff --git a/mods/fishing/textures/fishing_rod.png b/mods/fishing/textures/fishing_rod.png deleted file mode 100755 index 371561d5..00000000 Binary files a/mods/fishing/textures/fishing_rod.png and /dev/null differ diff --git a/mods/fishing/textures/fishing_rod_baited.png b/mods/fishing/textures/fishing_rod_baited.png deleted file mode 100755 index 22989f3a..00000000 Binary files a/mods/fishing/textures/fishing_rod_baited.png and /dev/null differ diff --git a/mods/fishing/textures/fishing_rod_wield.png b/mods/fishing/textures/fishing_rod_wield.png deleted file mode 100755 index 5a10cf52..00000000 Binary files a/mods/fishing/textures/fishing_rod_wield.png and /dev/null differ diff --git a/mods/fishing/textures/fishing_shark.png b/mods/fishing/textures/fishing_shark.png new file mode 100755 index 00000000..62a1b9e2 Binary files /dev/null and b/mods/fishing/textures/fishing_shark.png differ diff --git a/mods/fishing/textures/fishing_shark_cooked.png b/mods/fishing/textures/fishing_shark_cooked.png new file mode 100755 index 00000000..b6142ce2 Binary files /dev/null and b/mods/fishing/textures/fishing_shark_cooked.png differ diff --git a/mods/fishing/textures/fishing_sushi.png b/mods/fishing/textures/fishing_sushi.png new file mode 100755 index 00000000..c64cecaf Binary files /dev/null and b/mods/fishing/textures/fishing_sushi.png differ diff --git a/mods/fishing/textures/fishing_trophy_label.png b/mods/fishing/textures/fishing_trophy_label.png new file mode 100755 index 00000000..3c8326b0 Binary files /dev/null and b/mods/fishing/textures/fishing_trophy_label.png differ diff --git a/mods/fishing/textures/fishing_worm.png b/mods/fishing/textures/fishing_worm.png new file mode 100755 index 00000000..7a4d8d11 Binary files /dev/null and b/mods/fishing/textures/fishing_worm.png differ diff --git a/mods/fishing/textures/not_in_use/fishing_bobber_feather_1.png b/mods/fishing/textures/not_in_use/fishing_bobber_feather_1.png new file mode 100755 index 00000000..9eff3f8d Binary files /dev/null and b/mods/fishing/textures/not_in_use/fishing_bobber_feather_1.png differ diff --git a/mods/fishing/textures/not_in_use/fishing_bobber_feather_2.png b/mods/fishing/textures/not_in_use/fishing_bobber_feather_2.png new file mode 100755 index 00000000..9f710c32 Binary files /dev/null and b/mods/fishing/textures/not_in_use/fishing_bobber_feather_2.png differ diff --git a/mods/fishing/textures/not_in_use/fishing_bobber_ready.png b/mods/fishing/textures/not_in_use/fishing_bobber_ready.png new file mode 100755 index 00000000..2a37b4e9 Binary files /dev/null and b/mods/fishing/textures/not_in_use/fishing_bobber_ready.png differ diff --git a/mods/fishing/textures/not_in_use/fishing_pole_on_use.png b/mods/fishing/textures/not_in_use/fishing_pole_on_use.png new file mode 100755 index 00000000..96327c78 Binary files /dev/null and b/mods/fishing/textures/not_in_use/fishing_pole_on_use.png differ diff --git a/mods/fishing/textures/old/fishing_bobber_alternate_old.png b/mods/fishing/textures/old/fishing_bobber_alternate_old.png new file mode 100755 index 00000000..5779a71e Binary files /dev/null and b/mods/fishing/textures/old/fishing_bobber_alternate_old.png differ diff --git a/mods/fishing/textures/old/fishing_bobber_old.png b/mods/fishing/textures/old/fishing_bobber_old.png new file mode 100755 index 00000000..d86bf1c5 Binary files /dev/null and b/mods/fishing/textures/old/fishing_bobber_old.png differ diff --git a/mods/fishing/textures/old/fishing_pole_wield.png b/mods/fishing/textures/old/fishing_pole_wield.png new file mode 100755 index 00000000..cb0dcc9a Binary files /dev/null and b/mods/fishing/textures/old/fishing_pole_wield.png differ diff --git a/mods/fishing/textures/old/fishing_shark_old6.png b/mods/fishing/textures/old/fishing_shark_old6.png new file mode 100755 index 00000000..c8b3c1f4 Binary files /dev/null and b/mods/fishing/textures/old/fishing_shark_old6.png differ diff --git a/mods/fishing/textures/sashimi.png b/mods/fishing/textures/sashimi.png deleted file mode 100755 index 5263e7b2..00000000 Binary files a/mods/fishing/textures/sashimi.png and /dev/null differ diff --git a/mods/fishing/textures/seaweed.png b/mods/fishing/textures/seaweed.png deleted file mode 100755 index a3e58bf1..00000000 Binary files a/mods/fishing/textures/seaweed.png and /dev/null differ diff --git a/mods/fishing/textures/worm.png b/mods/fishing/textures/worm.png deleted file mode 100755 index ceb5fece..00000000 Binary files a/mods/fishing/textures/worm.png and /dev/null differ diff --git a/mods/fishing/trophies.lua b/mods/fishing/trophies.lua new file mode 100755 index 00000000..ebe7edb8 --- /dev/null +++ b/mods/fishing/trophies.lua @@ -0,0 +1,82 @@ +----------------------------------------------------------------------------------------------- +-- Fishing - Mossmanikin's version - Trophies 0.0.2 +-- License (code & textures): WTFPL +-- Contains code from: default +-- Supports: animal_clownfish, animal_fish_blue_white +----------------------------------------------------------------------------------------------- + +local TRoPHY = { +-- MoD iTeM NaMe iCoN + {"fishing", "fish_raw", "Fish", "fishing_fish.png"}, + {"fishing", "pike", "Northern Pike", "fishing_pike.png"}, + {"fishing", "shark", "Shark", "fishing_shark.png"}, + {"animal_clownfish", "clownfish", "Clownfish", "animal_clownfish_clownfish_item.png"}, + {"animal_fish_blue_white", "fish_blue_white", "Blue white fish", "animal_fish_blue_white_fish_blue_white_item.png"}, +} + +local function has_trophy_privilege(meta, player) + if player:get_player_name() ~= meta:get_string("owner") then + return false + end + return true +end + +for i in pairs(TRoPHY) do + local MoD = TRoPHY[i][1] + local iTeM = TRoPHY[i][2] + local NaMe = TRoPHY[i][3] + local iCoN = TRoPHY[i][4] + minetest.register_node("fishing:trophy_"..iTeM, { + description = NaMe.." Trophy", + inventory_image = "default_chest_top.png^"..iCoN.."^fishing_trophy_label.png", + drawtype = "nodebox", + tiles = { + "default_chest_top.png", -- top + "default_chest_top.png", -- bottom + "default_chest_top.png", -- right + "default_chest_top.png", -- left + "default_chest_top.png", -- back + "default_chest_top.png^"..iCoN.."^fishing_trophy_label.png", -- front + }, + paramtype = "light", + paramtype2 = "facedir", + walkable = false, + node_box = { + type = "fixed", + fixed = { + -- { left , bottom , front , right , top , back } + { -1/2 , -1/2 , 7/16 , 1/2 , 1/2 , 1/2 }, + } + }, + selection_box = { + type = "fixed", + fixed = { + { -1/2 , -1/2 , 7/16 , 1/2 , 1/2 , 1/2 }, + } + }, + groups = {choppy=2,oddly_breakable_by_hand=3,flammable=2}, + sounds = default.node_sound_wood_defaults(), + after_place_node = function(pos, placer) + local meta = minetest.get_meta(pos) + meta:set_string("owner", placer:get_player_name() or "") + meta:set_string("infotext", "This Huge "..NaMe.." was caught by the Famous Angler ".. + meta:get_string("owner").."!") + end, + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("infotext", NaMe) + meta:set_string("owner", "") + end, + can_dig = function(pos,player) + local meta = minetest.get_meta(pos); + return has_trophy_privilege(meta, player) + end, + }) + + minetest.register_craft({ + type = "shapeless", + output = "fishing:trophy_"..iTeM, + recipe = {MoD..":"..iTeM, "default:sign_wall"}, + }) + +end \ No newline at end of file diff --git a/mods/fishing/worm.lua b/mods/fishing/worm.lua new file mode 100755 index 00000000..88985576 --- /dev/null +++ b/mods/fishing/worm.lua @@ -0,0 +1,118 @@ +----------------------------------------------------------------------------------------------- +-- Fishing - Mossmanikin's version - Worm 0.0.2 +----------------------------------------------------------------------------------------------- +-- License (code & textures): WTFPL +-- Contains code from: fishing (original), mobs +-- Looked at code from: my_mobs +-- Dependencies: default +----------------------------------------------------------------------------------------------- +----------------------------------------------------------------------------------------------- +-- WORM ITEM +----------------------------------------------------------------------------------------------- +minetest.register_craftitem("fishing:bait_worm", { + description = "Worm", + groups = { fishing_bait=1 }, + inventory_image = "fishing_worm.png", + on_use = minetest.item_eat(1), + on_place = function(itemstack, placer, pointed_thing) + local pt = pointed_thing + minetest.env:add_entity({x=pt.under.x, y=pt.under.y+0.6, z=pt.under.z}, "fishing:bait_worm_entity") + itemstack:take_item() + return itemstack + end, + on_drop = function(itemstack, dropper, pos) + minetest.env:add_entity({x = pos.x, y = pos.y, z = pos.z}, "fishing:bait_worm_entity") + itemstack:take_item() + return itemstack + end, +}) + +----------------------------------------------------------------------------------------------- +-- WORM MOB +----------------------------------------------------------------------------------------------- +minetest.register_entity("fishing:bait_worm_entity", { + hp_max = 300, + damage_over_time = 1, + collisionbox = {-3/16, -3/16, -3/16, 3/16, 3/16, 3/16}, + visual = "sprite", + visual_size = {x=1/2, y=1/2}, + textures = { "fishing_worm.png", "fishing_worm.png"}, + view_range = 32, + -- Don't punch this poor creature... + on_punch = function(self, puncher) + self.object:remove() + end, + -- ...softly take it into your hand. + on_rightclick = function(self, clicker) + if clicker:is_player() and clicker:get_inventory() then + clicker:get_inventory():add_item("main", "fishing:bait_worm") + self.object:remove() + end + end, + -- AI :D + on_step = function(self, dtime) + local pos = self.object:getpos() + local n = minetest.env:get_node({x=pos.x,y=pos.y-0.3,z=pos.z}) + -- despawn when no player in range + for _,player in pairs(minetest.get_connected_players()) do + local s = self.object:getpos() + local p = player:getpos() + local dist = ((p.x-s.x)^2 + (p.y-s.y)^2 + (p.z-s.z)^2)^0.5 + if dist > self.view_range then + self.object:remove() + end + end + -- move in world + local look_whats_up = function(self) + self.object:set_hp(self.object:get_hp()-self.damage_over_time) -- creature is getting older + if n.name == "air" then -- fall when in air + self.object:moveto({x=pos.x,y=pos.y-0.5,z=pos.z}) + self.object:set_hp(self.object:get_hp()-75) + + --if n.name == "snappy" then -- fall when leaves or similar + elseif minetest.get_item_group(n.name, "snappy") ~= 0 then + self.object:moveto({x=pos.x+(0.001*(math.random(-32, 32))),y=pos.y-(0.001*(math.random(0, 64))),z=pos.z+(0.001*(math.random(-32, 32)))}) + + + elseif string.find(n.name, "default:water") then -- sink when in water + self.object:moveto({x=pos.x,y=pos.y-0.25,z=pos.z}) + self.object:set_hp(self.object:get_hp()-37) + + elseif minetest.get_item_group(n.name, "soil") ~= 0 then + if minetest.get_item_group(minetest.env:get_node({x=pos.x,y=pos.y-0.1,z=pos.z}).name, "soil") == 0 and self.object:get_hp() > 200 then + self.object:set_hp(199) + elseif self.object:get_hp() > 200 then -- leave dirt to see whats going on + self.object:moveto({x=pos.x+(0.001*(math.random(-2, 2))),y=pos.y+0.003,z=pos.z+(0.001*(math.random(-2, 2)))}) + elseif self.object:get_hp() < 199 then -- no rain here, let's get outa here + self.object:moveto({x=pos.x+(0.001*(math.random(-2, 2))),y=pos.y-0.001,z=pos.z+(0.001*(math.random(-2, 2)))}) + elseif self.object:get_hp() == 0 then + self.object:remove() + end + else -- check if there's dirt anywhere (not finished) + local check_group = minetest.get_item_group + local goal_01 = check_group(minetest.env:get_node({x = pos.x + 1, y = pos.y-0.4, z = pos.z }).name, "soil") + local goal_02 = check_group(minetest.env:get_node({x = pos.x, y = pos.y-0.4, z = pos.z + 1}).name, "soil") + local goal_03 = check_group(minetest.env:get_node({x = pos.x - 1, y = pos.y-0.4, z = pos.z }).name, "soil") + local goal_04 = check_group(minetest.env:get_node({x = pos.x, y = pos.y-0.4, z = pos.z - 1}).name, "soil") + + local goal_1a = check_group(minetest.env:get_node({x = pos.x + 1, y = pos.y+0.6, z = pos.z }).name, "soil") + local goal_2a = check_group(minetest.env:get_node({x = pos.x, y = pos.y+0.6, z = pos.z + 1}).name, "soil") + local goal_3a = check_group(minetest.env:get_node({x = pos.x - 1, y = pos.y+0.6, z = pos.z }).name, "soil") + local goal_4a = check_group(minetest.env:get_node({x = pos.x, y = pos.y+0.6, z = pos.z - 1}).name, "soil") + -- if there's dirt nearby, go there + if goal_01 ~= 0 or goal_1a ~= 0 then + self.object:moveto({x=pos.x+0.002,y=pos.y,z=pos.z+(0.001*(math.random(-2, 2)))}) + elseif goal_02 ~= 0 or goal_2a ~= 0 then + self.object:moveto({x=pos.x+(0.001*(math.random(-2, 2))),y=pos.y,z=pos.z+0.002}) + elseif goal_03 ~= 0 or goal_3a ~= 0 then + self.object:moveto({x=pos.x-0.002,y=pos.y,z=pos.z+(0.001*(math.random(-2, 2)))}) + elseif goal_04 ~= 0 or goal_4a ~= 0 then + self.object:moveto({x=pos.x+(0.001*(math.random(-2, 2))),y=pos.y,z=pos.z-0.002}) + else -- I'm lost, no dirt + self.object:moveto({x=pos.x+(0.001*(math.random(-8, 8))),y=pos.y,z=pos.z+(0.001*(math.random(-8, 8)))}) + end + end + end + look_whats_up(self) + end, +}) \ No newline at end of file diff --git a/mods/hud/hunger.lua b/mods/hud/hunger.lua index c9096f80..7e3005d7 100755 --- a/mods/hud/hunger.lua +++ b/mods/hud/hunger.lua @@ -98,16 +98,6 @@ if minetest.get_modpath("animalmaterials") ~= nil then overwrite("animalmaterials:fish_clownfish", 2) end -if minetest.get_modpath("fishing") ~= nil then - overwrite("fishing:fish_raw", 2) - overwrite("fishing:fish_cooked", 5) - overwrite("fishing:sushi", 6) - overwrite("fishing:shark", 4) - overwrite("fishing:shark_cooked", 8) - overwrite("fishing:pike", 4) - overwrite("fishing:pike_cooked", 8) -end - if minetest.get_modpath("glooptest") ~= nil then overwrite("glooptest:kalite_lump", 1) end @@ -256,7 +246,7 @@ if minetest.get_modpath("ethereal") then overwrite("ethereal:bucket_cactus", 2, "bucket:bucket_empty") end overwrite("ethereal:fish_raw", 2) - overwrite("ethereal:fish_cooked", 5) + overwrite("ethereal:fish_cooked", 4) overwrite("ethereal:seaweed", 1) overwrite("ethereal:yellowleaves", 1, "", nil, 1) overwrite("ethereal:sashimi", 4) @@ -305,7 +295,7 @@ if minetest.get_modpath("mobs") ~= nil then overwrite("mobs:rat_cooked", 5) overwrite("mobs:honey", 2) overwrite("mobs:pork_raw", 4) - overwrite("mobs:pork_cooked", 8) + overwrite("mobs:pork_cooked", 7) overwrite("mobs:chicken_raw", 2) overwrite("mobs:chicken_cooked", 4) overwrite("mobs:egg", 1) @@ -315,6 +305,15 @@ if minetest.get_modpath("mobs") ~= nil then end end +if minetest.get_modpath("fishing") ~= nil then + overwrite("fishing:fish_raw", 2) + overwrite("fishing:fish_cooked", 4) + overwrite("fishing:sushi", 6) + overwrite("fishing:shark", 2) + overwrite("fishing:shark_cooked", 6) + overwrite("fishing:pike", 2) + overwrite("fishing:pike_cooked", 6) +end --- mes modifs /fin --- if minetest.get_modpath("kpgmobs") ~= nil then