Update 'mods/mobs_npc/villager.lua'

mods/mobs_npc/villager.lua

@@ -9,10 +9,15 @@ mobs.npc_drops = {
 
 human = {
 	male_skins = {},
---	female_skins = {}
+	female_skins = {}
 }
 
---Human skin gen
+
+
+
+--Skin gen
+
+--Human
 local human_skin = {
 	'human_skin-1.png', 'human_skin-2.png', 'human_skin-3.png',
 	'human_skin-4.png', 'human_skin-5.png', 'human_skin-6.png'
@@ -53,7 +58,6 @@ local female_shoes = {'shoes1-black.png', 'shoes1-brown.png'}
 
 local female_pants = {'pants1-blue.png', 'pants1-grey.png'}
 
-
 for i = 1, 100 do
 
 	table.insert(human.male_skins, {
@@ -66,21 +70,21 @@ for i = 1, 100 do
 	})
 end
 
---for i = 1, 16 do
+for i = 1, 100 do
 
---	table.insert(human.female_skins, {
---		human_skin[math.random(2)] .. '^'
---		.. human_female_eyes[math.random(3)] .. '^'
---		.. female_shirt[math.random(4)] .. '^'
---		.. female_shoes[math.random(2)] .. '^'
---		.. female_pants[math.random(2)] .. '^'
---		.. human_female_hair[math.random(4)]
---	})
---end
+	table.insert(human.female_skins, {
+		human_skin[math.random(2)] .. '^'
+		.. human_female_eyes[math.random(3)] .. '^'
+		.. female_shirt[math.random(4)] .. '^'
+		.. female_shoes[math.random(2)] .. '^'
+		.. female_pants[math.random(2)] .. '^'
+		.. human_female_hair[math.random(4)]
+	})
+end
 
 
 
-mobs:register_mob("mobs_npc:villager", {
+mobs:register_mob("mobs_npc:human_male", {
 	type = "npc",
 	passive = false,
 	damage = 3,
@@ -96,14 +100,8 @@ mobs:register_mob("mobs_npc:villager", {
 	visual = "mesh",
 	mesh = "mobs_character.b3d",
 	drawtype = "front",
-	textures = {
-		{human.male_skins},
-		{human.female_skins},
-	},
-	child_texture = {
-		{human.male_skins},
-		{human.female_skins},
-	},
+	textures = human.male_skins,
+	child_texture = human.male_skins,
 	makes_footstep_sound = true,
 	sounds = {},
 	walk_velocity = 2,
@@ -138,7 +136,114 @@ mobs:register_mob("mobs_npc:villager", {
 	on_rightclick = function(self, clicker)
 
 		-- feed to heal npc
-		if mobs:feed_tame(self, clicker, 8, true, true) then return end
+		if mobs:feed_tame(self, clicker, 8, false, true) then return end
+
+		-- capture npc with net or lasso
+		if mobs:capture_mob(self, clicker, nil, 5, 80, false, nil) then return end
+
+		-- protect npc with mobs:protector
+		if mobs:protect(self, clicker) then return end
+
+		local item = clicker:get_wielded_item()
+		local name = clicker:get_player_name()
+
+		-- right clicking with gold lump drops random item from mobs.npc_drops
+		if item:get_name() == "default:gold_lump" then
+
+			if not mobs.is_creative(name) then
+				item:take_item()
+				clicker:set_wielded_item(item)
+			end
+
+			local pos = self.object:get_pos()
+
+			pos.y = pos.y + 0.5
+
+			local drops = self.npc_drops or mobs.npc_drops
+
+			minetest.add_item(pos, {
+				name = drops[math.random(1, #drops)]
+			})
+
+			minetest.chat_send_player(name, S("NPC dropped you an item for gold!"))
+
+			return
+		end
+
+		-- by right-clicking owner can switch npc between follow and stand
+		if self.owner and self.owner == name then
+
+			if self.order == "follow" then
+
+				self.attack = nil
+				self.order = "stand"
+				self.state = "stand"
+				self:set_animation("stand")
+				self:set_velocity(0)
+
+				minetest.chat_send_player(name, S("NPC stands still."))
+			else
+				self.order = "follow"
+
+				minetest.chat_send_player(name, S("NPC will follow you."))
+			end
+		end
+	end,
+})
+
+mobs:register_mob("mobs_npc:human_female", {
+	type = "npc",
+	passive = false,
+	damage = 3,
+	attack_type = "dogfight",
+	attacks_monsters = true,
+	attack_npcs = false,
+	owner_loyal = true,
+	pathfinding = true,
+	hp_min = 10,
+	hp_max = 20,
+	armor = 100,
+	collisionbox = {-0.35,-1.0,-0.35, 0.35,0.8,0.35},
+	visual = "mesh",
+	mesh = "mobs_character.b3d",
+	drawtype = "front",
+	textures = human.female_skins,
+	child_texture = human.female_skins,
+	makes_footstep_sound = true,
+	sounds = {},
+	walk_velocity = 2,
+	run_velocity = 3,
+	jump = true,
+	drops = {
+		{name = "default:wood", chance = 1, min = 1, max = 3},
+		{name = "default:apple", chance = 2, min = 1, max = 2},
+		{name = "default:axe_stone", chance = 5, min = 1, max = 1},
+	},
+	water_damage = 0,
+	lava_damage = 2,
+	light_damage = 0,
+	follow = {"farming:bread", "mobs:meat", "default:diamond"},
+	view_range = 15,
+	owner = "",
+	order = "follow",
+	fear_height = 3,
+	animation = {
+		speed_normal = 30,
+		speed_run = 30,
+		stand_start = 0,
+		stand_end = 79,
+		walk_start = 168,
+		walk_end = 187,
+		run_start = 168,
+		run_end = 187,
+		punch_start = 200,
+		punch_end = 219,
+	},
+
+	on_rightclick = function(self, clicker)
+
+		-- feed to heal npc
+		if mobs:feed_tame(self, clicker, 8, false, true) then return end
 
 		-- capture npc with net or lasso
 		if mobs:capture_mob(self, clicker, nil, 5, 80, false, nil) then return end
@@ -207,4 +312,5 @@ if not mobs.custom_spawn_npc then
 	})
 end
 
-mobs:register_egg("mobs_npc:villager", S("Villager"), "default_brick.png", 1)
+mobs:register_egg("mobs_npc:human_male", S("Human male"), "default_brick.png", 1)
+mobs:register_egg("mobs_npc:human_female", S("Human female"), "default_brick.png", 1)