Rename guardian nagas to guardian serpents.

The tile is left untouched for now.

13 files changed, 43 insertions, 30 deletions

diff --git a/crawl-ref/source/dat/database/monspell.txt b/crawl-ref/source/dat/database/monspell.txt
index 1145bf6045..740536da72 100644
--- a/crawl-ref/source/dat/database/monspell.txt
+++ b/crawl-ref/source/dat/database/monspell.txt
@@ -245,6 +245,18 @@ giant eyeball cast targeted
 giant eyeball cast
 
 @The_monster@ looks around.
+%%%%
+guardian serpent cast targeted
+
+@The monster@ coils and waves @possessive@ upper body at @target@.
+
+@The_monster@ casts a spell at @target@.
+%%%%
+guardian serpent cast
+
+@The monster@ coils and performs some mystic snake dance.
+
+@The_monster@ casts a spell.
 ###########################################################################
 # Generic messages for priests and wizards which have been polymorphed into
 # something without hands.
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index 3c7108bd0d..131c577bdb 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -168,11 +168,9 @@ Grum
 
 A tough-looking gnoll, wearing the pelt of one of his former war dogs.
 %%%%
-guardian naga
+guardian serpent
 
-A hybrid; human from the chest up, with a scaly, muscular torso trailing off like that of a snake.
-
-These nagas are often used as guardians by powerful creatures.
+Serpents are distinct and rare members of scaly society. They are light and swift like snakes, yet also intelligent like nagas. Their lack of hands, together with an extreme sense of duty, makes them renowned guardians. It is said that a guardian serpent would rather die in battle than leave anything to an intruder.
 %%%%
 Harold
 
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index cb3f14eae1..b69793fd61 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -905,10 +905,10 @@ KFEAT:   Z = weight:2 teleport trap / .
 KFEAT:   z = teleport trap / Zot trap / weight:20 .
 MONS:    naga / nothing
 MONS:    greater naga / nothing
-MONS:    guardian naga / nothing
+MONS:    guardian serpent / nothing
 MONS:    naga warrior / nothing
 MONS:    naga mage / nothing
-MONS:    greater naga / guardian naga
+MONS:    greater naga / guardian serpent
 SHUFFLE: 'X / "Y
 SHUFFLE: 'X / 'X / AB, "Y / CD
 SUBST:   A=x, B=x, C=x, D=x
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 1197e9936b..7e3c06c6e2 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -1394,7 +1394,7 @@ ENDMAP
 #
 NAME:  fake_naga_vault
 DEPTH: D:15-26, Vault, Elf, Snake
-MONS:  mimic, patrolling guardian naga
+MONS:  mimic, patrolling guardian serpent
 ITEM:  any good_item
 : local b = crawl.random2(10)
 : if b > 7 then
@@ -2416,7 +2416,7 @@ MONS:    wolf spider w:7 / giant mite w:3
 MONS:    oklob plant
 MONS:    jelly
 MONS:    trapdoor spider / wolf spider
-MONS:    guardian naga
+MONS:    guardian serpent
 MONS:    curse skull
 # Randomise wall type: in 50% of maps, you cannot dig to the stairs.
 SUBST:   x : xxxxxxvvvccb
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 4d9733c34a..db3ee6f60c 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -1653,7 +1653,7 @@ enum monster_type                      // (int) menv[].type
     MONS_KOBOLD,
     MONS_LICH,
     MONS_MUMMY,
-    MONS_GUARDIAN_NAGA,
+    MONS_GUARDIAN_SERPENT,
     MONS_OGRE,                         //   40
     MONS_PLANT,
     MONS_QUEEN_BEE,
@@ -2198,7 +2198,7 @@ enum mon_spellbook_type
     MST_ORC_WIZARD_I     = 0,
     MST_ORC_WIZARD_II,
     MST_ORC_WIZARD_III,
