summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-02 06:53:48 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-02 06:53:48 +0000
commitfd8d4ccb433dd2fc132cff13fe8a6052e5a2a92c (patch)
tree73d0301e285ca2709aa123739e859b044e854607
parente5c2d08635376bd510c1091ae6b78e69ae5dfef6 (diff)
downloadcrawl-ref-fd8d4ccb433dd2fc132cff13fe8a6052e5a2a92c.tar.gz
crawl-ref-fd8d4ccb433dd2fc132cff13fe8a6052e5a2a92c.zip
Make angels and daevas worship TSO.
Give daevas an appropriate message when they smite something. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8106 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/dat/database/monspell.txt4
-rw-r--r--crawl-ref/source/monplace.cc5
2 files changed, 9 insertions, 0 deletions
diff --git a/crawl-ref/source/dat/database/monspell.txt b/crawl-ref/source/dat/database/monspell.txt
index 408d520eda..a9b1a9a14c 100644
--- a/crawl-ref/source/dat/database/monspell.txt
+++ b/crawl-ref/source/dat/database/monspell.txt
@@ -153,6 +153,10 @@ sphinx cast
# Monster species and genus messages.
########################################################################
%%%%
+angel cast targeted
+
+@The_monster@ calls down the wrath of @God@ upon @target@.
+%%%%
dragon cast targeted
@The_monster@ breathes @beam@ @at@ @target@.
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index 85e000dc33..dfbdd9eb94 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -1030,6 +1030,11 @@ static int _place_monster_aux(const mgen_data &mg,
break;
}
}
+ // Angels and Daevas belong to TSO
+ else if (mons_class_holiness(mg.cls) == MH_HOLY)
+ {
+ menv[id].god = GOD_SHINING_ONE;
+ }
// If the caller requested a specific colour for this monster,
// apply it now.