via d777d01b5a494f98dce54c1d9805f72f70db8ef2 (commit)
via e2f62d56f2194b962d97fddd551683c80e775210 (commit)
from 7c96f4ae32351ddd8a955ac1e4ad59c43c03ab2c (commit)
-----------------------------------------------------------------------
commit d777d01b5a494f98dce54c1d9805f72f70db8ef2
Author: Adam Borowski <kilob...@angband.pl>
Date: Thu Feb 17 21:57:59 2011 +0100
Fix Xom being "exalted" by your prayer.
commit e2f62d56f2194b962d97fddd551683c80e775210
Author: Adam Borowski <kilob...@angband.pl>
Date: Thu Feb 17 21:30:56 2011 +0100
Xom's miscasts: spiders do have eyes.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/dat/database/godspeak.txt | 51 ++++++++++++++++++++++++++++
crawl-ref/source/godprayer.cc | 5 ++-
crawl-ref/source/xom.cc | 9 ++++-
3 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/crawl-ref/source/dat/database/godspeak.txt
b/crawl-ref/source/dat/database/godspeak.txt
index a486625..32e9b27 100644
--- a/crawl-ref/source/dat/database/godspeak.txt
+++ b/crawl-ref/source/dat/database/godspeak.txt
@@ -775,6 +775,57 @@ recite_closure
"Purity be upon you all."
%%%%
+##########################
+# Xom's response to prayer
+##########################
+Xom prayer
+
+Xom slaps you with a @_trout_species_@ trout!
+
+Xom toots happily.
+
+Xom says: I'm watching you, my @_xom_child_@ child.
+
+You hear crickets chirping.
+
+w:1
+You feel someone pinching you. As you turn, you see no one.
+
+w:1
+Xom says: "Amen!".
+%%%%
+_trout_species_
+
+rainbow
+
+flathead
+
+cutthroat
+
+bull
+
+silver
+%%%%
+_xom_child_
+
+misbegotten
+
+bastard
+
+ugly
+
+red-headed step
+
+silly
+
+worthless
+
+prodigal
+
+insane
+
+naughty
+%%%%
######################################
# Welcome messages on game restoration
######################################
diff --git a/crawl-ref/source/godprayer.cc b/crawl-ref/source/godprayer.cc
index 3207b2b..84aed8e 100644
--- a/crawl-ref/source/godprayer.cc
+++ b/crawl-ref/source/godprayer.cc
@@ -7,6 +7,7 @@
#include "areas.h"
#include "artefact.h"
#include "coordit.h"
+#include "database.h"
#include "effects.h"
#include "env.h"
#include "food.h"
@@ -383,7 +384,9 @@ void pray()
you.duration[DUR_JELLY_PRAYER] ? "renew your" : "offer a",
god_name(you.religion).c_str());
- if (player_under_penance())
+ if (you.religion == GOD_XOM)
+ mpr(getSpeakString("Xom prayer"), MSGCH_GOD);
+ else if (player_under_penance())
simple_god_message(" demands penance!");
else
mpr(god_prayer_reaction().c_str(), MSGCH_PRAY, you.religion);
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 01c80fb..759dc38 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -2649,10 +2649,17 @@ static void _xom_zero_miscast()
messages.push_back("You trip over your bandages.");
}
- if (you.form != TRAN_SPIDER)
{
std::string str = "A monocle briefly appears over your ";
str += coinflip() ? "right" : "left";
+ if (you.form == TRAN_SPIDER)
+ if (coinflip())
+ str += " primary";
+ else
+ {
+ str += random_choose_string(" front", " middle", " rear");
+ str += " secondary";
+ }
str += " eye.";
messages.push_back(str);
}
--
Dungeon Crawl Stone Soup
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Crawl-ref-discuss mailing list
Crawl-ref-discuss@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/crawl-ref-discuss
