pmnames follow-up

replace references to "aligned priest" in several lua files with "aligned cleric"

also accept "aligned priest" during ^G parsing

diff --git a/dat/Pri-loca.lua b/dat/Pri-loca.lua
index 5583ac270a413051fc18e6d625fd086d67517251..34856b75c685963f2758c7b049aa1421db602d7b 100644 (file)
--- a/dat/Pri-loca.lua
+++ b/dat/Pri-loca.lua
@@ -33,7 +33,7 @@ des.region({ region={31,00, 39,13}, lit=0, type="morgue", filled=1 })
 des.region({ region={11,03, 29,10}, lit=1, type="temple", filled=1, irregular=1 })
 -- The altar inside the temple
 des.altar({ x=20,y=07, align="noalign", type="shrine" })
-des.monster({ id = "aligned priest", x=20, y=07, align="noalign", peaceful = 0 })
+des.monster({ id = "aligned cleric", x=20, y=07, align="noalign", peaceful = 0 })
 -- Doors
 des.door("locked",10,06)
 des.door("locked",10,07)

diff --git a/dat/astral.lua b/dat/astral.lua
index 398ffe2bae7350cc991c39f57f98bb3fa1c5d4fa..cbf2bc0ae5d93c742340ac8e35930dbb49d9120d 100644 (file)
--- a/dat/astral.lua
+++ b/dat/astral.lua
@@ -104,26 +104,26 @@ des.non_diggable(selection.area(00,00,74,19))
 des.non_passwall(selection.area(00,00,74,19))
 -- Moloch's horde
 -- West round room
-des.monster({ id = "aligned priest",x=18,y=09,align="noalign", peaceful=0 })
-des.monster({ id = "aligned priest",x=19,y=08,align="noalign", peaceful=0 })
-des.monster({ id = "aligned priest",x=19,y=09,align="noalign", peaceful=0 })
-des.monster({ id = "aligned priest",x=19,y=10,align="noalign", peaceful=0 })
+des.monster({ id = "aligned cleric",x=18,y=09,align="noalign", peaceful=0 })
+des.monster({ id = "aligned cleric",x=19,y=08,align="noalign", peaceful=0 })
+des.monster({ id = "aligned cleric",x=19,y=09,align="noalign", peaceful=0 })
+des.monster({ id = "aligned cleric",x=19,y=10,align="noalign", peaceful=0 })
 des.monster({ id = "Angel",x=20,y=09,align="noalign", peaceful=0 })
 des.monster({ id = "Angel",x=20,y=10,align="noalign", peaceful=0 })
 des.monster({ id = "Pestilence", coord = { place:rndcoord(1) }, peaceful=0 })
 -- South-central round room
-des.monster({ id = "aligned priest",x=36,y=12,align="noalign", peaceful=0 })
-des.monster({ id = "aligned priest",x=37,y=12,align="noalign", peaceful=0 })
-des.monster({ id = "aligned priest",x=38,y=12,align="noalign", peaceful=0 })
-des.monster({ id = "aligned priest",x=36,y=13,align="noalign", peaceful=0 })
+des.monster({ id = "aligned cleric",x=36,y=12,align="noalign", peaceful=0 })
+des.monster({ id = "aligned cleric",x=37,y=12,align="noalign", peaceful=0 })
+des.monster({ id = "aligned cleric",x=38,y=12,align="noalign", peaceful=0 })
+des.monster({ id = "aligned cleric",x=36,y=13,align="noalign", peaceful=0 })
 des.monster({ id = "Angel",x=38,y=13,align="noalign", peaceful=0 })
 des.monster({ id = "Angel",x=37,y=13,align="noalign", peaceful=0 })
 des.monster({ id = "Death", coord = { place:rndcoord(1) }, peaceful=0 })
 -- East round room
-des.monster({ id = "aligned priest",x=56,y=09,align="noalign", peaceful=0 })
-des.monster({ id = "aligned priest",x=55,y=08,align="noalign", peaceful=0 })
-des.monster({ id = "aligned priest",x=55,y=09,align="noalign", peaceful=0 })
-des.monster({ id = "aligned priest",x=55,y=10,align="noalign", peaceful=0 })
+des.monster({ id = "aligned cleric",x=56,y=09,align="noalign", peaceful=0 })
+des.monster({ id = "aligned cleric",x=55,y=08,align="noalign", peaceful=0 })
+des.monster({ id = "aligned cleric",x=55,y=09,align="noalign", peaceful=0 })
+des.monster({ id = "aligned cleric",x=55,y=10,align="noalign", peaceful=0 })
 des.monster({ id = "Angel",x=54,y=09,align="noalign", peaceful=0 })
 des.monster({ id = "Angel",x=54,y=10,align="noalign", peaceful=0 })
 des.monster({ id = "Famine", coord = { place:rndcoord(1) }, peaceful=0 })
