fixes

petz/api/api.lua

@@ -30,4 +30,4 @@ assert(loadfile(modpath .. "/api/api_silk.lua"))(modpath, S)
 assert(loadfile(modpath .. "/api/api_sleep.lua"))(modpath, S)
 assert(loadfile(modpath .. "/api/api_env_damage.lua"))(modpath, S)
 assert(loadfile(modpath .. "/api/api_on_step.lua"))(modpath, S)
-assert(loadfile(modpath .. "/api/api_bees.lua"))(modpath, S)
+--assert(loadfile(modpath .. "/api/api_bees.lua"))(modpath, S)

petz/locale/petz.es.tr

@@ -57,6 +57,7 @@ It breeds with=Se cría con
 It is pregnant=Está preñada
 It likes=Le gusta
 Kitty=Gatito
+Lasso=Lazo
 Lamb=Cordero
 Leather=Cuero
 Lion=León

petz/misc/behaviours.lua

@@ -402,14 +402,15 @@ function petz.bee_brain(self)
 		local player = mobkit.get_nearby_player(self)
 			
 		--search for flowers
-		if prty < 6 and self.pollen == false then
+		if prty < 6 and not(self.pollen) then
 			local view_range = self.view_range
 			local nearby_flowers = minetest.find_nodes_in_area(
 				{x = pos.x - view_range, y = pos.y - 1, z = pos.z - view_range},
 				{x = pos.x + view_range, y = pos.y + 1, z = pos.z + view_range},
 				{"group:flower"})
-			if #nearby_flowers >= 1 then		
-				
+			if #nearby_flowers >= 1 then	
+				local tpos = 	nearby_flowers[1] --the first match	
+				mobkit.hq_gotopollen(self, 6, tpos)		
 			end			
 		end	
 							
@@ -474,18 +475,29 @@ function petz.aquatic_brain(self)
 					if vector.distance(pos, player:get_pos()) <= self.view_range then	-- if player close
 						if self.warn_attack == true then --attack player										
 							mobkit.clear_queue_high(self)							-- abandon whatever they've been doing
-							mobkit.hq_aqua_attack(self, 20, puncher, 6)				-- get revenge
+							mobkit.hq_aqua_attack(self, 10, puncher, 6)				-- get revenge
 						end
 					end
 				end
 			end
 		end
 		
+		if prty < 8 then		
+			if not(self.status== "jump") and (pos.y < 2 and pos.y > 0) then
+				local random_number = math.random(1, 50)
+				if random_number == 1 then
+					--minetest.chat_send_player("singleplayer", "jump")
+					mobkit.clear_queue_high(self)	
+					mobkit.hq_aqua_jump(self, 8, 2.5)
+				end
+			end
+		end
+		
 		-- Default Random Sound		
 		petz.random_mob_sound(self)
 		
 		--Roam default			
-		if mobkit.is_queue_empty_high(self) then
+		if mobkit.is_queue_empty_high(self) and not(self.status== "jump") then
 			mobkit.hq_aqua_roam(self, 0, 2.5)
 		end		
 	end

petz/misc/items.lua

