Update horse (cmer_horse) to Git commit 9c5c857...

https://github.com/AntumMT/mod-horse/tree/9c5c857

README.md

@@ -88,7 +88,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 	* [folks][] ([GPL][lic.gpl3.0]) -- version: [0.2.0][ver.folks] *2021-02-23*
 	* general/
 		* [mobs_animal][] ([MIT][lic.mobs_animal]) -- version: [80e72a4 Git][ver.mobs_animal] *2021-04-13* ([patched][patch.mobs_animal])
-	* [horse][] ([MIT][lic.horse]) -- version: [cbbb67f Git][ver.horse] *2021-05-04*
+	* [horse][] ([MIT][lic.horse]) -- version: [9c5c857 Git][ver.horse] *2021-05-05*
 	* [monsters_aggressive][] (see individual mods for licensing) -- version: [89a8187 Git][ver.monsters_aggressive] *2017-08-30*
 		* [ghost][creatures] ([Zlib][lic.creatures] / [CC BY-SA][lic.ccbysa3.0]) -- version: [2d3308c Git][ver.ghost] *2021-04-30*
 		* [oerkki][creatures] ([Zlib][lic.creatures] / [CC BY-SA][lic.ccbysa3.0]) -- version: [eb98833 Git][ver.oerkki] *2021-04-30*
@@ -527,7 +527,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [ver.home_gui]: https://github.com/cornernote/minetest-home_gui/tree/a291a09
 [ver.home_workshop]: https://gitlab.com/VanessaE/home_workshop_modpack/tree/03325e8
 [ver.homedecor]: https://gitlab.com/VanessaE/homedecor_modpack/tree/81e0d4e
-[ver.horse]: https://github.com/AntumMT/mod-horse/tree/cbbb67f
+[ver.horse]: https://github.com/AntumMT/mod-horse/tree/9c5c857
 [ver.hovercraft]: https://github.com/stujones11/hovercraft/tree/4d50e68
 [ver.hudbars]: http://repo.or.cz/minetest_hudbars.git/tree/0684bac
 [ver.hudmap]: https://github.com/stujones11/hudmap/tree/3b8bdc0

mods/mobiles/horse/init.lua

@@ -266,14 +266,12 @@ local sounds = {
 -- FIXME:
 -- - mounted horse movement is incorrect
 local base_def = {
-	--name = "creatures:horse_brown",
 	ownable = true,
 	stats = {
 		hp = 16,
 		hostile = false,
 		lifetime = 300,
 		can_jump = 0, -- FIXME: should only not be able to jump over certain nodes for coralling
-		--can_swim = true,
 		can_panic = true,
 		has_kockback = true,
 	},
@@ -282,22 +280,11 @@ local base_def = {
 			chance = 0.3,
 		},
 		walk = {chance=0.7, moving_speed=1,},
-		--attack = {},
-		--[[
-		follow = {
-			chance = 0.7,
-			moving_speed = 1,
-			--items = likes,
-		},
-		]]
-		--eat = {},
 	},
 	model = {
 		mesh = "mobs_horse.x",
-		--textures = {"mobs_horse.png"},
 		collisionbox = {-0.4, -0.01, -0.4, 0.4, 1, 0.4},
 		rotation = -90.0,
-		--backface_culling = ,
 		animations = {
 			idle = {
 				start = 25,
@@ -305,15 +292,6 @@ local base_def = {
 				speed = 15,
 			},
 			walk = {start=75, stop=100, speed=15,},
-			--attack = {},
-			--[[
-			follow = {
-				start = 75,
-				stop = 100,
-				speed = 15,
-			},
-			]]
-			--eat = {},
 		},
 	},
 	sounds = {
@@ -325,10 +303,6 @@ local base_def = {
 		}
 	},
 	drops = drops,
-	--[[
-	combat = {
-	},
-	]]
 	spawning = {
 		abm_nodes = {
 			spawn_on = {"default:dirt_with_grass"},
@@ -336,16 +310,9 @@ local base_def = {
 		},
 		abm_interval = 60,
 		abm_chance = 9000,
-		max_number = 2,
-		--number = 1,
-		--time_range = {},
+		max_number = 1,
 		light = {min=8, max=20},
 		height_limit = {min=-50, max=31000},
-		spawn_egg = {
-			--description = "Brown Horse",
-			--texture = "mobs_horse_inv.png",
-		},
-		--spawner = {},
 	},
 	on_rightclick = function(self, clicker)
 		return horse.on_rightclick(self, clicker)
@@ -367,19 +334,19 @@ local base_def = {
 
 local horses = {
 	{
-		name = "creatures:horse_brown",
+		name = "horse_brown",
 		description = "Brown Horse",
 		textures = {"mobs_horse.png"},
 		inventory_image = "mobs_horse_brown_inv.png",
 	},
 	{
-		name = "creatures:horse_white",
+		name = "horse_white",
 		description = "White Horse",
 		textures = {"mobs_horsepeg.png"},
 		inventory_image = "mobs_horse_white_inv.png",
 	},
 	{
-		name = "creatures:horse_black",
+		name = "horse_black",
 		description = "Black Horse",
 		textures = {"mobs_horseara.png"},
 		inventory_image = "mobs_horse_black_inv.png",
@@ -388,16 +355,30 @@ local horses = {
 
 for _, horse in ipairs(horses) do
 	local def = table.copy(base_def)
-	def.name = horse.name
+	def.name = "creatures:" .. horse.name
 	def.model.textures = horse.textures
-	def.spawning.spawn_egg.description = horse.description
-	def.spawning.spawn_egg.texture = horse.inventory_image
 
-	creatures.register_mob(def)
+	if not core.global_exists("asm") then
+		def.spawning.spawn_egg = {}
+		def.spawning.spawn_egg.description = horse.description
+		def.spawning.spawn_egg.texture = horse.inventory_image
+	else
+		asm.addEgg({
+			name=horse.name,
+			title=horse.description .. " Spawn Egg",
+			inventory_image = horse.inventory_image,
+			spawn = def.name,
+		})
+
+		core.register_alias(def.name .. "_spawn_egg", "spawneggs:" .. horse.name)
+	end
+
+	cmer.register_mob(def)
 end
 
 if not core.global_exists("mobs") then
-	creatures.register_alias("mob_horse:horse", "creatures:horse_brown")
+	cmer.register_alias("mob_horse:horse", "creatures:horse_brown")
+	cmer.register_alias("mobs:horse", "creatures:horse_brown")
 end
 
 if core.settings:get_bool("log_mods", false) then

mods/mobiles/horse/mod.conf

@@ -1,4 +1,4 @@
-name = horse
-description = A ridable horse based on kpgmobs
-depends = creatures, default
-optional_depends = mobs
+name = cmer_horse
+description = A ridable horse for Revived Creatures mob engine based on kpgmobs.
+depends = cmer, default
+optional_depends = mobs, asm_spawneggs