@@ -136,12 +136,12 @@ des.monster({ id = "Famine", coord = { place:rndcoord(1) }, peaceful=0 })
 -- but a place holder.
 --
 -- West court
-des.monster({ id = "aligned priest",x=12,y=07,align="chaos", peaceful=0 })
-des.monster({ id = "aligned priest",x=13,y=07,align="chaos",peaceful=1 })
-des.monster({ id = "aligned priest",x=14,y=07,align="law", peaceful=0 })
-des.monster({ id = "aligned priest",x=12,y=11,align="law",peaceful=1 })
-des.monster({ id = "aligned priest",x=13,y=11,align="neutral", peaceful=0 })
-des.monster({ id = "aligned priest",x=14,y=11,align="neutral",peaceful=1 })
+des.monster({ id = "aligned cleric",x=12,y=07,align="chaos", peaceful=0 })
+des.monster({ id = "aligned cleric",x=13,y=07,align="chaos",peaceful=1 })
+des.monster({ id = "aligned cleric",x=14,y=07,align="law", peaceful=0 })
+des.monster({ id = "aligned cleric",x=12,y=11,align="law",peaceful=1 })
+des.monster({ id = "aligned cleric",x=13,y=11,align="neutral", peaceful=0 })
+des.monster({ id = "aligned cleric",x=14,y=11,align="neutral",peaceful=1 })
 des.monster({ id = "Angel",x=11,y=05,align="chaos", peaceful=0 })
 des.monster({ id = "Angel",x=12,y=05,align="chaos",peaceful=1 })
 des.monster({ id = "Angel",x=13,y=05,align="law", peaceful=0 })
@@ -149,12 +149,12 @@ des.monster({ id = "Angel",x=11,y=13,align="law",peaceful=1 })
 des.monster({ id = "Angel",x=12,y=13,align="neutral", peaceful=0 })
 des.monster({ id = "Angel",x=13,y=13,align="neutral",peaceful=1 })
 -- Central court
-des.monster({ id = "aligned priest",x=32,y=09,align="chaos", peaceful=0 })
-des.monster({ id = "aligned priest",x=33,y=09,align="chaos",peaceful=1 })
-des.monster({ id = "aligned priest",x=34,y=09,align="law", peaceful=0 })
-des.monster({ id = "aligned priest",x=40,y=09,align="law",peaceful=1 })
-des.monster({ id = "aligned priest",x=41,y=09,align="neutral", peaceful=0 })
-des.monster({ id = "aligned priest",x=42,y=09,align="neutral",peaceful=1 })
+des.monster({ id = "aligned cleric",x=32,y=09,align="chaos", peaceful=0 })
+des.monster({ id = "aligned cleric",x=33,y=09,align="chaos",peaceful=1 })
+des.monster({ id = "aligned cleric",x=34,y=09,align="law", peaceful=0 })
+des.monster({ id = "aligned cleric",x=40,y=09,align="law",peaceful=1 })
+des.monster({ id = "aligned cleric",x=41,y=09,align="neutral", peaceful=0 })
+des.monster({ id = "aligned cleric",x=42,y=09,align="neutral",peaceful=1 })
 des.monster({ id = "Angel",x=31,y=08,align="chaos", peaceful=0 })
 des.monster({ id = "Angel",x=32,y=08,align="chaos",peaceful=1 })
 des.monster({ id = "Angel",x=31,y=09,align="law", peaceful=0 })
@@ -162,12 +162,12 @@ des.monster({ id = "Angel",x=42,y=08,align="law",peaceful=1 })
 des.monster({ id = "Angel",x=43,y=08,align="neutral", peaceful=0 })
 des.monster({ id = "Angel",x=43,y=09,align="neutral",peaceful=1 })
 -- East court
-des.monster({ id = "aligned priest",x=60,y=07,align="chaos", peaceful=0 })
-des.monster({ id = "aligned priest",x=61,y=07,align="chaos",peaceful=1 })
-des.monster({ id = "aligned priest",x=62,y=07,align="law", peaceful=0 })
-des.monster({ id = "aligned priest",x=60,y=11,align="law",peaceful=1 })
-des.monster({ id = "aligned priest",x=61,y=11,align="neutral", peaceful=0 })
-des.monster({ id = "aligned priest",x=62,y=11,align="neutral",peaceful=1 })
+des.monster({ id = "aligned cleric",x=60,y=07,align="chaos", peaceful=0 })
+des.monster({ id = "aligned cleric",x=61,y=07,align="chaos",peaceful=1 })
+des.monster({ id = "aligned cleric",x=62,y=07,align="law", peaceful=0 })
+des.monster({ id = "aligned cleric",x=60,y=11,align="law",peaceful=1 })
+des.monster({ id = "aligned cleric",x=61,y=11,align="neutral", peaceful=0 })
+des.monster({ id = "aligned cleric",x=62,y=11,align="neutral",peaceful=1 })
 des.monster({ id = "Angel",x=61,y=05,align="chaos", peaceful=0 })
 des.monster({ id = "Angel",x=62,y=05,align="chaos",peaceful=1 })
 des.monster({ id = "Angel",x=63,y=05,align="law", peaceful=0 })

