Merge remote-tracking branch 'upstream/master'

init.lua

@@ -28,8 +28,7 @@ mobs:register_mob("mob_horse:horse", {
 		stand2_start = 25, stand2_end = 25,
 		stand3_start = 55, stand3_end = 75, stand3_loop = false,
 		walk_start = 75, walk_end = 100,
-		run_start = 75, run_end = 100,
-		punch_start = 55, punch_end = 75, punch_speed = 35,
+		run_start = 75, run_end = 100
 	},
 	textures = {
 		{"mobs_horse.png"}, -- textures by Mjollna
@@ -37,28 +36,24 @@ mobs:register_mob("mob_horse:horse", {
 		{"mobs_horseara.png"}
 	},
 	fear_height = 3,
-	--runaway = true,
+	runaway = true,
 	fly = false,
 	walk_chance = 60,
-	view_range = 7,
+	view_range = 5,
 	follow = {
 		"farming:wheat", "default:apple", "farming:oat",
 		"farming:barley", "farming:corn"
 	},
-	passive = false, attack_type = "dogfight", reach = 2.5, damage = 3,
-	attack_chance = 95,
-	attack_monsters = true,
-	hp_min = 15,
-	hp_max = 23,
-	armor = 100,
+	passive = true,
+	hp_min = 12,
+	hp_max = 16,
+	armor = 200,
 	lava_damage = 5,
-	fire_damage = 4,
 	fall_damage = 1,
 	water_damage = 0,
 	makes_footstep_sound = true,
 	drops = {
-		{name = "mobs:leather", chance = 1, min = 0, max = 2},
-		{name = "mobs:meat_raw", chance = 1, min = 1, max = 2}
+		{name = "mobs:leather", chance = 1, min = 0, max = 2}
 	},
 
 	do_custom = function(self, dtime)
@@ -216,8 +211,9 @@ mobs:register_mob("mob_horse:horse", {
 	end,
 --[[
 	on_sound = function(self, def)
+		-- loudness ranges from (0.0 = cannot hear, to 1.0 = next to sound)
 		if def.loudness > 0.8 then -- if loud enough startle horse into jumping
-			self.object:set_velocity({x = 0, y = 5, z = 0})
+			self.object:set_velocity({x=0, y=5, z=0})
 		end
 	end
 ]]
@@ -344,4 +340,4 @@ if minetest.get_modpath("lucky_block") then
 	})
 end
 
-print("[MOD] Mobs Redo Horse loaded")
+print("[MOD] Mob Horse loaded")