From bb2e1d091648a7099fde9f0242ab585a28498e0a Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Fri, 3 Nov 2017 18:51:58 +0100
Subject: [PATCH] Clean up agent code

---
 agent.lua          |  43 +++++++++
 init.lua           |   4 +-
 villager_agent.lua | 219 ---------------------------------------------
 3 files changed, 46 insertions(+), 220 deletions(-)
 create mode 100644 agent.lua
 delete mode 100644 villager_agent.lua

diff --git a/agent.lua b/agent.lua
new file mode 100644
index 0000000..a550117
--- /dev/null
+++ b/agent.lua
@@ -0,0 +1,43 @@
+--###################
+--################### AGENT
+--###################
+
+-- intllib
+local MP = minetest.get_modpath(minetest.get_current_modname())
+local S, NS = dofile(MP.."/intllib.lua")
+
+mobs:register_mob("mobs_mc:agent", {
+	type = "npc",
+	passive = true,
+	stepheight = 1.2,
+	hp_min = 20,
+	hp_max = 20,
+	armor = 100,
+	collisionbox = {-0.35, -0.01, -0.35, 0.35, 1, 0.35},
+	visual = "mesh",
+	mesh = "mobs_mc_agent.b3d",
+	textures = {
+		{"mobs_mc_agent.png"},
+	},
+	visual_size = {x=3, y=3},
+	walk_velocity = 0.6,
+	run_velocity = 2,
+	jump = true,
+	animation = {
+		stand_speed = 25,
+		walk_speed = 25,
+		run_speed = 50,
+		stand_start = 20,
+		stand_end = 60,
+		walk_start = 0,
+		walk_end = 20,
+		run_start = 0,
+		run_end = 20,
+	},
+})
+
+mobs:register_egg("mobs_mc:agent", S("Agent"), "mobs_mc_spawn_icon_agent.png", 0)
+
+if minetest.settings:get_bool("log_mods") then
+	minetest.log("action", "MC Agent loaded")
+end
diff --git a/init.lua b/init.lua
index 22d9848..2f05ab3 100644
--- a/init.lua
+++ b/init.lua
@@ -55,10 +55,12 @@ dofile(path .. "/squid.lua") -- Animation, sound and egg texture by daufinsyd
 
 -- NPC
 dofile(path .. "/villager.lua") -- KrupnoPavel Mesh and animation by toby109tt  / https://github.com/22i
---dofile(path .. "/villager_agent.lua") -- Mesh and animation by toby109tt  / https://github.com/22i
 dofile(path .. "/villager_evoker.lua") -- Mesh and animation by toby109tt  / https://github.com/22i
 dofile(path .. "/villager_vindicator.lua") -- Mesh and animation by toby109tt  / https://github.com/22i
 dofile(path .. "/villager_zombie.lua") -- Mesh and animation by toby109tt  / https://github.com/22i
+-- Agent texture missing
+--dofile(path .. "/agent.lua") -- Mesh and animation by toby109tt  / https://github.com/22i
+
 dofile(path .. "/witch.lua") -- Mesh and animation by toby109tt  / https://github.com/22i
 
 --Monsters
