From fe904239e0f073613c041d3cf238cbf1e73698cb Mon Sep 17 00:00:00 2001 From: "Edgar A. Bering IV" Date: Sat, 11 Mar 2017 20:47:49 -0600 Subject: [PATCH 1/3] Fix bug where monsters did not get protection from earthquakes (but combat rolls said they did). --- src/spells2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spells2.c b/src/spells2.c index 028763a..6b0e23b 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -2973,7 +2973,7 @@ void earthquake(int cy, int cx, int pit_y, int pit_x, int r, int who) } // do the damage and check for death - killed = mon_take_hit(cave_m_idx[y][x], damage, NULL, who); + killed = mon_take_hit(cave_m_idx[y][x], net_dam, NULL, who); // special effects for survivors if (!killed) From 90c5758b65366811b392c6a129286288ed4a0836 Mon Sep 17 00:00:00 2001 From: "Edgar A. Bering IV" Date: Sat, 11 Mar 2017 21:08:08 -0600 Subject: [PATCH 2/3] Correctly give the Channeling bonus to Staff of Earthquakes --- src/use-obj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/use-obj.c b/src/use-obj.c index f97452d..5f35739 100644 --- a/src/use-obj.c +++ b/src/use-obj.c @@ -529,7 +529,7 @@ static bool use_staff(object_type *o_ptr, bool *ident) case SV_STAFF_EARTHQUAKES: { - int radius = 3 + p_ptr->skill_use[S_WIL] / 5; + int radius = 3 + will_score / 5; earthquake(py, px, -1, -1, radius, -1); *ident = TRUE; break; From f4968479eb8a72cc34174a9aa88ce827fa8ebf91 Mon Sep 17 00:00:00 2001 From: "Edgar A. Bering IV" Date: Thu, 16 Mar 2017 18:21:05 -0400 Subject: [PATCH 3/3] Fix Song of Oaths In 1.3.0 Song of Oaths started summoning emerald serpents and not Oathwraiths like it should. Fix that. --- lib/docs/changes.txt | 2 +- lib/edit/monster.txt | 1 + src/defines.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/docs/changes.txt b/lib/docs/changes.txt index 520d930..e4f700c 100644 --- a/lib/docs/changes.txt +++ b/lib/docs/changes.txt @@ -992,4 +992,4 @@ - this chance is miniscule or even zero in normal play - but it goes up the more you use the stairs in quick succession - attempts to stairscum will quickly lead to being injured on a level with no escape - - we think this is pretty difficult to abuse.. \ No newline at end of file + - we think this is pretty difficult to abuse.. diff --git a/lib/edit/monster.txt b/lib/edit/monster.txt index cfb2218..4408d1d 100644 --- a/lib/edit/monster.txt +++ b/lib/edit/monster.txt @@ -1263,6 +1263,7 @@ D:A great serpent with scales of gleaming emerald. D: Noxious vapours surround it. +# Can't move from idx 153, used by monster Song of Oaths N:153:Oathwraith W:15:4 G:W:g diff --git a/src/defines.h b/src/defines.h index 41f9533..1beb700 100644 --- a/src/defines.h +++ b/src/defines.h @@ -222,7 +222,7 @@ #define R_IDX_BARROW_WIGHT 112 #define R_IDX_ALDOR 117 #define R_IDX_EASTERLING_SPY 121 -#define R_IDX_OATHWRAITH 152 +#define R_IDX_OATHWRAITH 153 #define R_IDX_CAT_WARRIOR 154 #define R_IDX_YOUNG_COLD_DRAKE 164 #define R_IDX_CAT_ASSASSIN 175