-    MST_GUARDIAN_NAGA    = 10,
+    MST_GUARDIAN_SERPENT    = 10,
     MST_LICH_I           = 20,
     MST_LICH_II,
     MST_LICH_III,
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 725036019e..f2c81d8984 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -2635,13 +2635,13 @@ static monsterentry mondata[] = {
 },
 
 {
-    MONS_GUARDIAN_NAGA, 'N', LIGHTGREEN, "guardian naga",
+    MONS_GUARDIAN_SERPENT, 'N', LIGHTGREEN, "guardian serpent",
     M_SPELLCASTER | M_SEE_INVIS | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS,
     MR_RES_POISON,
-    350, 10, MONS_NAGA, MONS_GUARDIAN_NAGA, MH_NATURAL, -6,
+    350, 10, MONS_GUARDIAN_SERPENT, MONS_GUARDIAN_SERPENT, MH_NATURAL, -6,
     { {AT_HIT, AF_PLAIN, 26}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
-    6, 14, MST_GUARDIAN_NAGA, CE_MUTAGEN_RANDOM, Z_BIG, S_SHOUT,
+    6, 14, MST_GUARDIAN_SERPENT, CE_MUTAGEN_RANDOM, Z_BIG, S_SHOUT,
     I_HIGH, HT_LAND, FL_NONE, 15, DEFAULT_ENERGY,
     MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_LARGE
 },
@@ -4584,7 +4584,7 @@ static monsterentry mondata[] = {
     M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS
         | M_ACTUAL_SPELLS | M_UNIQUE,
     MR_RES_POISON,
-    350, 10, MONS_NAGA, MONS_GUARDIAN_NAGA, MH_NATURAL, -6,
+    350, 10, MONS_GUARDIAN_SERPENT, MONS_GUARDIAN_SERPENT, MH_NATURAL, -6,
     { {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 14, 0, 0, 142 },
     8, 18, MST_AIZUL, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SHOUT,
@@ -4849,7 +4849,7 @@ static monsterentry mondata[] = {
     550, 15, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { {AT_HIT, AF_PLAIN, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 11, 0, 0, 90 },
-    0, 9, MST_GUARDIAN_NAGA, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT,
+    0, 9, MST_GUARDIAN_SERPENT, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT,
     I_NORMAL, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY,
     MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
 },
diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc
index 59c27f4e61..30ca498b07 100644
--- a/crawl-ref/source/mon-pick.cc
+++ b/crawl-ref/source/mon-pick.cc
@@ -222,7 +222,7 @@ bool mons_abyss(int mcls)
     case MONS_GREAT_ORB_OF_EYES:
     case MONS_GOLDEN_EYE:
     case MONS_GREEN_DEATH:
-    case MONS_GUARDIAN_NAGA:
+    case MONS_GUARDIAN_SERPENT:
     case MONS_HAIRY_DEVIL:
     case MONS_HELLION:
     case MONS_HELLWING:
@@ -383,7 +383,7 @@ int mons_rare_abyss(int mcls)
     case MONS_DEMONIC_CRAWLER:
     case MONS_EXECUTIONER:
     case MONS_GREEN_DEATH:
-    case MONS_GUARDIAN_NAGA:
+    case MONS_GUARDIAN_SERPENT:
     case MONS_HAIRY_DEVIL:
     case MONS_HELLION:
     case MONS_ICE_DEVIL:
@@ -689,7 +689,7 @@ int mons_standard_level(int mcls)
     case MONS_BLINK_FROG:
     case MONS_BUTTERFLY:
     case MONS_GIANT_BLOWFLY:
-    case MONS_GUARDIAN_NAGA:
+    case MONS_GUARDIAN_SERPENT:
     case MONS_RAKSHASA:
     case MONS_SLIME_CREATURE:
     case MONS_STONE_GOLEM:
@@ -1091,7 +1091,7 @@ int mons_standard_rare(int mcls)
     case MONS_DEEP_ELF_DEMONOLOGIST:
     case MONS_DEEP_ELF_PRIEST:
     case MONS_DEEP_ELF_SORCERER:
-    case MONS_GUARDIAN_NAGA:
+    case MONS_GUARDIAN_SERPENT:
         return 3;
 
     case MONS_PULSATING_LUMP:
@@ -1810,7 +1810,7 @@ int mons_pitsnake_level(int mcls)
         mlev += 3;
         break;
 
-    case MONS_GUARDIAN_NAGA:
+    case MONS_GUARDIAN_SERPENT:
         mlev += 4;
         break;
 
@@ -1848,7 +1848,7 @@ int mons_pitsnake_rare(int mcls)
         return 32;
 
     case MONS_GREATER_NAGA:
-    case MONS_GUARDIAN_NAGA:
+    case MONS_GUARDIAN_SERPENT:
     case MONS_SMALL_SNAKE:
         return 15;
 
diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h
index ed5d9ea79e..a5aaa6526b 100644
--- a/crawl-ref/source/mon-spll.h
+++ b/crawl-ref/source/mon-spll.h
@@ -52,7 +52,7 @@
       }
     },
 
-    {  MST_GUARDIAN_NAGA,
+    {  MST_GUARDIAN_SERPENT,
       {
        SPELL_TELEPORT_OTHER,
        SPELL_TELEPORT_OTHER,
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index d5b4a54201..01565d11ef 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -3518,7 +3518,10 @@ mon_body_shape get_mon_shape(const int type)
     case 'M': // mummies
         return (MON_SHAPE_HUMANOID);
     case 'N': // nagas
-        return (MON_SHAPE_NAGA);
+        if (mons_genus(type) == MONS_GUARDIAN_SERPENT)
+            return (MON_SHAPE_SNAKE);
+        else
+            return (MON_SHAPE_NAGA);
     case 'O': // ogres
         return (MON_SHAPE_HUMANOID);
     case 'P': // plants
diff --git a/crawl-ref/source/rltiles/dc-corpse.txt b/crawl-ref/source/rltiles/dc-corpse.txt
index 14b7bf8b06..4fba1c23a2 100644
--- a/crawl-ref/source/rltiles/dc-corpse.txt
+++ b/crawl-ref/source/rltiles/dc-corpse.txt
@@ -224,7 +224,7 @@ big_kobold CORPSE_BIG_KOBOLD
 
 ## Nagas ('N')
 naga CORPSE_NAGA
-guardian_naga CORPSE_GUARDIAN_NAGA
+guardian_naga CORPSE_GUARDIAN_SERPENT
 
 ## Ogres ('O')
 ogre CORPSE_OGRE
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 3da868aa54..a3d5f65344 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -437,7 +437,7 @@ mummy_priest MONS_MUMMY_PRIEST
 
 ## Nagas ('N')
 naga MONS_NAGA
-guardian_naga MONS_GUARDIAN_NAGA
+guardian_naga MONS_GUARDIAN_SERPENT
 naga_mage MONS_NAGA_MAGE
 naga_warrior MONS_NAGA_WARRIOR
 greater_naga MONS_GREATER_NAGA
diff --git a/crawl-ref/source/tilemcache.cc b/crawl-ref/source/tilemcache.cc
index cb4a77fe0f..c7b9a7421d 100644
--- a/crawl-ref/source/tilemcache.cc
+++ b/crawl-ref/source/tilemcache.cc
@@ -404,7 +404,7 @@ bool mcache_monster::get_weapon_offset(int mon_tile, int &ofs_x, int &ofs_y)
     case TILEP_MONS_NAGA:
     case TILEP_MONS_GREATER_NAGA:
     case TILEP_MONS_NAGA_WARRIOR:
-    case TILEP_MONS_GUARDIAN_NAGA:
+    case TILEP_MONS_GUARDIAN_SERPENT:
     case TILEP_MONS_NAGA_MAGE:
         ofs_x = 0;
         ofs_y = 1;
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 4af9a4e880..1fbbb89ccd 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -596,8 +596,8 @@ int tileidx_monster_base(const monsters *mon, bool detected)
     // nagas ('N')
     case MONS_NAGA:
         return TILEP_MONS_NAGA;
-    case MONS_GUARDIAN_NAGA:
-        return TILEP_MONS_GUARDIAN_NAGA;
+    case MONS_GUARDIAN_SERPENT:
+        return TILEP_MONS_GUARDIAN_SERPENT;
     case MONS_NAGA_MAGE:
         return TILEP_MONS_NAGA_MAGE;
     case MONS_NAGA_WARRIOR:
@@ -1881,8 +1881,8 @@ static int _tileidx_corpse(const item_def &item)
     case MONS_NAGA_WARRIOR:
     case MONS_GREATER_NAGA:
         return TILE_CORPSE_NAGA;
-    case MONS_GUARDIAN_NAGA:
-        return TILE_CORPSE_GUARDIAN_NAGA;
+    case MONS_GUARDIAN_SERPENT:
+        return TILE_CORPSE_GUARDIAN_SERPENT;
 
     // ogres ('O')
     case MONS_OGRE: