0007657: Flayed ghosts can flay you while you're standing in sanctuary.

Viewing Issue Simple Details [ Jump to Notes ] [ Wiki ]

[ View Advanced ] [ Issue History ] [ Print ]

Tags

No tags attached.

0001-Flayed-ghosts-flaying-inside-sanctuary.patch [^] (975 bytes) 2013-10-23 07:03 [Show Content] [Hide Content]

From 5b7298c1e72e64519fb2eef5732a0474ccc876dd Mon Sep 17 00:00:00 2001
From: Naruni <Naruni@crazynomad.org>
Date: Tue, 22 Oct 2013 21:57:20 -0700
Subject: [PATCH] Flayed ghosts flaying inside sanctuary.

Added a simple check at the beginning of _flay_creature in mon-abil.cc to
not allow the flaying of a player inside sanctuary.
---
 crawl-ref/source/mon-abil.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc
index 9e95266..266cbc9 100644
--- a/crawl-ref/source/mon-abil.cc
+++ b/crawl-ref/source/mon-abil.cc
@@ -1784,7 +1784,7 @@ static bool _flay_creature(monster* mon, actor* victim)
     if (victim->holiness() != MH_NATURAL)
         return false;
 
-    if (victim->is_player())
+    if (victim->is_player() && is_sanctuary(victim->pos()))
     {
         dam = (6 + (you.hp * 18 / you.hp_max)) * you.hp_max / 100;
         dam = min(dam, max(0, you.hp - 25 - random2(15)));
-- 
1.8.4

0002-Flayed-ghosts-flaying-inside-sanctuary.patch [^] (976 bytes) 2013-10-23 07:10 [Show Content] [Hide Content]

From 8fecb0de5aed13bfaa6f7a24de8b90948825c45b Mon Sep 17 00:00:00 2001
From: Naruni <Naruni@crazynomad.org>
Date: Tue, 22 Oct 2013 22:04:50 -0700
Subject: [PATCH] Flayed ghosts flaying inside sanctuary.

Added a simple check at the beginning of _flay_creature in mon-abil.cc to
not allow the flaying of a player inside sanctuary.
---
 crawl-ref/source/mon-abil.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc
index 9e95266..7da1db1 100644
--- a/crawl-ref/source/mon-abil.cc
+++ b/crawl-ref/source/mon-abil.cc
@@ -1784,7 +1784,7 @@ static bool _flay_creature(monster* mon, actor* victim)
     if (victim->holiness() != MH_NATURAL)
         return false;
 
-    if (victim->is_player())
+    if (victim->is_player() && !is_sanctuary(victim->pos()))
     {
         dam = (6 + (you.hp * 18 / you.hp_max)) * you.hp_max / 100;
         dam = min(dam, max(0, you.hp - 25 - random2(15)));
-- 
1.8.4

Relationships

Notes
(0024237) Naruni (reporter) 2013-10-23 07:03 edited on: 2013-10-23 07:04	I don't know much about how sanctuary should work. Should this be a check to see if THE target is in a sanctuary or if the PLAYER is in a sanctuary? edit: whoops that should be !is_sanctuary

(0024239) Kate (developer) 2013-10-23 17:22	Fixed, thanks for reporting.

Issue History
Date Modified	Username	Field	Change
2013-10-23 00:37	dck	New Issue
2013-10-23 07:03	Naruni	Note Added: 0024237
2013-10-23 07:03	Naruni	File Added: 0001-Flayed-ghosts-flaying-inside-sanctuary.patch
2013-10-23 07:04	Naruni	Note Edited: 0024237
2013-10-23 07:10	Naruni	File Added: 0002-Flayed-ghosts-flaying-inside-sanctuary.patch
2013-10-23 17:22	Kate	Note Added: 0024239
2013-10-23 17:22	Kate	Status	new => resolved
2013-10-23 17:22	Kate	Fixed in Branch	=> 0.14 development branch
2013-10-23 17:22	Kate	Resolution	open => done
2013-10-23 17:22	Kate	Assigned To	=> Kate

Mantis 1.1.8[^]