X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=mods%2Fmob%2Fapi%2Fapi_hook.lua;h=40b062697d773a1cb9b310ee8b685ab31205e7e0;hb=1722fde2cef43a27682f5aac6c3577bb1140397b;hp=533dacf7b57a2c07ef2ba0fc76cfdbe39f0acc67;hpb=524317e46107a62351971a515353c9fb89fc1c25;p=Crafter.git

diff --git a/mods/mob/api/api_hook.lua b/mods/mob/api/api_hook.lua
index 533dacf..40b0626 100644
--- a/mods/mob/api/api_hook.lua
+++ b/mods/mob/api/api_hook.lua
@@ -55,7 +55,13 @@ mob_register.death_animation_timer = 0
 mob_register.dead = false
 
 mob_register.mob = true
+
 mob_register.hostile = def.hostile
+if def.friendly_in_daylight == true then
+	mob_register.friendly_in_daylight = def.friendly_in_daylight
+	mob_register.friendly_in_daylight_timer = 0
+end
+
 mob_register.hostile_cooldown = def.hostile_cooldown
 
 mob_register.hostile_timer = 0
@@ -74,6 +80,7 @@ mob_register.group_attack = def.group_attack
 mob_register.death_rotation = def.death_rotation
 
 mob_register.head_mount = def.head_mount
+mob_register.rotational_correction = def.rotational_correction or 0
 
 mob_register.hurt_sound = def.hurt_sound
 mob_register.die_sound = def.die_sound
@@ -87,6 +94,7 @@ mob_register.explosion_power = def.explosion_power
 mob_register.tnt_timer = nil
 mob_register.explosion_time = def.explosion_time
 mob_register.explosion_blink_color = def.explosion_blink_color or "white"
+mob_register.explosion_blink_timer = def.explosion_blink_timer or 0.2
 
 mob_register.custom_function_begin = def.custom_function_begin
 mob_register.custom_function_end = def.custom_function_end
@@ -99,6 +107,8 @@ mob_register.projectile_type = def.projectile_type
 
 mob_register.takes_fall_damage = def.takes_fall_damage or true
 mob_register.make_jump_noise = def.make_jump_noise
+mob_register.jump_animation = def.jump_animation
+mob_register.jumping_frame = def.jumping_frame
 
 mob_register.item_drop = def.item_drop
 mob_register.item_minimum = def.item_minimum or 1
@@ -110,13 +120,15 @@ mob_register.die_in_light_level = def.die_in_light_level
 mob_register.current_animation = 0
 mob_register.hurt_color_timer = 0
 mob_register.damage_color = def.damage_color or "red"
+mob_register.custom_on_death = def.custom_on_death
 
 mob_register.mob = true
 
 mob_register.collision_boundary = def.collision_boundary or 1
 
 if def.pathfinds then
-	mob_register.path = {}
+	--mob_register.path = {}
+	mob_register.pathfinding_timer = 0
 end
 
 mobs.create_movement_functions(def,mob_register)
@@ -126,7 +138,7 @@ mobs.create_animation_functions(def,mob_register)
 mobs.create_timer_functions(def,mob_register)
 
 
-mob_register.on_step = function(self, dtime)
+mob_register.on_step = function(self, dtime,moveresult)
 	if self.custom_function_begin then
 		self.custom_function_begin(self,dtime)
 	end
@@ -137,20 +149,33 @@ mob_register.on_step = function(self, dtime)
 	end
 	
 	if self.dead == false and self.death_animation_timer == 0 then
-		self.move(self,dtime)
+		self.move(self,dtime,moveresult)
 		--self.debug_nametag(self,dtime)
 		self.manage_hurt_color_timer(self,dtime)
-		self.set_animation(self)
+		if self.set_animation then
+			self.set_animation(self)
+		end
 		
 		if self.look_around then
 			self.look_around(self,dtime)
 		end
 		
+		if self.pathfinding then
+			self.pathfinding(self,dtime)
+		end
+
+		if self.handle_friendly_in_daylight_timer then
+			self.handle_friendly_in_daylight_timer(self,dtime)
+		end
+
 		self.manage_punch_timer(self,dtime)
 	else
 		self.manage_death_animation(self,dtime)
-		self.move_head(self,nil,dtime)
+		if self.move_head then
+			self.move_head(self,nil,dtime)
+		end
 	end
+
 	--fix zombie state again
 	if self.dead == true and self.death_animation_timer <= 0 then
 		self.on_death(self)