Merge pull request #56 from Wuzzy2/180

Update models from AMC; fix rotation

bat.lua

@@ -6,7 +6,6 @@ mobs:register_mob("mobs_mc:bat", {
 	hp_min = 6,
 	hp_max = 6,
 	collisionbox = {-0.25, -0.01, -0.25, 0.25, 0.89, 0.25},
-	rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_bat.b3d",
 	textures = {

chicken.lua

@@ -18,8 +18,6 @@ mobs:register_mob("mobs_mc:chicken", {
 	collisionbox = {-0.2, -0.01, -0.2, 0.2, 0.69, 0.2},
 	runaway = true,
 	floats = 1,
-
-	rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_chicken.b3d",
 	textures = {

cow+mooshroom.lua

@@ -5,7 +5,6 @@ local cow_def = {
 	hp_min = 10,
 	hp_max = 10,
 	collisionbox = {-0.45, -0.01, -0.45, 0.45, 1.39, 0.45},
-	rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_cow.b3d",
 	textures = {

creeper.lua

@@ -18,7 +18,6 @@ mobs:register_mob("mobs_mc:creeper", {
 	hp_max = 20,
 	collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.69, 0.3},
 	pathfinding = 1,
-	rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_creeper.b3d",
 	textures = {

ender_dragon.lua

@@ -13,7 +13,6 @@ mobs:register_mob("mobs_mc:12enderdragon", {
 	hp_max = 60,
 	armor = 150,
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "enderdragon.b3d",
 	textures = {
@@ -43,7 +42,6 @@ mobs:register_mob("mobs_mc:enderdragon", {
 	--collisionbox = {-0.35, 0.51, -0.35, 0.35, 1.61, 0.35},
 	--collisionbox = {-0.5, 0.5, -0.5, 0.5, 1.2, 0.5},
 	collisionbox = {-0.5, 0.01, -0.5, 0.5, 1.2, 0.5},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_ender_dragon.b3d",
 	textures = {

enderman.lua

@@ -23,7 +23,6 @@ mobs:register_mob("mobs_mc:enderman", {
 	hp_min = 40,
 	hp_max = 40,
 	collisionbox = {-0.3, -0.01, -0.3, 0.3, 2.89, 0.3},
-	rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_enderman.b3d",
 	textures = {

endermite.lua

@@ -10,7 +10,6 @@ mobs:register_mob("mobs_mc:endermite", {
 	armor = 100,
 	group_attack = true,
 	collisionbox = {-0.2, -0.01, -0.2, 0.2, 0.29, 0.2},
-	rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_endermite.b3d",
 	textures = {

ghast.lua

@@ -18,7 +18,6 @@ mobs:register_mob("mobs_mc:ghast", {
 	hp_min = 10,
 	hp_max = 10,
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_ghast.b3d",
 	textures = {

guardian.lua

@@ -17,8 +17,6 @@ mobs:register_mob("mobs_mc:guardian", {
 	run_velocity = 4,
 	damage = 6,
 	group_attack = true,
-    -- Note: This collision box is pretty generous because they can't be rotated yet, but at least it not confusing for the player.
-    -- TODO: Make the hitbox smaller when Minetest supports rotation of collision boxes
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
 	visual = "mesh",
 	mesh = "mobs_mc_guardian.b3d",
@@ -42,7 +40,6 @@ mobs:register_mob("mobs_mc:guardian", {
 		min = 1,
 		max = 3,},
 	},
-    rotate = 180,
     visual_size = {x=4.5, y=4.5},
     makes_footstep_sound = false,
     stepheight = 2.1,

guardian_elder.lua

@@ -17,10 +17,7 @@ mobs:register_mob("mobs_mc:guardian_elder", {
 	run_velocity = 4,
 	damage = 8,
 	group_attack = true,
-    -- Note: This collision box is pretty generous because they can't be rotated yet, but at least it not confusing for the player.
-    -- TODO: Make the hitbox smaller when Minetest supports rotation of collision boxes
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_guardian.b3d",
 	textures = {
@@ -43,7 +40,6 @@ mobs:register_mob("mobs_mc:guardian_elder", {
 		min = 1,
 		max = 3,},
 	},
-    rotate = 180,
     visual_size = {x=4.5, y=4.5},
     makes_footstep_sound = false,
     stepheight = 2.1,

horse.lua

@@ -10,7 +10,15 @@
 --################### HORSE
 --###################
 
-
+local horse_extra_texture = function(base, saddle, chest)
+	if saddle then
+		base = base .. "^mobs_mc_horse_saddle.png"
+	end
+	if chest then
+		base = base .. "^mobs_mc_horse_chest.png"
+	end
+	return base
+end
 
 -- Horse
 local horse = {
@@ -18,7 +26,6 @@ local horse = {
 	visual = "mesh",
 	mesh = "mobs_mc_horse.b3d",
 	visual_size = {x=3.0, y=3.0},
-	rotate = -180,
 	collisionbox = {-0.69825, -0.01, -0.69825, 0.69825, 1.59, 0.69825},
 	animation = {
 		speed_normal = 25,		speed_run = 50,
@@ -58,12 +65,11 @@ local horse = {
 		-- set needed values if not already present
 		if not self.v2 then
 			self.v2 = 0
-			self.max_speed_forward = 2  --swap due to -180 model
-			self.max_speed_reverse = 7  --swap due to -180 model
+			self.max_speed_forward = 7
+			self.max_speed_reverse = 2
 			self.accel = 6
 			self.terrain_type = 3
-			self.driver_attach_at = {x = 0, y = 7.5, z = 1.75}
-			self.player_rotation = {x = 0, y = 180, z = 0}
+			self.driver_attach_at = {x = 0, y = 7.5, z = -1.75}
 			self.driver_eye_offset = {x = 0, y = 3, z = 0}
 			self.driver_scale = {x = 1/self.visual_size.x, y = 1/self.visual_size.y}
 		end
@@ -119,6 +125,11 @@ local horse = {
 					minetest.add_item(clicker.getpos(), mobs_mc.items.saddle)
 				end
 
+				-- Update texture
+				local tex = horse_extra_texture(self._naked_texture, false)
+				self.base_texture = { tex }
+				self.object:set_properties({textures = self.base_texture})
+
 			-- attach player to horse
 			elseif not self.driver
 			and clicker:get_wielded_item():get_name() == mobs_mc.items.saddle then
@@ -128,6 +139,16 @@ local horse = {
 
 				-- take saddle from inventory
 				inv:remove_item("main", mobs_mc.items.saddle)
+
+				-- Update texture
+				if not self._naked_texture then
+					-- Base horse texture without chest or saddle
+					self._naked_texture = self.base_texture[1]
+				end
+				local tex = horse_extra_texture(self._naked_texture, true)
+				self.base_texture = { tex }
+				self.object:set_properties({textures = self.base_texture})
+
 			end
 		end
 
@@ -173,7 +194,7 @@ mobs:register_mob("mobs_mc:zombie_horse", zombie_horse)
 -- Donkey
 local d = 0.86 -- donkey scale
 local donkey = table.copy(horse)
-donkey.mesh = "mobs_mc_mule.b3d"
+donkey.mesh = "mobs_mc_horse.b3d"
 donkey.textures = {{"mobs_mc_horse_creamy.png"}}
 donkey.animation = {
 	speed_normal = 25,

iron_golem.lua

@@ -17,7 +17,6 @@ mobs:register_mob("mobs_mc:iron_golem", {
 	hp_min = 100,
 	hp_max = 100,
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_iron_golem.b3d",
 	textures = {

llama.lua

@@ -18,7 +18,6 @@ mobs:register_mob("mobs_mc:llama", {
 	hp_max = 30,
 	passive = false,
 	collisionbox = {-0.45, -0.01, -0.45, 0.45, 1.86, 0.45},
-	rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_llama.b3d",
 	textures = {{"mobs_mc_llama.png"},{"mobs_mc_llama_brown.png"},{"mobs_mc_llama_creamy.png"},{"mobs_mc_llama_white.png"},{"mobs_mc_llama_gray.png"}},
@@ -67,14 +66,13 @@ mobs:register_mob("mobs_mc:llama", {
 		-- set needed values if not already present
 		if not self.v2 then
 			self.v2 = 0
-			self.max_speed_forward = 2  --swap due to -180 model
-			self.max_speed_reverse = 4  --swap due to -180 model
+			self.max_speed_forward = 4
+			self.max_speed_reverse = 2
 			self.accel = 4
 			self.terrain_type = 3
-			self.driver_attach_at = {x = 0, y = 7.5, z = 0}
-			self.player_rotation = {x = 0, y = 180, z = 0}
+			self.driver_attach_at = {x = 0, y = 7.5, z = -1.5}
 			self.driver_eye_offset = {x = 0, y = 3, z = 0}
-			self.driver_scale = {x = 0.3, y = 0.3}
+			self.driver_scale = {x = 1/self.visual_size.x, y = 1/self.visual_size.y}
 		end
 
 		-- if driver present allow control of horse
@@ -90,10 +88,8 @@ mobs:register_mob("mobs_mc:llama", {
 
 	on_die = function(self, pos)
 
-		-- drop saddle when horse is killed while riding
-		-- also detach from horse properly
+		-- detach from llama properly
 		if self.driver then
-			minetest.add_item(pos, mobs_mc.items.saddle)
 			mobs.detach(self.driver, {x = 1, y = 0, z = 1})
 		end
 
@@ -121,22 +117,11 @@ mobs:register_mob("mobs_mc:llama", {
 
 				mobs.detach(clicker, {x = 1, y = 0, z = 1})
 
-				-- add saddle back to inventory
-				if inv:room_for_item("main", mobs_mc.items.saddle) then
-					inv:add_item("main", mobs_mc.items.saddle)
-				else
-					minetest.add_item(clicker.getpos(), mobs_mc.items.saddle)
-				end
-
-			-- attach player to horse
-			elseif not self.driver
-			and clicker:get_wielded_item():get_name() == mobs_mc.items.saddle then
+			-- attach player to llama
+			elseif not self.driver then
 
 				self.object:set_properties({stepheight = 1.1})
 				mobs.attach(self, clicker)
-
-				-- take saddle from inventory
-				inv:remove_item("main", mobs_mc.items.saddle)
 			end
 		end
 

ocelot.lua

@@ -28,7 +28,6 @@ local ocelot = {
 	hp_min = 10,
 	hp_max = 10,
 	collisionbox = {-0.3, -0.01, -0.3, 0.3, 0.69, 0.3},
-	rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_cat.b3d",
 	textures = {"mobs_mc_cat_ocelot.png"},

parrot.lua

@@ -19,7 +19,6 @@ mobs:register_mob("mobs_mc:parrot", {
 	hp_min = 6,
 	hp_max = 6,
     collisionbox = {-0.25, -0.01, -0.25, 0.25, 0.6, 0.25},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_parrot.b3d",
 	textures = {{"mobs_mc_parrot_blue.png"},{"mobs_mc_parrot_green.png"},{"mobs_mc_parrot_grey.png"},{"mobs_mc_parrot_red_blue.png"},{"mobs_mc_parrot_yellow_blue.png"}},

pig.lua

@@ -6,7 +6,6 @@ mobs:register_mob("mobs_mc:pig", {
 	hp_min = 10,
 	hp_max = 10,
 	collisionbox = {-0.45, -0.01, -0.45, 0.45, 0.865, 0.45},
-	rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_pig.b3d",
 	textures = {
@@ -55,12 +54,11 @@ mobs:register_mob("mobs_mc:pig", {
 		-- set needed values if not already present
 		if not self.v2 then
 			self.v2 = 0
-			self.max_speed_forward = 2  --swap due to -180 model
-			self.max_speed_reverse = 4  --swap due to -180 model
+			self.max_speed_forward = 4
+			self.max_speed_reverse = 2
 			self.accel = 4
 			self.terrain_type = 3
-			self.driver_attach_at = {x = 0.0, y = 6.75, z = 1.5}
-			self.player_rotation = {x = 0, y = 180, z = 0}
+			self.driver_attach_at = {x = 0.0, y = 6.75, z = -1.5}
 			self.driver_eye_offset = {x = 0, y = 3, z = 0}
 			self.driver_scale = {x = 1/self.visual_size.x, y = 1/self.visual_size.y}
 		end

polar_bear.lua

@@ -17,7 +17,6 @@ mobs:register_mob("mobs_mc:polar_bear", {
 	hp_min = 30,
 	hp_max = 30,
 	collisionbox = {-0.7, -0.01, -0.7, 0.7, 1.39, 0.7},
-	rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_polar_bear.b3d",
 	textures = {

rabbit.lua

@@ -9,7 +9,6 @@ local rabbit = {
 	hp_max = 3,
 	collisionbox = {-0.2, -0.01, -0.2, 0.2, 0.49, 0.2},
 
-	rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_rabbit.b3d",
 	textures = {

shulker.lua

@@ -24,7 +24,6 @@ mobs:register_mob("mobs_mc:shulker", {
 	hp_max = 30,
 	armor = 150,
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_shulker.b3d",
 	textures = { "mobs_mc_shulker_purple.png", },

silverfish.lua

@@ -10,7 +10,6 @@ mobs:register_mob("mobs_mc:silverfish", {
 	hp_min = 8,
 	hp_max = 8,
 	collisionbox = {-0.4, -0.01, -0.4, 0.4, 0.44, 0.4},
-	rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_silverfish.b3d",
 	textures = {

skeleton.lua

@@ -22,7 +22,6 @@ mobs:register_mob("mobs_mc:skeleton", {
 	group_attack = true,
 	visual = "mesh",
 	mesh = "mobs_mc_skeleton.b3d",
-	    rotate = -180,
 	textures = {
 		{"mobs_mc_skeleton.png"},
 	},

skeleton_stray.lua

@@ -20,9 +20,8 @@ mobs:register_mob("mobs_mc:stray", {
 	pathfinding = true,
 	group_attack = true,
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-    rotate = -180,
 	visual = "mesh",
-	mesh = "mobs_mc_skeleton_stray.b3d",
+	mesh = "mobs_mc_stray.b3d",
 	textures = {
 		{"mobs_mc_stray.png"},
 	},

skeleton_wither.lua

@@ -20,7 +20,6 @@ mobs:register_mob("mobs_mc:witherskeleton", {
 	pathfinding = true,
 	group_attack = true,
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_wither_skeleton.b3d",
 	textures = {

snowman.lua

@@ -19,7 +19,6 @@ mobs:register_mob("mobs_mc:26snowman", {
 	hp_max = 60,
 	armor = 150,
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "snowman.b3d",
 	textures = {

spider.lua

@@ -23,7 +23,6 @@ local spider = {
 	hp_min = 16,
 	hp_max = 16,
 	collisionbox = {-0.7, -0.01, -0.7, 0.7, 0.89, 0.7},
-	rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_spider.b3d",
 	textures = {

vex.lua

@@ -20,7 +20,6 @@ mobs:register_mob("mobs_mc:vex", {
 	hp_min = 14,
 	hp_max = 14,
 	collisionbox = {-0.2, 0.2, -0.2, 0.2, 1.0, 0.2},  --bat
-	rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_vex.b3d",
 	textures = {

villager.lua

@@ -16,7 +16,6 @@ mobs:register_mob("mobs_mc:villager", {
 	hp_min = 35,
 	hp_max = 75,
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_villager.b3d",
 	textures = {

villager_agent.lua

@@ -19,7 +19,6 @@ mobs:register_mob("mobs_mc:63agent", {
 	hp_max = 60,
 	armor = 150,
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_agent.b3d",
 	textures = {

villager_evoker.lua

@@ -18,7 +18,6 @@ mobs:register_mob("mobs_mc:evoker", {
 	hp_min = 35,
 	hp_max = 75,
 	collisionbox = {-0.4, -0.01, -0.4, 0.4, 1.95, 0.4},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_evoker.b3d",
     textures = {

villager_illusioner.lua

@@ -14,7 +14,6 @@ mobs:register_mob("mobs_mc:illusioner", {
 	hp_max = 60,
 	armor = 150,
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_illusioner.b3d",
 	textures = {

villager_vindicator.lua

@@ -17,7 +17,6 @@ mobs:register_mob("mobs_mc:vindicator", {
 	hp_min = 35,
 	hp_max = 75,
 	collisionbox = {-0.4, -0.01, -0.4, 0.4, 1.95, 0.4},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_vindicator.b3d",
     textures = {

villager_zombie.lua

@@ -16,7 +16,6 @@ mobs:register_mob("mobs_mc:villager_zombie", {
 	hp_min = 35,
 	hp_max = 75,
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_villager_zombie.b3d",
 	textures = {

witch.lua

@@ -18,7 +18,6 @@ mobs:register_mob("mobs_mc:witch", {
 	hp_min = 26,
 	hp_max = 26,
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_witch.b3d",
 	textures = {

wither.lua

@@ -17,7 +17,6 @@ mobs:register_mob("mobs_mc:wither", {
 	hp_max = 300,
 	hp_min = 300,
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_wither.b3d",
 	textures = {

wolf.lua

@@ -21,7 +21,6 @@ local wolf = {
 	passive = false,
 	group_attack = true,
 	collisionbox = {-0.3, -0.01, -0.3, 0.3, 0.84, 0.3},
-	rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_wolf.b3d",
 	textures = {

zombie.lua

@@ -16,17 +16,13 @@ local zombie = {
 	type = "monster",
 	hp_min = 20,
 	hp_max = 20,
-    collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-	--collisionbox = {-0.5, -0.01, -0.5, 0.5, 1.9, 0.5},
-    --rotate = -180,
+	collisionbox = {-0.35, -0.01, -0.35, 0.35, 1.94, 0.35},
 	visual = "mesh",
-	-- TODO: Switch to AMC zombie texture
-	mesh = "mobs_zombie.x",
+	mesh = "mobs_mc_zombie.b3d",
 	textures = {
-		--{"zombie.png"},
-		{"mobs_zombie.png"},
+		{"mobs_mc_zombie.png"},
 	},
-	visual_size = {x=1, y=1},
+	visual_size = {x=3, y=3},
 	makes_footstep_sound = true,
 	sounds = {
 		random = "zombie1",
@@ -63,18 +59,10 @@ local zombie = {
 		max = 1,},
 	},
 	animation = {
-		speed_normal = 24,
-		speed_run = 48,
-		stand_start = 0,
-		stand_end = 23,
-		walk_start = 24,
-		walk_end = 47,
-		run_start = 48,
-		run_end = 62,
-		hurt_start = 64,
-		hurt_end = 86,
-		death_start = 88,
-		death_end = 118,
+		speed_normal = 25,		speed_run = 50,
+		stand_start = 40,		stand_end = 80,
+		walk_start = 0,		walk_end = 40,
+		run_start = 0,		run_end = 40,
 	},
 	drawtype = "front",
 	lava_damage = 5,

zombiepig.lua

@@ -16,7 +16,6 @@ local pigman = {
 	hp_max = 60,
 	armor = 150,
     collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-    rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_zombie_pigman.b3d",
 	textures = {{"mobs_mc_zombie_pigman.png"}},