Mod update

mod_sources.txt

@@ -129,7 +129,7 @@ origin	git@github.com:minetest-mods/ts_workshop.git (fetch)
 Mod: lib_api/ts_workshop
 
 origin	https://github.com/Skandarella/Animal-World.git (fetch)
-* main c2c7b1d [origin/main] Add files via upload
+* main af0555a [origin/main] Add files via upload
 Mod: mobs/mobs_mobs/Animal-World
 
 origin	https://github.com/hkzorman/advanced_npc.git (fetch)
@@ -148,10 +148,6 @@ origin	https://codeberg.org/Hamlet/mobs_ghost_redo (fetch)
 * master ac9c013 [origin/master] v0.7.0
 Mod: mobs/mobs_mobs/mobs_ghost_redo
 
-origin	https://codeberg.org/Hamlet/mobs_humans (fetch)
-* master 673a63c [origin/master] Delete LICENSE.txt
-Mod: mobs/mobs_mobs/mobs_humans
-
 origin	https://notabug.org/TenPlus1/mobs_monster.git (fetch)
 * master 095d875 [origin/master] add Tree Creeper
 Mod: mobs/mobs_mobs/mobs_monster

mods/mobs/mobs_mobkit/water_life/init.lua.orig

@@ -0,0 +1,191 @@
+-----------------------------------------------------------
+--
+-- Water_life copyright 2020 by Gundul
+-- see software and media licenses in the doc folder
+-- 
+-----------------------------------------------------------
+
+water_life = {}
+water_life.version = "210207"
+water_life.shark_food = {}
+water_life.repellant = {}
+water_life.gull_bait = {}
+water_life.catchNet = "water_life:placeholder"
+water_life.petz = minetest.get_modpath("petz")
+water_life.mobsredo = minetest.get_modpath("mobs")
+water_life.farming = minetest.get_modpath("farming")
+water_life.swampz = minetest.get_modpath("swaz")
+water_life.abr = tonumber(minetest.settings:get('active_block_range')) or 2
+water_life.abo = tonumber(minetest.settings:get('active_object_send_range_blocks')) or 3
+water_life.avg_dtime = 0
+water_life.max_dtime = 0
+
+-- settingtypes
+water_life.whale_spawn_rate =  tonumber(minetest.settings:get("water_life_whale_spawn_rate")) or 100     
+water_life.shark_spawn_rate =  tonumber(minetest.settings:get("water_life_shark_spawn_rate")) or 100
+water_life.urchin_spawn_rate =  tonumber(minetest.settings:get("water_life_urchin_spawn_rate")) or 700
+water_life.clams_spawn_rate = tonumber(minetest.settings:get("water_life_clams_spawn_rate")) or 500
+water_life.fish_spawn_rate = tonumber(minetest.settings:get("water_life_fish_spawn_rate")) or 1000
+water_life.maxwhales = tonumber(minetest.settings:get("water_life_maxwhales")) or 1
+water_life.maxsharks = tonumber(minetest.settings:get("water_life_maxsharks")) or 5
+water_life.maxmobs = tonumber(minetest.settings:get("water_life_maxmobs")) or 60
+water_life.apionly = minetest.settings:get_bool("water_life_apionly") or false
+water_life.dangerous = minetest.settings:get_bool("water_life_dangerous") or false
+water_life.soundadjust = tonumber(minetest.settings:get("water_life_soundadjust")) or 1.0
+water_life.moskitolifetime = tonumber(minetest.settings:get("water_life_moskitolifetime")) or 120		-- lifetime in sec. ( <15 = no reproducing)
+water_life.radar_debug = minetest.settings:get_bool("water_life_radar_debug") or false
+water_life.muddy_water = minetest.settings:get_bool("water_life_muddy_water") or false
+water_life.repeltime = math.floor (720 / (tonumber(minetest.settings:get("time_speed")) or 72)*60)		-- the repellent lasts half a minetest day
+water_life.newplayerbonus = tonumber(minetest.settings:get("water_life_newplayerbonus")) or 5			-- 5 days savety from rattlenakes for new players
+water_life.ihateinsects = minetest.settings:get_bool("water_life_hate_insects") or false
+water_life.bloody = minetest.settings:get_bool("water_life_bloody") or true						-- let there be blood !
+
+local path = minetest.get_modpath(minetest.get_current_modname())
+
+
+
+dofile(path.."/api.lua")               											-- load water_life api
+dofile(path.."/compat.lua")
+dofile(path.."/paths.lua")													-- load pathfinding
+if water_life.muddy_water then dofile(path.."/mapgen.lua") end						-- load muddy_water
+dofile(path.."/crafts.lua")				 									-- load crafts
+dofile(path.."/tools/buoy.lua")												-- load buoy
+dofile(path.."/chatcommands.lua")												-- load chatcommands
+dofile(path.."/behaviors.lua")												-- load behaviors
+dofile(path.."/bio.lua")														-- load bio data handles
+
+if not water_life.apionly then
+	dofile(path.."/hud.lua")													-- load player hud
+	dofile(path.."/spawn.lua")												-- load spawn function
+	dofile(path.."/animals/whale.lua")											-- load whales	
+	dofile(path.."/animals/riverfish.lua")										-- load riverfish
+	dofile(path.."/animals/sea_urchin.lua")										-- load sea urchin
+	dofile(path.."/animals/clams.lua")											-- load clams
+	dofile(path.."/flora/plants.lua")											-- load water plants
+	dofile(path.."/flora/corals.lua")											-- load corals
+	dofile(path.."/animals/jellyfish.lua")										-- load jellyfish
+	dofile(path.."/animals/coralfish.lua")										-- load coralfish
+	dofile(path.."/animals/clownfish.lua")										-- load clownfish
+	dofile(path.."/animals/gulls.lua")											-- load gulls
+	dofile(path.."/animals/gecko.lua")											-- load tokays
+	dofile(path.."/animals/beaver.lua")										-- load beavers
+	if not water_life.dangerous then
+		dofile(path.."/animals/snake.lua")											-- load snakes
+		dofile(path.."/animals/piranha.lua")										-- load piranha
+		dofile(path.."/animals/shark.lua")											-- load sharks
+		dofile(path.."/animals/crocodile.lua")										-- load crocodile
+		dofile(path.."/animals/moskito.lua")										-- load moskitos
+		if water_life.swampz then
+			dofile(path.."/animals/alligator.lua")									-- alligators need swampz mod
+		end
+	end
+end
+
+
+--check which lasso to use
+if water_life.mobsredo then 
+	water_life.catchBA = "mobs:lasso"
+	water_life.catchNet = "mobs:net"
+	if water_life.petz then minetest.unregister_item("petz:lasso") end
+	
+elseif water_life.petz then
+	water_life.catchBA = "petz:lasso"
+	
+else
+	water_life.catchBA = "water_life:lasso"
+end
+
+
+
+
+math.randomseed(os.time()) --init random seed
+
+
+
+--remove old sharks
+minetest.register_entity(":sharks:shark", {
+	on_activate = function(self, staticdata)
+		self.object:remove()
+	end,
+})
+
+minetest.register_entity(":zombiestrd:shark", {
+	on_activate = function(self, staticdata)
+		self.object:remove()
+	end,
+})
+
+
+
+-- register shark food
+
+
+if minetest.get_modpath("wildlife") then
+	water_life.register_shark_food("wildlife:deer")
+	water_life.register_shark_food("wildlife:deer_tamed")
+	water_life.register_shark_food("wildlife:wolf")
+end
+
+if minetest.get_modpath("aerotest") then
+	water_life.register_shark_food("aerotest:eagle")
+end
+
+if minetest.get_modpath("petz") then
+	water_life.register_shark_food("petz:kitty")
+	water_life.register_shark_food("petz:rat")
+	water_life.register_shark_food("petz:goat")
+	water_life.register_shark_food("petz:puppy")
+	water_life.register_shark_food("petz:ducky")
+	water_life.register_shark_food("petz:lamb")
+	water_life.register_shark_food("petz:camel")
+	water_life.register_shark_food("petz:calf")
+	water_life.register_shark_food("petz:chicken")
+	water_life.register_shark_food("petz:piggy")
+	water_life.register_shark_food("petz:hamster")
+	water_life.register_shark_food("petz:chimp")
+	water_life.register_shark_food("petz:beaver")
+	water_life.register_shark_food("petz:turtle")
+	water_life.register_shark_food("petz:penguin")
+	water_life.register_shark_food("petz:lion")
+	water_life.register_shark_food("petz:grizzly")
+	water_life.register_shark_food("petz:pony")
+	water_life.register_shark_food("petz:wolf")
+	water_life.register_shark_food("petz:elephant")
+	water_life.register_shark_food("petz:elephant_female")
+	water_life.register_shark_food("petz:foxy")
+	water_life.register_shark_food("petz:polar_bear")
+	water_life.register_shark_food("petz:tarantula")
+	water_life.register_shark_food("petz:leopard")
+	water_life.register_shark_food("petz:snow_leopard")
+	water_life.register_shark_food("petz:panda")
+	water_life.register_shark_food("petz:santa_killer")
+	water_life.register_shark_food("petz:mr_pumpkin")
+	water_life.register_shark_food("petz:hen")
+	water_life.register_shark_food("petz:rooster")
+end
+
+if minetest.get_modpath("better_fauna") then
+	water_life.register_shark_food("better_fauna:chicken")
+	water_life.register_shark_food("better_fauna:cow")
+	water_life.register_shark_food("better_fauna:pig")
+	water_life.register_shark_food("better_fauna:sheep")
+	water_life.register_shark_food("better_fauna:turkey")
+end
+
+
+-- register gull bait
+
+water_life.register_gull_bait("water_life:clownfish")
+water_life.register_gull_bait("water_life:coralfish")
+water_life.register_gull_bait("water_life:riverfish")
+water_life.register_gull_bait("water_life:piranha")
+water_life.register_gull_bait("water_life:urchin_item")
+water_life.register_gull_bait("water_life:snake_item")
+water_life.register_gull_bait("water_life:meat_raw")
+water_life.register_gull_bait("water_life:meat")
+
+if minetest.get_modpath("farming") then
+	water_life.register_gull_bait("farming:bread")
+end
+
+