diff --git a/dat/minetn-1.lua b/dat/minetn-1.lua
index 8558662b91188327b127edd7a6d697a9235078e2..bb89a8744ec542774cf6d30948e4f08716e87d7a 100644 (file)
--- a/dat/minetn-1.lua
+++ b/dat/minetn-1.lua
@@ -75,7 +75,7 @@ local place = { {05,04},{09,05},{13,04},{26,04},{31,05},{30,14},{05,14},{10,13},
 shuffle(place);
 
 -- scatter some bodies
-des.object({ id = "corpse", x=20,y=12, montype="aligned priest" })
+des.object({ id = "corpse", x=20,y=12, montype="aligned cleric" })
 des.object({ id = "corpse", coord = place[1], montype="shopkeeper" })
 des.object({ id = "corpse", coord = place[2], montype="shopkeeper" })
 des.object({ id = "corpse", coord = place[3], montype="shopkeeper" })

diff --git a/dat/sanctum.lua b/dat/sanctum.lua
index d4594fe404853c3f633192d822cf125439c33915..14703b7c674547c0197306e932cb0a6edcc08689 100644 (file)
--- a/dat/sanctum.lua
+++ b/dat/sanctum.lua
@@ -112,15 +112,15 @@ des.monster({ id = "erinys", x=10,y=04,peaceful=0 })
 des.monster({ id = "marilith", x=07,y=09,peaceful=0 })
 des.monster({ id = "nalfeshnee", x=27,y=08,peaceful=0 })
 -- Moloch's horde
-des.monster({ id = "aligned priest", x=20,y=03,align="noalign",peaceful=0 })
-des.monster({ id = "aligned priest", x=15,y=04,align="noalign",peaceful=0 })
-des.monster({ id = "aligned priest", x=11,y=05,align="noalign",peaceful=0 })
-des.monster({ id = "aligned priest", x=11,y=07,align="noalign",peaceful=0 })
-des.monster({ id = "aligned priest", x=11,y=09,align="noalign",peaceful=0 })
-des.monster({ id = "aligned priest", x=11,y=12,align="noalign",peaceful=0 })
-des.monster({ id = "aligned priest", x=15,y=13,align="noalign",peaceful=0 })
-des.monster({ id = "aligned priest", x=17,y=13,align="noalign",peaceful=0 })
-des.monster({ id = "aligned priest", x=21,y=13,align="noalign",peaceful=0 })
+des.monster({ id = "aligned cleric", x=20,y=03,align="noalign",peaceful=0 })
+des.monster({ id = "aligned cleric", x=15,y=04,align="noalign",peaceful=0 })
+des.monster({ id = "aligned cleric", x=11,y=05,align="noalign",peaceful=0 })
+des.monster({ id = "aligned cleric", x=11,y=07,align="noalign",peaceful=0 })
+des.monster({ id = "aligned cleric", x=11,y=09,align="noalign",peaceful=0 })
+des.monster({ id = "aligned cleric", x=11,y=12,align="noalign",peaceful=0 })
+des.monster({ id = "aligned cleric", x=15,y=13,align="noalign",peaceful=0 })
+des.monster({ id = "aligned cleric", x=17,y=13,align="noalign",peaceful=0 })
+des.monster({ id = "aligned cleric", x=21,y=13,align="noalign",peaceful=0 })
 -- A few nasties
 des.monster("L")
 des.monster("L")

diff --git a/src/mondata.c b/src/mondata.c
index 142d44c2baf124da9716adde3449146247c59243..f3f9a564965bfe60d2c27ad7744d37fffc164c6a 100644 (file)
--- a/src/mondata.c
+++ b/src/mondata.c
@@ -762,8 +762,10 @@ int *gender_name_var;
             { "master mindflayer", PM_MASTER_MIND_FLAYER, NEUTRAL },
             /* More alternates; priest and priestess are separate monster
                types but that isn't the case for {aligned,high} priests */
-            { "aligned priestess", PM_ALIGNED_CLERIC, NEUTRAL },
-            { "high priestess", PM_HIGH_CLERIC, NEUTRAL },
+            { "aligned priest", PM_ALIGNED_CLERIC, MALE },
+            { "aligned priestess", PM_ALIGNED_CLERIC, FEMALE },
+            { "high priest", PM_HIGH_CLERIC, MALE },
+            { "high priestess", PM_HIGH_CLERIC, FEMALE },
             /* Inappropriate singularization by -ves check above */
             { "master of thief", PM_MASTER_OF_THIEVES, NEUTRAL },
             /* Potential misspellings where we want to avoid falling back