diff --git a/villager_agent.lua b/villager_agent.lua
deleted file mode 100644
index e3acc52..0000000
--- a/villager_agent.lua
+++ /dev/null
@@ -1,219 +0,0 @@
---MCmobs v0.2
---maikerumine
---made for MC like Survival game
---License for code WTFPL and otherwise stated in readmes
-
-
---dofile(minetest.get_modpath("mobs").."/api.lua")
-
---###################
---################### AGENT
---###################
-
-mobs:register_mob("mobs_mc:63agent", {
-	type = "animal",
-	passive = true,
-    runaway = true,
-    stepheight = 1.2,
-	hp_min = 30,
-	hp_max = 60,
-	armor = 150,
-    collisionbox = {-0.35, -0.01, -0.35, 0.35, 2, 0.35},
-	visual = "mesh",
-	mesh = "mobs_mc_agent.b3d",
-	textures = {
-		{"mobs_mc_agent.png"},
-	},
-	visual_size = {x=3, y=3},
-	walk_velocity = 0.6,
-	run_velocity = 2,
-	jump = true,
-	animation = {
-		speed_normal = 25,		speed_run = 50,
-		stand_start = 20,		stand_end = 60,
-		walk_start = 0,		walk_end = 20,
-		run_start = 0,		run_end = 20,
-	},
-})
-
-mobs:register_egg("mobs_mc:63agent", "Agent", "mobs_mc_spawn_icon_agent.png", 0)
-
-
-
-mobs:register_mob("mobs_mc:villager", {
-	type = "npc",
-	hp_min = 35,
-	hp_max = 75,
-	collisionbox = {-0.4, -0.01, -0.4, 0.4, 1.95, 0.4},
-	textures = {
-	{"mobs_farmer.png"}
-	},
-	visual = "mesh",
-	mesh = "mobs_villager.x",
-	makes_footstep_sound = true,
-	damage = 2,
-	walk_velocity = 1.2,
-	run_velocity = 2.4,
-	damage = 1,
-		group_attack = true,
-		attack_type = "dogfight",
-	drops = {
-		{name = "default:apple",
-		chance = 10,
-		min = 1,
-		max = 2,},
-	},
-	armor = 90,
-	sounds = {
-		random = "Villager1",
-		death = "Villagerdead",
-		damage = "Villagerhurt1",
-	},
-	animation = {
-		speed_normal = 30,
-		speed_run = 60,
-		stand_start = 0,
-		stand_end = 23,
-		walk_start = 24,
-		walk_end = 49,
-		run_start = 24,
-		run_end = 49,
-		hurt_start = 85,
-		hurt_end = 115,
-		death_start = 117,
-		death_end = 145,
-		shoot_start = 50,
-		shoot_end = 82,
-	},
-	water_damage = 1,
-	lava_damage = 5,
-	light_damage = 0,
-	view_range = 16,
-	fear_height = 5,
-	--[[
-	on_rightclick = function(self, clicker)
-		local inv
-		inv = minetest.get_inventory({type="detached", name="trading_inv"})
-		if not inv then
-			inv = minetest.create_detached_inventory("trading_inv", {
-				allow_take = function(inv, listname, index, stack, player)
-					if listname == "output" then
-						inv:remove_item("input", inv:get_stack("wanted", 1))
-						minetest.sound_play("Villageraccept", {to_player = player:get_player_name()})
-					end
-					if listname == "input" or listname == "output" then
-						--return 1000
-						return 0
-					else
-						return 0
-					end
-				end,
-				allow_put = function(inv, listname, index, stack, player)
-					if listname == "input" then
-						return 1000
-					else
-						return 0
-					end
-				end,
-				on_put = function(inv, listname, index, stack, player)
-					if inv:contains_item("input", inv:get_stack("wanted", 1)) then
-						inv:set_stack("output", 1, inv:get_stack("offered", 1))
-						minetest.sound_play("Villageraccept", {to_player = player:get_player_name()})
-					else
-						inv:set_stack("output", 1, ItemStack(""))
-						minetest.sound_play("Villagerdeny", {to_player = player:get_player_name()})
-					end
-				end,
-				on_move = function(inv, from_list, from_index, to_list, to_index, count, player)
-					if inv:contains_item("input", inv:get_stack("wanted", 1)) then
-						inv:set_stack("output", 1, inv:get_stack("offered", 1))
-						minetest.sound_play("Villageraccept", {to_player = player:get_player_name()})
-					else
-						inv:set_stack("output", 1, ItemStack(""))
-						minetest.sound_play("Villagerdeny", {to_player = player:get_player_name()})
-					end
-				end,
-				on_take = function(inv, listname, index, stack, player)
-					if inv:contains_item("input", inv:get_stack("wanted", 1)) then
-						inv:set_stack("output", 1, inv:get_stack("offered", 1))
-						minetest.sound_play("Villageraccept", {to_player = player:get_player_name()})
-					else
-						inv:set_stack("output", 1, ItemStack(""))
-						minetest.sound_play("Villagerdeny", {to_player = player:get_player_name()})
-						
-					end
-				end,
-			})
-			end
-		inv:set_size("input", 1)
-		inv:set_size("output", 1)
-		inv:set_size("wanted", 1)
-		inv:set_size("offered", 1)
-
-		local trades = {
-			{"default:apple 12",			"default:clay_lump 1"},
-			{"default:coal_lump 20",		"default:clay_lump 1"},
-			{"default:paper 30",			"default:clay_lump 1"},
-			{"mobs:leather 10",			"default:clay_lump 1"},
-			{"default:book 2",			"default:clay_lump 1"},
-			{"default:clay_lump 3",		"default:clay_lump 1"},
-			{"farming:potato 15",		"default:clay_lump 1"},
-			{"farming:wheat 20",			"default:clay_lump 1"},
-			{"farming:carrot 15",			"default:clay_lump 1"},
-			{"farming:melon_8 8",		"default:clay_lump 1"},
-			{"mobs:rotten_flesh 40",		"default:clay_lump 1"},
-			{"default:gold_ingot 10",		"default:clay_lump 1"},
-			{"farming:cotton 10",			"default:clay_lump 1"},
-			{"wool:white 15",			"default:clay_lump 1"},
-			{"farming:pumpkin 8",		"default:clay_lump 1"},
-
-			{"default:clay_lump 1",		"mobs:beef_cooked 5"},
-			{"default:clay_lump 1",		"mobs:chicken_cooked 7"},
-			{"default:clay_lump 1",		"farming:cookie 6"},
-			{"default:clay_lump 1",		"farming:pumpkin_bread 3"},
-			{"default:clay_lump 1",		"mobs:arrow 10"},
-			{"default:clay_lump 3",		"mobs:bow_wood 1"},
-			{"default:clay_lump 8",		"fishing:pole_wood 1"},
-			--{"default:clay_lump 4",		"potionspack:healthii 1"},
-			{"default:clay_lump 1",		"cake:cake 1"},
-			{"default:clay_lump 10",		"mobs:saddle 1"},
-			{"default:clay_lump 10",		"clock:1 1"},
-			{"default:clay_lumpd 10",		"compass:0 1"},
-			{"default:clay_lump 1",		"default:glass 5"},
-			{"default:clay_lump 1",		"nether:glowstone 3"},
-			{"default:clay_lump 3",		"mobs:shears 1"},
-			{"default:clay_lump 10",		"default:sword_diamond 1"},
-			{"default:clay_lump 20",		"3d_armor:chestplate_diamond 1"},
-		}
-		local tradenum = math.random(#trades)
-		inv:set_stack("wanted", 1, ItemStack(trades[tradenum][1]))
-		inv:set_stack("offered", 1, ItemStack(trades[tradenum][2]))
-		
-		local formspec = 
-		"size[9,8.75]"..
-		"background[-0.19,-0.25;9.41,9.49;trading_formspec_bg.png]"..
-		"bgcolor[#080808BB;true]"..
-		"listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]"..
-		"list[current_player;main;0,4.5;9,3;9]"..
-		"list[current_player;main;0,7.74;9,1;]"
-		.."list[detached:trading_inv;wanted;2,1;1,1;]"
-		.."list[detached:trading_inv;offered;5.75,1;1,1;]"
-		.."list[detached:trading_inv;input;2,2.5;1,1;]"
-		.."list[detached:trading_inv;output;5.75,2.5;1,1;]"
-		minetest.sound_play("Villagertrade", {to_player = clicker:get_player_name()})
-		minetest.show_formspec(clicker:get_player_name(), "tradespec", formspec)
-	end,
-	
-	]]
-})
-
--- compatibility
-mobs:alias_mob("mobs:villager", "mobs_mc:villager")
-
--- spawn eggs
-mobs:register_egg("mobs_mc:villager", "Villager", "spawn_egg_villager.png")
-
-
-if minetest.settings:get_bool("log_mods") then
-	minetest.log("action", "MC mobs loaded")
-end