From a2c8d13f04391136b94c17abded46332065f96f0 Mon Sep 17 00:00:00 2001
From: the-real-herowl <wiktor_t-i@proton.me>
Date: Wed, 13 Dec 2023 04:51:56 +0100
Subject: [PATCH] Nerfed vexes and evokers

---
 mods/ENTITIES/mobs_mc/vex.lua             | 6 +++++-
 mods/ENTITIES/mobs_mc/villager_evoker.lua | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/mods/ENTITIES/mobs_mc/vex.lua b/mods/ENTITIES/mobs_mc/vex.lua
index fbb33804d..cedbc59ad 100644
--- a/mods/ENTITIES/mobs_mc/vex.lua
+++ b/mods/ENTITIES/mobs_mc/vex.lua
@@ -37,6 +37,7 @@ mcl_mobs.register_mob("mobs_mc:vex", {
 	walk_velocity = 3.2,
 	run_velocity = 5.9,
 	attack_type = "dogfight",
+	attack_frequency = 2,
 	sounds = {
 		-- TODO: random
 		death = "mobs_mc_vex_death",
@@ -63,10 +64,13 @@ mcl_mobs.register_mob("mobs_mc:vex", {
 				self.object:set_properties({textures=self.base_texture})
 			end
 		else
+			if self.base_texture[2] == "mobs_mc_vex_charging.png" then
+				self.base_texture[2] = "mobs_mc_vex.png"
+			end
 			if self.base_texture[1] ~= "default_tool_steelsword.png" then
 				self.base_texture[1] = "default_tool_steelsword.png"
-				self.object:set_properties({textures=self.base_texture})
 			end
+			self.object:set_properties({textures=self.base_texture})
 		end
 
 		-- Take constant damage if the vex' life clock ran out
diff --git a/mods/ENTITIES/mobs_mc/villager_evoker.lua b/mods/ENTITIES/mobs_mc/villager_evoker.lua
index a34f0ffe9..9d465c25d 100644
--- a/mods/ENTITIES/mobs_mc/villager_evoker.lua
+++ b/mods/ENTITIES/mobs_mc/villager_evoker.lua
@@ -42,6 +42,7 @@ mcl_mobs.register_mob("mobs_mc:evoker", {
 	run_velocity = 1.4,
 	group_attack = true,
 	attack_type = "dogfight",
+	attack_frequency = 15,
 	-- Summon vexes
 	custom_attack = function(self, to_attack)
 		if not spawned_vexes[self] then spawned_vexes[self] = {} end
@@ -64,7 +65,6 @@ mcl_mobs.register_mob("mobs_mc:evoker", {
 			table.insert(spawned_vexes[self],ent)
 		end
 	end,
-	shoot_interval = 15,
 	passive = false,
 	drops = {
 		{name = "mcl_core:emerald",
@@ -86,6 +86,11 @@ mcl_mobs.register_mob("mobs_mc:evoker", {
 	},
 	view_range = 16,
 	fear_height = 4,
+
+	on_spawn = function(self)
+		self.timer = 15
+		return true
+	end,
 })
 
 -- spawn eggs