mods/mobs/mobs_mobs/Animal-World/anteater.lua

@@ -33,6 +33,7 @@ mobs:register_mob("animalworld:anteater", {
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 1},
 	        {name = "mobs:leather", chance = 1, min = 0, max = 2},
+	        {name = "animalworld:anteatercorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
 	lava_damage = 5,

mods/mobs/mobs_mobs/Animal-World/bear.lua

@@ -28,6 +28,7 @@ stepheight = 1,
 	stepheight = 1,
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 1},
+		{name = "animalworld:bearcorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
 	lava_damage = 4,

mods/mobs/mobs_mobs/Animal-World/blackbird.lua

@@ -30,6 +30,7 @@ stepheight = 3,
 	drops = {
 		{name = "animalworld:chicken_raw", chance = 1, min = 1, max = 1},
 	        {name = "animalworld:chicken_feather", chance = 1, min = 1, max = 1},
+		{name = "animalworld:blackbirdcorpse", chance = 9, min = 1, max = 1},
 	
 	},
 	water_damage = 1,

mods/mobs/mobs_mobs/Animal-World/boar.lua

@@ -34,6 +34,7 @@ mobs:register_mob("animalworld:boar", {
 	replace_with = "default:dirt",
 	drops = {
 		{name = "animalworld:pork_raw", chance = 1, min = 1, max = 3},
+		{name = "animalworld:boarcorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
 	lava_damage = 5,

mods/mobs/mobs_mobs/Animal-World/camel.lua

@@ -33,6 +33,7 @@ mobs:register_mob("animalworld:camel", {
 	view_range = 7,
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 1},
+		{name = "animalworld:camelcorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
 	lava_damage = 5,

mods/mobs/mobs_mobs/Animal-World/crocodile.lua

@@ -29,6 +29,7 @@ stepheight = 1,
 	stepheight = 1,
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 1},
+		{name = "animalworld:crocodilecorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
 	lava_damage = 4,

mods/mobs/mobs_mobs/Animal-World/elephant.lua

@@ -29,6 +29,7 @@ stepheight = 2,
 	stepheight = 2,
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 1},
+		{name = "animalworld:elephantcorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
 	lava_damage = 4,

mods/mobs/mobs_mobs/Animal-World/gnu.lua

@@ -33,6 +33,7 @@ mobs:register_mob("animalworld:gnu", {
 	view_range = 10,
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 1},
+		{name = "animalworld:gnucorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
 	lava_damage = 5,

mods/mobs/mobs_mobs/Animal-World/goldenmole.lua

@@ -33,7 +33,7 @@ mobs:register_mob("animalworld:goldenmole", {
 	water_damage = 5,
 	lava_damage = 5,
 	light_damage = 0,
-	fear_height = 1,
+	fear_height = 2,
 	animation = {
 		stand_start = 100,
 		stand_end = 300,

mods/mobs/mobs_mobs/Animal-World/hippo.lua

@@ -29,6 +29,7 @@ stepheight = 1,
 	stepheight = 1,
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 1},
+		{name = "animalworld:hippocorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
 	lava_damage = 4,

mods/mobs/mobs_mobs/Animal-World/hyena.lua

@@ -29,6 +29,7 @@ stepheight = 2,
 	stepheight = 2,
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 1},
+		{name = "animalworld:hyenacorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
 	lava_damage = 4,

mods/mobs/mobs_mobs/Animal-World/init.lua

@@ -73,6 +73,7 @@ dofile(path .. "goby.lua") --
 dofile(path .. "treelobster.lua") --
 dofile(path .. "notoptera.lua") --
 dofile(path .. "seahorse.lua") --
+dofile(path .. "trophies.lua") --
 dofile(path .. "hunger.lua") --
 
 

mods/mobs/mobs_mobs/Animal-World/kangaroo.lua

@@ -30,6 +30,7 @@ mobs:register_mob("animalworld:kangaroo", {
 	view_range = 10,
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 1},
+		{name = "animalworld:kangaroocorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
 	lava_damage = 5,

mods/mobs/mobs_mobs/Animal-World/monitor.lua

@@ -29,6 +29,7 @@ stepheight = 1,
 	stepheight = 1,
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 1},
+		{name = "animalworld:monitorcorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
 	lava_damage = 4,

mods/mobs/mobs_mobs/Animal-World/moose.lua

@@ -34,6 +34,7 @@ mobs:register_mob("animalworld:moose", {
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 1},
 	        {name = "mobs:leather", chance = 1, min = 0, max = 2},
+		{name = "animalworld:moosecorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
 	lava_damage = 5,
@@ -62,7 +63,7 @@ mobs:register_mob("animalworld:moose", {
 	end,
 })
 
-local spawn_on = {"default:dirt_with_grass", "default:coniferous_litter"}
+
 
 if minetest.get_mapgen_setting("mg_name") ~= "v6" then
 	spawn_on = {"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass"}

mods/mobs/mobs_mobs/Animal-World/owl.lua

@@ -31,6 +31,7 @@ stepheight = 3,
 	drops = {
 		{name = "animalworld:chicken_raw", chance = 1, min = 1, max = 1},
 	        {name = "animalworld:chicken_feather", chance = 1, min = 1, max = 1},
+		{name = "animalworld:owlcorpse", chance = 9, min = 1, max = 1},
 	
 	},
 	water_damage = 1,

mods/mobs/mobs_mobs/Animal-World/reindeer.lua

@@ -32,6 +32,7 @@ mobs:register_mob("animalworld:reindeer", {
 	view_range = 10,
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 1},
+		{name = "animalworld:reindeercorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
 	lava_damage = 5,

mods/mobs/mobs_mobs/Animal-World/seal.lua

@@ -27,6 +27,7 @@ stepheight = 0.6,
 	stepheight = 1.1,
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 1},
+		{name = "animalworld:sealcorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
 	lava_damage = 4,

mods/mobs/mobs_mobs/Animal-World/shark.lua

@@ -31,6 +31,7 @@ stepheight = 0.0,
 	stepheight = 0.0,
 	drops = {
 		{name = "animalworld:rawfish", chance = 1, min = 1, max = 1},
+		{name = "animalworld:sharkcorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
         air_damage = 1,

mods/mobs/mobs_mobs/Animal-World/snowleopard.lua

@@ -29,6 +29,7 @@ stepheight = 5,
 	stepheight = 5,
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 1},
+		{name = "animalworld:snowleopardcorpse", chance = 9, min = 1, max = 1},
 	},
 	water_damage = 0,
 	lava_damage = 4,