From 09df3fcb005f1164e5e0a813cd9dceae4f75dd93 Mon Sep 17 00:00:00 2001 From: dolorous Date: Fri, 20 Mar 2009 01:02:43 +0000 Subject: Add a few more Xom messages. Also, since he already has a mass confusion effect, replace Mass Confusion with Cause Fear in his random spell list. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9520 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/dat/database/godspeak.txt | 26 ++++++++++++++++++++++---- crawl-ref/source/ouch.cc | 4 ++-- crawl-ref/source/spl-cast.cc | 2 +- crawl-ref/source/xom.cc | 17 ++++++++--------- 4 files changed, 33 insertions(+), 16 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/dat/database/godspeak.txt b/crawl-ref/source/dat/database/godspeak.txt index 084067c6a0..86c95b00a7 100644 --- a/crawl-ref/source/dat/database/godspeak.txt +++ b/crawl-ref/source/dat/database/godspeak.txt @@ -209,7 +209,7 @@ Xom medium miscast effect # miscast strength random2(4), up to really nasty Xom major miscast effect -"Try this!" +"Try this." Xom's attention turns to you. @@ -236,13 +236,17 @@ Xom decides to rearrange the pieces. %%%% Xom teleportation journey -Whee! +"Whee!" + +"Let's go for a ride!" + +"Where it stops, nobody knows!" -Let's go for a ride! +Xom twists space around you. %%%% Xom confusion -Heh heh heh... +"Heh heh heh..." %%%% # 25% chance of draining, else torment Xom draining or torment @@ -277,7 +281,11 @@ The world seems to spin as Xom's maniacal laughter rings in your ears. # Xom upgrades a nearby hostile monster's weapon to a chaos brand Xom chaos upgrade +Xom's power touches on a nearby weapon. + "Have a taste of chaos, mortal." + +Xom chortles. %%%% ##################### # other effects @@ -358,7 +366,17 @@ Xom weird death %%%% Xom resurrection +"Let me repair your body." + +Xom tricks Death into leaving you alone. + +Xom's maniacal laughter scares Death away. + +Xom's power revives you. + Xom brings you back to life. + +Xom smiles on you. %%%% # Xom laughing # (Currently only used post-game in response to "You die...") diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index c1338b0960..cb85f27986 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -943,8 +943,8 @@ void ouch(int dam, int death_source, kill_method_type death_type, you.escaped_death_cause = death_type; you.escaped_death_aux = aux == NULL ? "" : aux; - // Xom should only kill his worshippers if they're under penance or - // Xom is bored. + // Xom should only kill his worshippers if they're under penance + // or Xom is bored. if (you.religion == GOD_XOM && !you.penance[GOD_XOM] && you.gift_timeout > 0) { diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 565e21ab31..085426734a 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -1610,7 +1610,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) case SPELL_SLEEP: { const int sleep_power = - stepdown_value( powc * 9 / 10, 5, 35, 45, 50 ); + stepdown_value(powc * 9 / 10, 5, 35, 45, 50); #ifdef DEBUG_DIAGNOSTICS mprf(MSGCH_DIAGNOSTICS, "Sleep power stepdown: %d -> %d", powc, sleep_power); diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index cf485d99b9..39bd660f72 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -58,7 +58,7 @@ REVISION("$Rev$"); static const spell_type _xom_spells[] = { SPELL_BLINK, SPELL_CONFUSING_TOUCH, SPELL_MAGIC_MAPPING, - SPELL_DETECT_ITEMS, SPELL_DETECT_CREATURES, SPELL_MASS_CONFUSION, + SPELL_DETECT_ITEMS, SPELL_DETECT_CREATURES, SPELL_CAUSE_FEAR, SPELL_MASS_SLEEP, SPELL_DISPERSAL, SPELL_STONESKIN, SPELL_RING_OF_FLAMES, SPELL_OLGREBS_TOXIC_RADIANCE, SPELL_TUKIMAS_VORPAL_BLADE, SPELL_MAXWELLS_SILVER_HAMMER, SPELL_FIRE_BRAND, SPELL_FREEZING_AURA, @@ -792,7 +792,6 @@ static bool _xom_confuse_monsters(int sever) return (rc); } - static bool _xom_send_allies(int sever) { bool rc = false; @@ -967,8 +966,8 @@ static bool _xom_rearrange_pieces(int sever) // Every now and then, Xom also confuses them all. const bool confusem = one_chance_in(10); - // Not just every monster in sight - oh no. Every monster on - // this level! + // Not just every monster in sight - oh no. Every monster on this + // level! for (unsigned i = 0; i < MAX_MONSTERS; ++i) { monsters* monster = &menv[i]; @@ -997,8 +996,8 @@ static bool _xom_rearrange_pieces(int sever) } } - // If Xom blinked at least one monster, blink the player, - // too, and then consider this act done. + // If Xom blinked at least one monster, blink the player, too, and + // then consider this act done. if (rc) random_blink(false); @@ -1163,9 +1162,9 @@ static bool _xom_is_good(int sever, int tension) done = _xom_rearrange_pieces(sever); else if (x_chance_in_y(11, sever) && (you.level_type != LEVEL_ABYSS)) { - // The Xom teleportation train takes you on instant teleportation to - // a few random areas, stopping randomly but most likely in an area - // that is not dangerous to you. + // The Xom teleportation train takes you on instant teleportation + // to a few random areas, stopping randomly but most likely in + // an area that is not dangerous to you. god_speaks(GOD_XOM, _get_xom_speech("teleportation journey").c_str()); do { -- cgit v1.2.3-54-g00ecf