@@ -297,9 +297,10 @@ minetest.register_tool("petz:lasso", {
 minetest.register_craft({
 	output = "petz:lasso",
 	recipe = {
+		{"farming:string", "farming:string", "farming:string"},
 		{"farming:string", "", "farming:string"},
-		{"", "default:diamond", ""},
-		{"farming:string", "", "farming:string"},		}
+		{"", "farming:string", ""},
+	}
 })
 
 -- Saddle

petz/misc/mobkit_plus.lua

@@ -277,127 +277,58 @@ function mobkit.hq_climb(self, prty)
 	mobkit.queue_high(self,func,prty)
 end
 
-
-
---
--- AQUATIC BRAIN
---
-
-function mobkit.hq_wanderswin(self, prty)
-	local func=function(self)
-		if mobkit.is_queue_empty_low(self) then									
-			mobkit.dumbstepswin(self)
-		end
-	end
-	mobkit.queue_high(self,func,prty)
-end
-
-function mobkit.dumbstepswin(self)
-	--mobkit.set_velocity(self, {x=1, y=0, z=1})	
-	if minetest.get_item_group(mobkit.node_name_in(self, "front"), "water") < 1 then			
-		local yaw = self.object:get_yaw()
-		if yaw then
-			local rotation_integer = math.random(0, 5)
-			local rotation_decimals = math.random()				
-			local new_yaw = yaw + rotation_integer + rotation_decimals
-			self.object:set_yaw(new_yaw)		
-			mobkit.set_velocity(self, self.object:getvelocity())
-		end
-	end
-	mobkit.lq_dumbswin(self, 1.0)	
-end
-
-function mobkit.lq_dumbswin(self, speed_factor)
-	local timer = 3
-	local status = "descend"
-	speed_factor = speed_factor or 1
+---
+---Aquatic Brain
+---
+function mobkit.hq_aqua_jump(self, prty, speed_factor)
 	local func = function(self)
-		timer = timer - self.dtime
-		local vel = self.object:getvelocity()
-		local velocity = {}
-		local mob = self.object
-		local pos = mob:getpos()			
-		local random_num
-		mobkit.animate(self, 'swin')
-		random_num = math.random(1, 300)
-		if random_num <= 1 then	
-			local yaw = self.object:get_yaw()
-			if yaw then
-				local rotation_integer = math.random(0, 5)
-				local rotation_decimals = math.random()				
-				local new_yaw = yaw + rotation_integer + rotation_decimals
-				self.object:set_yaw(new_yaw)		
-				mobkit.set_velocity(self, self.object:getvelocity())
-			end			
-		end
-		if mobkit.check_is_on_surface(self) == true then --check if mob close to surface
-			random_num = math.random(1, 100)
-			if random_num < 50 then
-				status = "descend"
-			else
-				status = "stand"
-			end
-		else --check if water below, if no ascend
-			local node_name = mobkit.node_name_in(self, "below")
-			if minetest.get_item_group(node_name, "water") < 1  then
-				status = "ascend"
-			end
-		end		
-		--local node_name_in_front = mobkit.node_name_in(self, "front")
-		if status == "stand" and timer < 0 then -- stand
-			velocity = {
-				x= vel.x*self.max_speed* speed_factor *2,
-				y= 0,
-				z= vel.z*self.max_speed* speed_factor *2,
-			}
-			mobkit.set_velocity(self, velocity)
-			minetest.chat_send_player("singleplayer", "stand")
-			random_num = math.random(1, 100)
-			if random_num < 20 then
-				status = "descend"				
-			elseif random_num < 40 and mobkit.check_is_on_surface(self) == false then		
-				status = "ascend"							
-			end		
+		--minetest.chat_send_player("singleplayer", "test")		
+		local velocity = {
+			x = self.max_speed* speed_factor,
+			y = self.max_speed* speed_factor,
+			z = self.max_speed* speed_factor,
+		}		
+		mobkit.set_velocity(self, velocity)
+		self.object:set_acceleration({x=0, y=2.0, z=0})
+		self.status = "jump"
+		petz.do_sound_effect("object", self.object, "petz_splash")
+		minetest.after(0.5, function(self, velocity)
+				if mobkit.is_alive(self.object) then
+					self.object:set_acceleration({
+						x = velocity.x * 2,
+						y = mobkit.gravity,
+						z = velocity.z * 2						
+					})
+					self.status = ""
+					mobkit.clear_queue_high(self)
+					--minetest.chat_send_player("singleplayer", "stop")
+				end
+			end, self, velocity)
+		return true
+	end
+	mobkit.queue_high(self, func, prty)
+end
+
+
+---
+---Bee Brain
+---
+
+function mobkit.hq_gotopollen(self, prty, tpos)
+	local func = function(self)
+		mobkit.lq_search_flower(self, tpos)
+	end
+	mobkit.queue_high(self, func, prty)
+end
+
+function mobkit.lq_search_flower(self, tpos)
+	local func = function(self)				
+		local pos = self.object:get_pos() --pos of the petz	
+		local dir = vector.direction(pos, tpos)
+		mobkit.set_velocity(self, dir)
+		if vector.distance(pos, tpos) <=1 then		
+			self.pollen = true
 			return true
-		elseif status == "ascend"  and timer < 0 then -- ascend
-			local y			
-			y = self.max_speed * speed_factor
-			velocity = {
-				x = self.max_speed* speed_factor,
-				y = y,
-				z = self.max_speed* speed_factor,
-			}
-			mobkit.set_velocity(self, velocity)
-			minetest.chat_send_player("singleplayer", "ascend")	
-			random_num = math.random(1, 100)
-			if random_num < 20 then
-				status = "stand"
-			elseif random_num < 40 then		
-				status = "descend"											
-			end
-			return true
-		elseif timer < 0 then --descend
-			local y
-			y = - self.max_speed * speed_factor * 2
-			status = "descend"
-			velocity ={
-				x = self.max_speed* speed_factor,				
-				y = y,
-				z = self.max_speed* speed_factor,
-			}
-			--minetest.chat_send_player("singleplayer", tostring(velocity.x))
-			mobkit.set_velocity(self, velocity)
-			minetest.chat_send_player("singleplayer", "descend")
-			random_num = math.random(1, 100)
-			if random_num < 20 then
-				status = "stand"
-			elseif random_num < 70 then		
-				status = "ascend"											
-			end
-			return true
-		end
-		if timer < 0 then
-			timer = 3
 		end
 	end
 	mobkit.queue_low(self, func)

petz/petz/dolphin_mobkit.lua

@@ -43,6 +43,7 @@ minetest.register_entity("petz:"..pet_name,{
 	view_range = 10,
 	lung_capacity = 32767, -- seconds
 	max_hp = 4,
+	max_height = -2,
 		    
 	animation = {
 		swin={range={x=1, y=13}, speed=20, loop=true},			

petz/sounds/LICENSE.MD

@@ -196,3 +196,9 @@ Author: Alexander
 http://www.orangefreesounds.com/dolphin-sound/
 License: The sound effect is permitted for non-commercial use
 under license “Personal Use Only”
+--------------------------------------------
+filenames: petz_splash.ogg
+Author: Alexander
+http://www.orangefreesounds.com/water-sound-splash/
+License: The sound effect is permitted for commercial use
+under license Creative Commons Attribution 4.0 International License