fix butcher

@@ -891,6 +891,16 @@ function _M:changeLevelReal(lev, zone, params)
 				end
 			end end
 			if #list > 0 then x, y = unpack(rng.table(list)) end
+		elseif params.auto_level_stair then
+			-- Dirty but quick
+			local list = {}
+			for i = 0, self.level.map.w - 1 do for j = 0, self.level.map.h - 1 do
+				local idx = i + j * self.level.map.w
+				if self.level.map.map[idx][Map.TERRAIN] and not self.level.map.map[idx][Map.TERRAIN].change_zone and self.level.map.map[idx][Map.TERRAIN].change_level == old_lev - self.level.level then
+					list[#list+1] = {i, j}
+				end
+			end end
+			if #list > 0 then x, y = unpack(rng.table(list)) end
 		end
 
 		-- Default to stairs
@@ -1671,7 +1681,7 @@ do return end
 				else
 					-- Do not unpause, the player is allowed first move on next level
 					if e.change_level_check and e:change_level_check(self.player) then return end
-					self:changeLevel(e.change_zone and e.change_level or self.level.level + e.change_level, e.change_zone, {keep_old_lev=e.keep_old_lev, force_down=e.force_down, auto_zone_stair=e.change_zone_auto_stairs, temporary_zone_shift_back=e.change_level_shift_back})
+					self:changeLevel(e.change_zone and e.change_level or self.level.level + e.change_level, e.change_zone, {keep_old_lev=e.keep_old_lev, force_down=e.force_down, auto_zone_stair=e.change_zone_auto_stairs, auto_level_stair=e.change_level_auto_stairs, temporary_zone_shift_back=e.change_level_shift_back})
 				end
 			else
 				self.log("There is no way out of this level here.")

@@ -898,8 +898,8 @@ newEntity{ base = "BASE_WARAXE",
 	rarity = 220,
 	cost = 50,
 	combat = {
-		dam = 18,
-		apr = 3,
+		dam = 20,
+		apr = 4,
 		physcrit = 12,
 		dammod = {str=1},
 		talent_on_hit = { [Talents.T_GREATER_WEAPON_FOCUS] = {level=2, chance=10} },

@@ -3422,23 +3422,30 @@ newEntity{ base = "BASE_WHIP", --Thanks Grayswandir!
 	require = { stat = { dex=14 }, },
 	cost = 150,
 	rarity = 325,
-	level_range = {4, 12},
+	level_range = {40, 50},
 	metallic = false,
-	material_level = 1,
+	material_level = 5,
 	combat = {
-		dam = 19,
+		dam = 55,
 		apr = 8,
-		physcrit = 5,
+		physcrit = 9,
 		dammod = {dex=1},
-		melee_project={[DamageType.BLEED] = 15},
+		melee_project={[DamageType.BLEED] = 30},
 		burst_on_crit = {
-			[DamageType.BLEED] = 20,
+			[DamageType.BLEED] = 50,
 		},
-		talent_on_hit = { [Talents.T_BONE_GRAB] = {level=1, chance=20} },
+		talent_on_hit = { [Talents.T_BONE_GRAB] = {level=3, chance=10}, [Talents.T_BONE_SPEAR] = {level=4, chance=20} },
+		
 	},
-	max_power = 24, power_regen = 1,
-	use_talent = { id = Talents.T_BONE_NOVA, level = 2, power = 24 },
-	talent_on_spell = { {chance=10, talent=Talents.T_BONE_SPEAR, level=2} },
+	wielder = {
+		combat_def = 12,
+		combat_spellpower = 4,
+		combat_physspeed = 0.1,
+		talents_types_mastery = { ["corruption/bone"] = 0.25, },
+	},
+	max_power = 20, power_regen = 1,
+	use_talent = { id = Talents.T_BONE_NOVA, level = 4, power = 20 },
+	talent_on_spell = { {chance=10, talent=Talents.T_BONE_SPEAR, level=4} },
 }
 
 newEntity{ base = "BASE_MINDSTAR",
@@ -3447,7 +3454,7 @@ newEntity{ base = "BASE_MINDSTAR",
 	name = "Core of the Forge", image = "object/artifact/core_of_the_forge.png",
 	unided_name = "fiery mindstar",
 	level_range = {38, 50},
-	color=colors.RED, image = "object/artifact/nexus_of_the_way.png",
+	color=colors.RED,
 	rarity = 350,
 	desc = [[This blazing hot mindstar beats rhythmically, releasing a burst of heat with each strike.]],
 	cost = 280,
@@ -3461,7 +3468,7 @@ newEntity{ base = "BASE_MINDSTAR",
 		damtype = DamageType.DREAMFORGE,
 	},
 	wielder = {
-		combat_mindpower = 14,
+		combat_mindpower = 15,
 		combat_mindcrit = 8,
 		combat_atk=10,
 		combat_dam=10,
@@ -3591,7 +3598,7 @@ newEntity{ base = "BASE_ARROW", --Thanks Grayswandir!
 	power_source = {arcane=true},
 	unique = true,
 	name = "Void Quiver",
-	unided_name = "etheral quiver",
+	unided_name = "ethereal quiver",
 	desc = [[An endless supply of arrows lay within this deep black quiver. Tiny white lights dot its surface.]],
 	color = colors.BLUE, image = "object/artifact/void_quiver.png",
 	level_range = {35, 50},
@@ -3605,7 +3612,7 @@ newEntity{ base = "BASE_ARROW", --Thanks Grayswandir!
 		dam = 45,
 		apr = 30, --No armor can stop the void
 		physcrit = 6,
-		dammod = {dex=0.7, str=0.5},
+		dammod = {dex=0.7, str=0.5, mag=0.1,},
 		damtype = DamageType.VOID,
 		talent_on_hit = { [Talents.T_QUANTUM_SPIKE] = {level=1, chance=10}, [Talents.T_TEMPORAL_CLONE] = {level=1, chance=5} },
 	},
@@ -5440,7 +5447,7 @@ newEntity{ base = "BASE_LONGSWORD",
 			local Talents = require "engine.interface.ActorTalents"
 			o.running=true
 			if target:canBe("instakill") then
-				who:forceUseTalent(Talents.T_DEVOUR, {ignore_cd=true, ignore_energy=true, force_target=target, force_level=4, ignore_ressources=true})
+				who:forceUseTalent(Talents.T_SWALLOW, {ignore_cd=true, ignore_energy=true, force_target=target, force_level=4, ignore_ressources=true})
 			end
 			o.running=false
 		end},

@@ -19,6 +19,11 @@
 
 base_size = 32
 
+rm, rM = rm or 180, rM or 220
+gm, gM = gm or 0, gM or 0
+bm, bM = bm or 200, bM or 255
+am, aM = am or 80, aM or 255
+
 return {
 	base = 1000,
 
@@ -27,10 +32,10 @@ return {
 	life = { 20, 30 },
 	size = { 15, 35 }, sizev = {0, 0}, sizea = {0, 0},
 
-	r = {180, 220}, rv = {0, 10}, ra = {0, 0},
-	g = {0, 0}, gv = {0, 0}, ga = {0, 0},
-	b = {200, 255}, bv = {0, 10}, ba = {0, 0},
-	a = {80, 255}, av = {0, 0}, aa = {0, 0},
+	r = {rm, rM}, rv = {0, 10}, ra = {0, 0},
+	g = {gm, gM}, gv = {0, 0}, ga = {0, 0},
+	b = {bm, bM}, bv = {0, 10}, ba = {0, 0},
+	a = {am, aM}, av = {0, 0}, aa = {0, 0},
 
 }, function(self)
 	self.nb = (self.nb or 0) + 1