Merge pull request #8 from berengma/dev

knockback and dnmwM

Author: berengma

behaviors.lua

@@ -75,14 +75,22 @@ function wildcow.hq_overrun(self,prty,target)
 	tpos = mobkit.pos_translate2d(mobkit.get_stand_pos(self),tyaw,10)
 	local dir = vector.subtract(tpos,pos)
 	mobkit.clear_queue_high(self)
+	local hit = false
 
 	local func = function(self)
 		if not mobkit.is_alive(target) then return true end
-		if water_life.dist2tgt(self,target) > self.view_range then return true end
+		local dist = water_life.dist2tgt(self,target)
+		if dist > self.view_range then return true end
+		dist = math.floor(dist + 0.5)
 
-		if water_life.dist2tgt(self,target) < 1 then
-			 target:punch(self.object,1,self.attack) 
+		
+		if dist == 1 and not hit then
+			mobkit.animate(self,'attack')
+			target:punch(self.object,1,self.attack) 
+			water_life.knockback_player(self,target,20)
+			hit = true
 		end
+		
 		if mobkit.is_queue_empty_low(self) and self.isonground then
 			local pos = mobkit.get_stand_pos(self)
 			if vector.distance(pos,tpos) >= 1.3 then

calf.lua

@@ -130,6 +130,10 @@ minetest.register_entity("wildcow:auroch_calf",{
 		{name = "water_life:meat_raw", chance = 2, min = 1, max = 1,},
 	},
 	mama = {},
+	predators = {["water_life:croc"]=1,
+                  ["water_life:alligator"]=1,
+                  ["water_life:snake"]=1,
+                  },
 
 	brainfunc = calf_brain,
 

female.lua

@@ -77,13 +77,30 @@ local function female_brain(self)
 	end
 
 	if mobkit.timer(self,1) then 
+		local childent = nil
+		local predator = nil
+		local danger = ""
 		local prty = mobkit.get_queue_priority(self)
 		local obj = self.object
 		local pos = self.object:get_pos()
 		local bosspos = water_life.headpos(self)
 		local calf = water_life.pregnant(self)
 		local dna = water_life.dna(self)
+		local baby = wildcow.whereismum(self,8,true)							-- true searches for calfs, not females
+		if baby and #baby > 0 then
+			childent = baby[1]:get_luaentity()								-- get the entity to do further checks
+		end
 
+		if childent then
+			predator = water_life.get_closest_enemy(childent,true)
+			if predator then
+				if predator:is_player() then
+					danger = "\n DANGER: "..predator:get_player_name()
+				else
+					danger = "\n DANGER: "..predator:get_luaentity().name
+				end
+			end
+		end
 
 		if calf > 0 then
 			calf = os.clock() - calf
@@ -119,10 +136,22 @@ local function female_brain(self)
 
 			obj:set_nametag_attributes({
 					color = '#ff7373',
-					text = tostring(water_life.is_alive(self)).."\n"..kepala.."\n"..hamil.."\n"..tostring(water_life.hunger(self)).."% hunger\n"..tostring(water_life.horny(self)).."% horny",
+					text = tostring(water_life.is_alive(self)).."\n"..kepala.."\n"..hamil.."\n"..tostring(water_life.hunger(self)).."% hunger\n"..tostring(water_life.horny(self)).."% horny"..danger,
 					})
 		end	
-        
+		
+		if prty < 50 and predator and baby[1] then						-- do not mess with MAMA !
+				local ppos = predator:get_pos()
+				local bpos = baby[1]:get_pos()
+				local dist = water_life.dist2tgt(childent,predator)
+				if math.abs(ppos.y - bpos.y) < 3 and dist < 8 and not water_life.inwater(predator) then
+					wildcow.hq_overrun(self,50,predator)
+				end
+		end
+			
+			
+		
+		
 		if prty < 20 and water_life.inwater(self.object) then
 			mobkit.hq_liquid_recovery(self,20)
 			water_life.hunger(self,-5)

male.lua

@@ -177,7 +177,7 @@ minetest.register_entity("wildcow:auroch_male",{
 	lung_capacity = 20,			-- seconds
 	max_hp = 25,
 	timeout = wildcow.lifetime,
-	attack={range=0.5,damage_groups={fleshy=5}},
+	attack={range=0.5,damage_groups={fleshy=10}},
 	sounds = {
 		--scared='deer_scared',
 		--hurt = 'deer_hurt',