diff options
| -rw-r--r-- | crawl-ref/source/effects.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/mon-data.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 12 | ||||
| -rw-r--r-- | crawl-ref/source/monplace.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/view.cc | 1 |
7 files changed, 10 insertions, 14 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 646e007207..7675562ce3 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -3466,7 +3466,6 @@ void handle_time(long time_delta) { int total_jellies = 1 + random2(5); bool success = false; - int created; for (int num_jellies = total_jellies; num_jellies > 0; num_jellies--) { //Spread jellies around the level diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 9f35b925b9..97f8010b36 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -4010,7 +4010,7 @@ static monsterentry mondata[] = { { MONS_DISSOLUTION, 'J', LIGHTMAGENTA, "Dissolution", M_UNIQUE | M_NO_SKELETON | M_SENSE_INVIS | M_ACID_SPLASH | M_BURROWS - | M_SPEAKS, + | M_PRIEST | M_SPEAKS, MR_RES_POISON | MR_RES_ASPHYX | mrd(MR_RES_ACID, 3), 0, 11, MONS_JELLY, MONS_DISSOLUTION, MH_NATURAL, -7, { {AT_HIT, AF_ACID, 50}, {AT_HIT, AF_ACID, 30}, AT_NO_ATK, AT_NO_ATK }, diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 109d4c60a7..4d4569a51d 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -628,16 +628,12 @@ bool mons_is_icy(int mc) || mc == MONS_ICE_STATUE); } -// Monsters consider as "slime" for Jiyva. +// Monsters considered as "slime" for Jiyva. bool mons_is_slime(const monsters *mon) { - if (mons_genus(mon->type) == MONS_JELLY - || mons_genus(mon->type) == MONS_GIANT_EYEBALL - || mons_genus(mon->type) == MONS_GIANT_ORANGE_BRAIN) - { - return (true); - } - return (false); + return (mons_genus(mon->type) == MONS_JELLY + || mons_genus(mon->type) == MONS_GIANT_EYEBALL + || mons_genus(mon->type) == MONS_GIANT_ORANGE_BRAIN); } bool mons_eats_items(const monsters *mon) diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index d5a682c4b9..ed018183aa 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -1059,6 +1059,9 @@ static int _place_monster_aux(const mgen_data &mg, case MONS_ORC: menv[id].god = GOD_BEOGH; break; + case MONS_JELLY: + menv[id].god = GOD_JIYVA; + break; case MONS_MUMMY: case MONS_DRACONIAN: case MONS_ELF: diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 46716b0437..0a0269fbef 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -5581,9 +5581,8 @@ static bool _handle_special_ability(monsters *monster, bolt & beem) case MONS_SILVER_STATUE: if (_is_player_or_mon_sanct(monster)) - { break; - } + used = silver_statue_effects(monster); break; diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 303acc7774..9c4d5ee52e 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -195,7 +195,7 @@ static const char *_Sacrifice_Messages[NUM_GODS][NUM_PIETY_GAIN] = // Jiyva { " slowly dissolve% into ooze.", - " dissolve% into ooze .", + " dissolve% into ooze.", " disappear% with a satisfied slurp.", } }; diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 433c882c66..15ebb8f23a 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -975,7 +975,6 @@ void slime_conversion(monsters* monster) && !testbits(monster->flags, MF_ATT_CHANGE_ATTEMPT) && mons_player_visible(monster) && !mons_is_sleeping(monster) && !mons_is_confused(monster) && !mons_is_paralysed(monster)) - { monster->flags |= MF_ATT_CHANGE_ATTEMPT; if (!player_under_penance()) |