Merge pull request 'Add piglins and hoglins from mcl5/extra_mobs' (#2714) from piglins into master

Reviewed-on: MineClone2/MineClone2#2714
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>

mods/ENTITIES/mcl_mobs/api.lua

@@ -3133,7 +3133,12 @@ local function check_item_pickup(self)
 			if l and l.name == "__builtin:item" then
 				for k,v in pairs(self.pick_up) do
 					if not player_near(p) and self.on_pick_up and l.itemstring:find(v) then
-						if self.on_pick_up(self,l) == nil then o:remove() end
+						local r =  self.on_pick_up(self,l)
+						if  r and r:get_count() > 0 then
+							l.itemstring = r:to_string()
+						else
+							o:remove()
+						end
 					end
 				end
 			end

mods/ENTITIES/mcl_mobs/api.txt

@@ -258,7 +258,7 @@ functions needed for the mob to work properly which contains the following:
 	'nofollow'			Do not follow players when they wield the "follow" item. For mobs (like villagers)
 						that are bred in a different way.
 	'pick_up'			table of itemstrings the mob will pick up (e.g. for breeding)
-	'on_pick_up'		function that will be called on item pickup - return true to not pickup the item
+	'on_pick_up'		function that will be called on item pickup - arguments are self and the itementity return a (modified) itemstack
 	'custom_visual_size' will not reset visual_size from the base class on reload
 	'noyaw'				If true this mob will not automatically change yaw
 	'particlespawners'	Table of particlespawners attached to the mob. This is implemented in a coord safe manner i.e. spawners are only sent to players within the player_transfer_distance (and automatically removed). This enables infinitely lived particlespawners.

mods/ENTITIES/mobs_mc/hoglin+zoglin.lua

@@ -0,0 +1,135 @@
+--MCmobs v0.4
+--maikerumine
+--made for MC like Survival game
+--License for code WTFPL and otherwise stated in readmes
+
+local S = minetest.get_translator("mobs_mc")
+
+--###################
+--################### hoglin
+--###################
+
+local hoglin = {
+	type = "monster",
+	passive = false,
+	spawn_class = "hostile",
+	hp_min = 40,
+	hp_max = 40,
+	xp_min = 9,
+	xp_max = 9,
+	armor = {fleshy = 90},
+	attack_type = "dogfight",
+	damage = 4,
+	reach = 3,
+	collisionbox = {-.6, -0.01, -.6, .6, 1.4, .6},
+	visual = "mesh",
+	mesh = "extra_mobs_hoglin.b3d",
+	textures = { {
+		"extra_mobs_hoglin.png",
+	} },
+	visual_size = {x=3, y=3},
+	sounds = {
+		random = "extra_mobs_hoglin",
+		damage = "extra_mobs_hoglin_hurt",
+		distance = 16,
+	},
+	jump = true,
+	makes_footstep_sound = true,
+	walk_velocity = 1,
+	run_velocity = 4,
+	drops = {
+		{name = "mobs_mcitems:leather",
+		chance = 1,
+		min = 0,
+		max = 1,},
+	},
+	drops = {
+		{name = "mcl_mobitems:porkchop",
+		chance = 1,
+		min = 2,
+		max = 4,},
+	},
+	animation = {
+		stand_speed = 7,
+		walk_speed = 7,
+		run_speed = 15,
+		stand_start = 24,
+		stand_end = 24,
+		walk_start = 11,
+		walk_end = 21,
+		run_start = 1,
+		run_end = 10,
+		punch_start = 22,
+		punch_end = 32,
+	},
+	fear_height = 4,
+	view_range = 32,
+	floats = 0,
+	custom_attack = function(self)
+		if self.state == "attack" and self.reach > vector.distance(self.object:get_pos(), self.attack:get_pos()) then
+			self.attack:add_velocity({x=0,y=13,z=0})
+			self.attack:punch(self.object, 1.0, {
+				full_punch_interval = 1.0,
+				damage_groups = {fleshy = self.damage}
+			}, nil)
+		end
+	end,
+	do_custom = function(self)
+		if self.object:get_pos().y > -100 then
+			local zog = minetest.add_entity(self.object:get_pos(), "mobs_mc:zoglin")
+			zog:set_rotation(self.object:get_rotation())
+			self.object:remove()
+		end
+	end,
+	attack_animals = true,
+}
+
+mcl_mobs:register_mob("mobs_mc:hoglin", hoglin)
+
+local zoglin = table.copy(hoglin)
+zoglin.fire_resistant = 1
+zoglin.textures = {"extra_mobs_zoglin.png"}
+zoglin.do_custom = function()
+	return
+end
+zoglin.attacks_monsters = true
+zoglin.lava_damage = 0
+zoglin.fire_damage = 0
+mcl_mobs:register_mob("mobs_mc:zoglin", zoglin)
+
+-- Baby hoglin.
+
+local baby_hoglin = table.copy(hoglin)
+baby_hoglin.collisionbox = {-.3, -0.01, -.3, .3, 0.94, .3}
+baby_hoglin.xp_min = 20
+baby_hoglin.xp_max = 20
+baby_hoglin.visual_size = {x=hoglin.visual_size.x/2, y=hoglin.visual_size.y/2}
+textures = { {
+	"extra_mobs_hoglin.png",
+	"extra_mobs_trans.png",
+} }
+baby_hoglin.walk_velocity = 1.2
+baby_hoglin.run_velocity = 2.4
+baby_hoglin.child = 1
+
+mcl_mobs:register_mob("mobs_mc:baby_hoglin", baby_hoglin)
+
+-- Regular spawning in the Nether
+mcl_mobs:spawn_specific(
+"mobs_mc:hoglin",
+"nether",
+"ground",
+{
+"Nether",
+"CrimsonForest"
+},
+0,
+minetest.LIGHT_MAX+1,
+30,
+6000,
+3,
+mcl_vars.mg_nether_min,
+mcl_vars.mg_nether_max)
+
+-- spawn eggs
+mcl_mobs:register_egg("mobs_mc:hoglin", S("Hoglin"), "#85682e", "#2b2140", 0)

mods/ENTITIES/mobs_mc/init.lua

@@ -149,4 +149,8 @@ dofile(path .. "/salmon.lua")
 dofile(path .. "/tropical_fish.lua")
 dofile(path .. "/dolphin.lua")
 
+
 dofile(path .. "/glow_squid.lua")
+
+dofile(path .. "/piglin.lua")
+dofile(path .. "/hoglin+zoglin.lua")

mods/ENTITIES/mobs_mc/piglin.lua

@@ -0,0 +1,320 @@
+--MCmobs v0.4
+--maikerumine
+--made for MC like Survival game
+--License for code WTFPL and otherwise stated in readmes
+
+local trading_items = {
+	{ itemstring = "mcl_core:obsidian", amount_min = 1, amount_max = 1 },
+	{ itemstring = "mcl_core:gravel", amount_min = 8, amount_max = 16 },
+	{ itemstring = "mcl_mobitems:leather", amount_min = 4, amount_max = 10 },
+	{ itemstring = "mcl_nether:soul_sand", amount_min = 4, amount_max = 16 },
+	{ itemstring = "mcl_nether:nether_brick", amount_min = 4, amount_max = 16 },
+	{ itemstring = "mcl_mobitems:string", amount_min = 3, amount_max = 9 },
+	{ itemstring = "mcl_nether:quartz", amount_min = 4, amount_max = 10 },
+	{ itemstring = "mcl_potions:water", amount_min = 1, amount_max = 1 },
+	{ itemstring = "mcl_core:iron_nugget", amount_min = 10, amount_max = 36 },
+	{ itemstring = "mcl_throwing:ender_pearl", amount_min = 2, amount_max = 6 },
+	{ itemstring = "mcl_potions:fire_resistance", amount_min = 1, amount_max = 1 },
+	{ itemstring = "mcl_potions:fire_resistance_splash", amount_min = 1, amount_max = 1 },
+}
+
+local S = minetest.get_translator("mobs_mc")
+local mod_bows = minetest.get_modpath("mcl_bows") ~= nil
+
+function mobs_mc.player_wears_gold(player)
+	for i=1, 6 do
+		local stack = player:get_inventory():get_stack("armor", i)
+		local item = stack:get_name()
+		if item == "mcl_armor:chestplate_gold" or item == "mcl_armor:leggings_gold" or item == "mcl_armor:helmet_gold" or item == "mcl_armor:boots_gold" then
+			return true
+		end
+	end
+end
+
+--###################
+--################### piglin
+--###################
+local piglin = {
+	type = "monster",
+	passive = false,
+	spawn_class = "hostile",
+	hp_min = 16,
+	hp_max = 16,
+	xp_min = 9,
+	xp_max = 9,
+	armor = {fleshy = 90},
+	damage = 4,
+	reach = 3,
+	collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.94, 0.3},
+	visual = "mesh",
+	mesh = "extra_mobs_piglin.b3d",
+	spawn_in_group = 4,
+	spawn_in_group_min = 2,
+	textures = { {
+		"extra_mobs_piglin.png",
+		"mcl_bows_bow_2.png",
+	} },
+	visual_size = {x=1, y=1},
+	sounds = {
+		random = "extra_mobs_piglin",
+		damage = "extra_mobs_piglin_hurt",
+		distance = 16,
+	},
+	jump = true,
+	makes_footstep_sound = true,
+	walk_velocity = 4.317,
+	run_velocity = 5.6121,
+	drops = {
+		{name = "mcl_bows:crossbow",
+		chance = 10,
+		min = 1,
+		max = 1,},
+	},
+	animation = {
+		stand_speed = 30,
+		walk_speed = 30,
+		run_speed = 30,
+		stand_start = 0,
+		stand_end = 79,
+		walk_start = 168,
+		walk_end = 187,
+		run_start = 440,
+		run_end = 459,
+	},
+	fear_height = 4,
+	view_range = 16,
+	pick_up = {"mcl_core:gold_ingot"},
+	on_spawn = function(self)
+		self.weapon = self.base_texture[2]
+		self.gold_items = 0
+	end,
+	do_custom = function(self)
+		if self.object:get_pos().y > mcl_vars.mg_overworld_min then
+			local zog = minetest.add_entity(self.object:get_pos(), "mobs_mc:zombified_piglin")
+			zog:set_rotation(self.object:get_rotation())
+			self.object:remove()
+			return
+		elseif self.trading == true then
+			self.state = "trading"
+			self.object:set_bone_position("Arm_Right_Pitch_Control", vector.new(-3,5.785,0), vector.new(20,-20,18))
+			self.object:set_bone_position("Head", vector.new(0,6.3,0), vector.new(-40,0,0))
+			self.base_texture[2] = "default_gold_ingot.png"
+			self.object:set_properties({textures = self.base_texture})
+		else
+			self.object:set_bone_position("Wield_Item", vector.new(.5,4.5,-1.6), vector.new(90,0,20))
+			self.base_texture[2] = self.weapon
+			self.object:set_properties({textures = self.base_texture})
+			self.object:set_bone_position("Head", vector.new(0,6.3,0), vector.new(0,0,0))
+			self.object:set_bone_position("Arm_Right_Pitch_Control", vector.new(-3,5.785,0), vector.new(0,0,0))
+		end
+
+		if self.state ~= "attack" then
+			self._attacked_by_player = false
+		elseif self.attack:is_player() and mobs_mc.player_wears_gold(self.attack) then
+			if self._attacked_by_player == false then
+				self.state = "stand"
+			end
+		end
+	end,
+	on_pick_up  = function(self, itementity)
+		local item = itementity.itemstring:split(" ")[1]
+		local it = ItemStack(itementity.itemstring)
+		if item == "mcl_core:gold_ingot" and self.state ~= "attack" and self.gold_items and self.gold_items < 3 then
+			it:take_item(1)
+			self.state = "stand"
+			self.object:set_animation({x=0,y=79})
+			self.trading = true
+			self.gold_items = self.gold_items + 1
+			self.object:set_bone_position("Wield_Item", vector.new(-1.5,4.9,1.8), vector.new(135,0,90))
+			minetest.after(5, function()
+				self.gold_items = self.gold_items - 1
+				if self.gold_items == 0 then
+					self.trading = false
+					self.state = "stand"
+				end
+				local c_pos = self.object:get_pos()
+				if c_pos then
+					self.what_traded = trading_items[math.random(#trading_items)]
+					for x = 1, math.random(self.what_traded.amount_min, self.what_traded.amount_max) do
+						local p = c_pos
+						local nn=minetest.find_nodes_in_area_under_air(vector.offset(c_pos,-1,-1,-1),vector.offset(c_pos,1,1,1),{"group:solid"})
+						if nn and #nn > 0 then
+							p = vector.offset(nn[math.random(#nn)],0,1,0)
+						end
+						minetest.add_item(p, self.what_traded.itemstring)
+					end
+				end
+			end)
+		end
+		return it
+	end,
+	do_punch = function(self, hitter)
+		if hitter:is_player() then
+			self._attacked_by_player = true
+		end
+	end,
+	attack_type = "dogshoot",
+	arrow = "mcl_bows:arrow_entity",
+	shoot_arrow = function(self, pos, dir)
+		if mod_bows then
+			if self.attack then
+				self.object:set_yaw(minetest.dir_to_yaw(vector.direction(self.object:get_pos(), self.attack:get_pos())))
+			end
+			-- 2-4 damage per arrow
+			local dmg = math.max(4, math.random(2, 8))
+			mcl_bows.shoot_arrow("mcl_bows:arrow", pos, dir, self.object:get_yaw(), self.object, nil, dmg)
+		end
+	end,
+	shoot_interval = 2,
+	shoot_offset = 1.5,
+	dogshoot_switch = 1,
+	dogshoot_count_max =1.8,
+	attacks_monsters = true,
+	attack_animals = true,
+	specific_attack = { "player", "mobs_mc:hoglin" },
+}
+
+mcl_mobs:register_mob("mobs_mc:piglin", piglin)
+
+
+local sword_piglin = table.copy(piglin)
+sword_piglin.mesh = "extra_mobs_sword_piglin.b3d"
+sword_piglin.textures = {"extra_mobs_piglin.png", "default_tool_goldsword.png"}
+sword_piglin.on_spawn = function(self)
+	self.gold_items = 0
+	self.weapon = self.base_texture[2]
+	self.object:set_bone_position("Wield_Item", vector.new(0,3.9,1.3), vector.new(90,0,0))
+end
+sword_piglin.drops = {
+	{name = "mcl_tools:sword_gold",
+	chance = 10,
+	min = 1,
+	max = 1,},
+}
+sword_piglin.attack_type = "dogfight"
+sword_piglin.animation = {
+	stand_speed = 30,
+	walk_speed = 30,
+	punch_speed = 45,
+	run_speed = 30,
+	stand_start = 0,
+	stand_end = 79,
+	walk_start = 168,
+	walk_end = 187,
+	run_start = 440,
+	run_end = 459,
+	punch_start = 189,
+	punch_end = 198,
+}
+mcl_mobs:register_mob("mobs_mc:sword_piglin", sword_piglin)
+
+local zombified_piglin = table.copy(piglin)
+zombified_piglin.fire_resistant = 1
+zombified_piglin.do_custom = function()
+	return
+end
+zombified_piglin.on_spawn = function()
+	return
+end
+zombified_piglin.on_rightclick = function()
+	return
+end
+zombified_piglin.lava_damage = 0
+zombified_piglin.fire_damage = 0
+zombified_piglin.attack_animals = true
+zombified_piglin.mesh = "extra_mobs_sword_piglin.b3d"
+zombified_piglin.textures = {"extra_mobs_zombified_piglin.png", "default_tool_goldsword.png", "extra_mobs_trans.png"}
+zombified_piglin.attack_type = "dogfight"
+zombified_piglin.animation = {
+	stand_speed = 30,
+	walk_speed = 30,
+	punch_speed = 45,
+	run_speed = 30,
+	stand_start = 0,
+	stand_end = 79,
+	walk_start = 168,
+	walk_end = 187,
+	run_start = 440,
+	run_end = 459,
+	punch_start = 189,
+	punch_end = 198,
+}
+mcl_mobs:register_mob("mobs_mc:zombified_piglin", zombified_piglin)
+
+
+local piglin_brute = table.copy(piglin)
+piglin_brute.xp_min = 20
+piglin_brute.xp_max = 20
+piglin_brute.hp_min = 50
+piglin_brute.hp_max = 50
+piglin_brute.fire_resistant = 1
+piglin_brute.do_custom = function()
+	return
+end
+piglin_brute.on_spawn = function()
+	return
+end
+piglin_brute.on_rightclick = function()
+	return
+end
+piglin_brute.attacks_monsters = true
+piglin_brute.lava_damage = 0
+piglin_brute.fire_damage = 0
+piglin_brute.attack_animals = true
+piglin_brute.mesh = "extra_mobs_sword_piglin.b3d"
+piglin_brute.textures = {"extra_mobs_piglin_brute.png", "default_tool_goldaxe.png", "extra_mobs_trans.png"}
+piglin_brute.attack_type = "dogfight"
+piglin_brute.animation = {
+	stand_speed = 30,
+	walk_speed = 30,
+	punch_speed = 45,
+	run_speed = 30,
+	stand_start = 0,
+	stand_end = 79,
+	walk_start = 168,
+	walk_end = 187,
+	run_start = 440,
+	run_end = 459,
+	punch_start = 189,
+	punch_end = 198,
+}
+piglin_brute.can_despawn = false
+piglin_brute.group_attack = { "mobs_mc:piglin", "mobs_mc:piglin_brute" }
+mcl_mobs:register_mob("mobs_mc:piglin_brute", piglin_brute)
+
+
+-- Regular spawning in the Nether
+mcl_mobs:spawn_specific(
+"mobs_mc:piglin",
+"nether",
+"ground",
+{
+"Nether",
+"CrimsonForest"
+},
+0,
+minetest.LIGHT_MAX+1,
+30,
+6000,
+3,
+mcl_vars.mg_lava_nether_max,
+mcl_vars.mg_nether_max)
+
+mcl_mobs:spawn_specific(
+"mobs_mc:sword_piglin",
+"nether",
+"ground",
+{
+"Nether",
+"CrimsonForest"
+},
+0,
+minetest.LIGHT_MAX+1,
+30,
+6000,
+3,
+mcl_vars.mg_lava_nether_max,
+mcl_vars.mg_nether_max)
+-- spawn eggs
+mcl_mobs:register_egg("mobs_mc:piglin", S("Piglin"), "#7b4a17","#d5c381", 0)
+mcl_mobs:register_egg("mobs_mc:piglin_brute", S("Piglin Brute"), "#562b0c","#ddc89d", 0)

mods/ENTITIES/mobs_mc/villager.lua

@@ -1286,16 +1286,17 @@ mcl_mobs:register_mob("mobs_mc:villager", {
 	can_open_doors = true,
 	on_pick_up = function(self,itementity)
 		local clicker
+		local it = ItemStack(itementity.itemstring)
 		for _,p in pairs(minetest.get_connected_players()) do
 			if vector.distance(p:get_pos(),self.object:get_pos()) < 10 then
 				clicker = p
 			end
 		end
-		if clicker then
+		if clicker and not self.horny then
 			mcl_mobs:feed_tame(self, clicker, 1, true, false, true)
-			return
+			it:take_item(1)
 		end
-		return true --do not pick up
+		return it
 	end,
 	on_rightclick = function(self, clicker)
 		if self._jobsite then