From d01017a5a31567bed5c8313ef9b9072811fdb153 Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Sat, 4 Jan 2020 01:23:38 +0100
Subject: [PATCH] Worldmap ambushes npcs and graveyard coffin npcs are now of
 rank rare instead of elite, which they already were in all but name

---
 .../modules/tome/data/general/encounters/fareast-npcs.lua | 4 ++--
 .../tome/data/general/encounters/maj-eyal-npcs.lua        | 8 ++++----
 game/modules/tome/data/zones/last-hope-graveyard/zone.lua | 5 ++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/game/modules/tome/data/general/encounters/fareast-npcs.lua b/game/modules/tome/data/general/encounters/fareast-npcs.lua
index fbaaf59675..114621e6d4 100644
--- a/game/modules/tome/data/general/encounters/fareast-npcs.lua
+++ b/game/modules/tome/data/general/encounters/fareast-npcs.lua
@@ -37,7 +37,7 @@ newEntity{
 		nb={3, 4},
 		filters={{special_rarity="humanoid_random_boss", subtype="human", random_boss={
 			nb_classes=1, force_classes = {['Sun Paladin']=true},
-			rank=3, ai = "tactical",
+			rank=3.2, ai = "tactical",
 			life_rating=function(v) return v * 1.4 + 3 end,
 			loot_quality = "store",
 			loot_quantity = 1,
@@ -64,7 +64,7 @@ newEntity{
 		nb={3, 4},
 		filters={{special_rarity="humanoid_random_boss", subtype="shalore", random_boss={
 			nb_classes=1, force_classes = {['Anorithil']=true},
-			rank=3, ai = "tactical",
+			rank=3.2, ai = "tactical",
 			life_rating=function(v) return v * 1.4 + 3 end,
 			loot_quality = "store",
 			loot_quantity = 1,
diff --git a/game/modules/tome/data/general/encounters/maj-eyal-npcs.lua b/game/modules/tome/data/general/encounters/maj-eyal-npcs.lua
index cc5d06b45a..145bc50b29 100644
--- a/game/modules/tome/data/general/encounters/maj-eyal-npcs.lua
+++ b/game/modules/tome/data/general/encounters/maj-eyal-npcs.lua
@@ -38,7 +38,7 @@ newEntity{
 		nb={3, 4},
 		filters={{special_rarity="humanoid_random_boss", subtype="human", random_boss={
 			nb_classes=1,
-			rank=3, ai = "tactical",
+			rank=3.2, ai = "tactical",
 			life_rating=function(v) return v * 1.4 + 3 end,
 			loot_quality = "store",
 			loot_quantity = 1,
@@ -67,7 +67,7 @@ newEntity{
 		nb={3, 4},
 		filters={{special_rarity="humanoid_random_boss", subtype="halfling", random_boss={
 			nb_classes=1,
-			rank=3, ai = "tactical",
+			rank=3.2, ai = "tactical",
 			life_rating=function(v) return v * 1.4 + 3 end,
 			loot_quality = "store",
 			loot_quantity = 1,
@@ -94,7 +94,7 @@ newEntity{
 		nb={2, 3},
 		filters={{special_rarity="humanoid_random_boss", random_boss={
 			nb_classes=1,
-			rank=3, ai = "tactical",
+			rank=3.2, ai = "tactical",
 			life_rating=function(v) return v * 1.3 + 2 end,
 			loot_quality = "store",
 			loot_quantity = 1,
@@ -132,7 +132,7 @@ newEntity{
 		nb={2, 3},
 		filters={{special_rarity="zigur_random_boss", random_boss={
 			nb_classes=1,
-			rank=3, ai = "tactical",
+			rank=3.2, ai = "tactical",
 			life_rating=function(v) return v * 1.3 + 2 end,
 			loot_quality = "store",
 			loot_quantity = 1,
diff --git a/game/modules/tome/data/zones/last-hope-graveyard/zone.lua b/game/modules/tome/data/zones/last-hope-graveyard/zone.lua
index bb02b7a568..cd45164260 100644
--- a/game/modules/tome/data/zones/last-hope-graveyard/zone.lua
+++ b/game/modules/tome/data/zones/last-hope-graveyard/zone.lua
@@ -97,11 +97,10 @@ return {
 				end
 			end
 		else]] if r <= 60 then
-			g.sumomn_npc = game.zone:makeEntity(game.level, "actor", {properties={"undead"}, add_levels=10, random_boss={nb_classes=1, rank=3, ai = "tactical", loot_quantity = 0, no_loot_randart = true}}, nil, true)
+			g.sumomn_npc = game.zone:makeEntity(game.level, "actor", {properties={"undead"}, add_levels=10, random_boss={nb_classes=1, rank=3.2, ai = "tactical", loot_quantity = 0, no_loot_randart = true}}, nil, true)
 			fct = function(self, x, y, who)
 				local x, y = util.findFreeGrid(who.x, who.y, 5, true, {[engine.Map.ACTOR]=true})
 				if self.sumomn_npc and x and y then
-					self.sumomn_npc.instakill_immune = 1
 					game.zone:addEntity(game.level, self.sumomn_npc, "actor", x, y)
 					self.sumomn_npc = nil
 					game.log("You were not the first here: the corpse was turned into an undead.")
@@ -163,7 +162,7 @@ return {
 			if g.define_as == "COFFIN" then
 				game.zone:addEntity(game.level, coffin_open, "terrain", spot.x, spot.y)
 
-				local m = game.zone:makeEntity(game.level, "actor", {properties={"undead"}, add_levels=10, random_boss={nb_classes=1, rank=3, ai = "tactical", loot_quantity = 0, no_loot_randart = true}}, nil, true)
+				local m = game.zone:makeEntity(game.level, "actor", {properties={"undead"}, add_levels=10, random_boss={nb_classes=1, rank=3.2, ai = "tactical", loot_quantity = 0, no_loot_randart = true}}, nil, true)
 				local x, y = util.findFreeGrid(spot.x, spot.y, 5, true, {[engine.Map.ACTOR]=true})
 				if m and x and y then
 					game.zone:addEntity(game.level, m, "actor", x, y)
-- 
GitLab