From 768be1d7afa0cf7490c3a2988e9d9f46f540881a Mon Sep 17 00:00:00 2001
From: rasanpedromujica <rasanpedromujica@gmail.com>
Date: Thu, 17 Jan 2019 01:37:35 -0500
Subject: [PATCH] Missed spell merges, fixes to yelling

One more ops to the list.
Yell should work for 30x30 SQMs
---
 data/spells/scripts/spells/heal friend.lua  | 4 ++++
 data/spells/scripts/spells/mass healing.lua | 3 +++
 src/game.cpp                                | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/data/spells/scripts/spells/heal friend.lua b/data/spells/scripts/spells/heal friend.lua
index f3fd7d9..37d57f4 100644
--- a/data/spells/scripts/spells/heal friend.lua	
+++ b/data/spells/scripts/spells/heal friend.lua	
@@ -10,6 +10,10 @@ function onGetFormulaValues(player, level, maglevel)
 	
 	local formula = 3 * maglevel + (2 * level)
 	
+	if formula >= 101 then
+		formula = 100
+	end
+	
 	local min = (formula * (base - variation)) / 100
 	local max = (formula * (base + variation)) / 100
 	return min, max
diff --git a/data/spells/scripts/spells/mass healing.lua b/data/spells/scripts/spells/mass healing.lua
index 21eb5de..520a28a 100644
--- a/data/spells/scripts/spells/mass healing.lua	
+++ b/data/spells/scripts/spells/mass healing.lua	
@@ -21,6 +21,9 @@ function onTargetCreature(creature, target)
 	
 	local value = math.random(-variation, variation) + base
 	local formula = 3 * player:getMagicLevel() + (2 * player:getLevel())
+	if formula >= 101 then
+		formula = 100
+	end
 	local total = formula * value / 100
 
 	doTargetCombatHealth(0, target, COMBAT_HEALING, total, total, CONST_ME_NONE)
diff --git a/src/game.cpp b/src/game.cpp
index 1f41476..1c6d3d6 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -3125,7 +3125,7 @@ bool Game::internalCreatureSay(Creature* creature, SpeakClasses type, const std:
 			              Map::maxClientViewportX, Map::maxClientViewportX,
 			              Map::maxClientViewportY, Map::maxClientViewportY);
 		} else {
-			map.getSpectators(list, *pos, true, false, 18, 18, 14, 14);
+			map.getSpectators(list, *pos, true, false, 30, 30, 30, 30);
 		}
 	} else {
 		list = (*listPtr);