From 7027d6e07332bbdf6322e4d0c1c7aed78c2231bc Mon Sep 17 00:00:00 2001 From: dshaligram Date: Mon, 19 Mar 2007 15:12:44 +0000 Subject: s/Lucy/Lugonu/. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1060 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/abl-show.cc | 27 ++++++++++++++++--------- crawl-ref/source/abyss.cc | 6 +++--- crawl-ref/source/describe.cc | 12 +++++------ crawl-ref/source/direct.cc | 4 ++-- crawl-ref/source/dungeon.cc | 2 +- crawl-ref/source/enum.h | 10 ++++----- crawl-ref/source/items.cc | 4 ++-- crawl-ref/source/misc.cc | 2 +- crawl-ref/source/religion.cc | 48 ++++++++++++++++++++++---------------------- crawl-ref/source/travel.cc | 2 +- crawl-ref/source/view.cc | 4 ++-- 11 files changed, 64 insertions(+), 57 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 5f6e065112..0b0bb889a6 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -130,9 +130,9 @@ ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] = ABIL_ELYVILON_HEALING, ABIL_ELYVILON_RESTORATION, ABIL_ELYVILON_GREATER_HEALING }, // Lucy - { ABIL_LUCY_ABYSS_EXIT, ABIL_NON_ABILITY, - ABIL_LUCY_SUMMON_DEMONS, ABIL_NON_ABILITY, - ABIL_LUCY_ABYSS_ENTER } + { ABIL_LUGONU_ABYSS_EXIT, ABIL_NON_ABILITY, + ABIL_LUGONU_SUMMON_DEMONS, ABIL_NON_ABILITY, + ABIL_LUGONU_ABYSS_ENTER } }; // The description screen was way out of date with the actual costs. @@ -257,9 +257,9 @@ static const struct ability_def Ability_List[] = { ABIL_ELYVILON_GREATER_HEALING, "Greater Healing", 6, 0, 600, 4, ABFLAG_NONE }, // Lucy - { ABIL_LUCY_ABYSS_EXIT, "Depart the Abyss", 0, 0, 100, 10, ABFLAG_PAIN }, - { ABIL_LUCY_SUMMON_DEMONS, "Summon Abyssal Servants", 7, 0, 100, 5, ABFLAG_NONE }, - { ABIL_LUCY_ABYSS_ENTER, "Enter the Abyss", 9, 0, 200, 40, ABFLAG_NONE }, + { ABIL_LUGONU_ABYSS_EXIT, "Depart the Abyss", 0, 0, 100, 10, ABFLAG_PAIN }, + { ABIL_LUGONU_SUMMON_DEMONS, "Summon Abyssal Servants", 7, 0, 100, 5, ABFLAG_NONE }, + { ABIL_LUGONU_ABYSS_ENTER, "Enter the Abyss", 9, 0, 200, 40, ABFLAG_NONE }, // These six are unused "evil" god abilities: { ABIL_CHARM_SNAKE, "Charm Snake", 6, 0, 200, 5, ABFLAG_NONE }, @@ -1210,7 +1210,7 @@ bool activate_ability(void) exercise( SK_INVOCATIONS, 6 + random2(10) ); break; - case ABIL_LUCY_ABYSS_EXIT: + case ABIL_LUGONU_ABYSS_EXIT: if ( you.level_type != LEVEL_ABYSS ) { mpr("You aren't in the Abyss!"); @@ -1231,14 +1231,21 @@ bool activate_ability(void) set_mp(random2(you.magic_points), false); break; - case ABIL_LUCY_SUMMON_DEMONS: - for ( int i = 0; i < you.skills[SK_INVOCATIONS] / 4; ++i ) + case ABIL_LUGONU_SUMMON_DEMONS: + { + int ndemons = 1 + you.skills[SK_INVOCATIONS] / 4; + if (ndemons > 5) + ndemons = 5; + + for ( int i = 0; i < ndemons; ++i ) summon_ice_beast_etc( 20 + you.skills[SK_INVOCATIONS] * 3, summon_any_demon(DEMON_COMMON), true); + exercise(SK_INVOCATIONS, 6 + random2(6)); break; + } - case ABIL_LUCY_ABYSS_ENTER: + case ABIL_LUGONU_ABYSS_ENTER: if (you.level_type == LEVEL_ABYSS) { mpr("You're already here."); diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index eb00207c74..a1962ce3c6 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -50,7 +50,7 @@ void generate_abyss(void) grd[45][35] = DNGN_FLOOR; if ( one_chance_in(5) ) - grd[46][35] = DNGN_ALTAR_LUCY; + grd[46][35] = DNGN_ALTAR_LUGONU; } // end generate_abyss() @@ -185,7 +185,7 @@ static void generate_area(unsigned char gx1, unsigned char gy1, // Lucy has a flat 50% chance of corrupting the altar if ( coinflip() ) - grd[i][j] = DNGN_ALTAR_LUCY; + grd[i][j] = DNGN_ALTAR_LUGONU; } } } @@ -390,7 +390,7 @@ void abyss_teleport( bool new_area ) grd[you.x_pos][you.y_pos] = DNGN_FLOOR; if ( one_chance_in(5) ) - grd[you.x_pos + 1][you.y_pos] = DNGN_ALTAR_LUCY; + grd[you.x_pos + 1][you.y_pos] = DNGN_ALTAR_LUGONU; place_transiting_monsters(); } diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 7038d86cc6..fe451caea1 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -6539,11 +6539,11 @@ void describe_god( int which_god, bool give_title ) "appreciates the offering of weapons. "; break; - case GOD_LUCY: + case GOD_LUGONU: description = - "Lucy is a god who revels in the chaos of the Abyss. Followers are sent out" EOL - "to spread Lucy's word in the world. Lucy enjoys seeing her followers spread" EOL - "chaos and destruction."; + "Lugonu the Unformed revels in the chaos of the Abyss. Followers are sent out" EOL + "to cause bloodshed and disorder in the world, and must do so unflaggingly to" EOL + "earn Lugonu's favour."; break; default: description = "God of Program Bugs is a weird and dangerous God and his presence should" EOL @@ -6575,7 +6575,7 @@ void describe_god( int which_god, bool give_title ) (which_god == GOD_TROG) ? "Great Slayer" : (which_god == GOD_NEMELEX_XOBEH) ? "Great Trickster" : (which_god == GOD_SIF_MUNA) ? "Master of the Arcane" : - (which_god == GOD_LUCY) ? "Abyssal Lord" : + (which_god == GOD_LUGONU) ? "Agent of Entropy" : (which_god == GOD_XOM) ? "Teddy Bear" : "Bogy the Lord of the Bugs"); // Xom and no god is handled before } @@ -6601,7 +6601,7 @@ void describe_god( int which_god, bool give_title ) case GOD_TROG: case GOD_NEMELEX_XOBEH: case GOD_ELYVILON: - case GOD_LUCY: + case GOD_LUGONU: cprintf ( (you.piety >= 120) ? "High Priest" : (you.piety >= 100) ? "Elder" : (you.piety >= 75) ? "Priest" : diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc index 352291d8a0..299260289b 100644 --- a/crawl-ref/source/direct.cc +++ b/crawl-ref/source/direct.cc @@ -1301,8 +1301,8 @@ std::string feature_description(int grid) return ("A sparkling altar of Nemelex Xobeh."); case DNGN_ALTAR_ELYVILON: return ("A silver altar of Elyvilon."); - case DNGN_ALTAR_LUCY: - return ("A corrupt altar of Lucy."); + case DNGN_ALTAR_LUGONU: + return ("A corrupted altar of Lugonu."); case DNGN_BLUE_FOUNTAIN: return ("A fountain of clear blue water."); case DNGN_SPARKLING_FOUNTAIN: diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index fc437c7c30..c0240a4796 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -7153,7 +7153,7 @@ static int pick_an_altar(void) altar_type = DNGN_ALTAR_ZIN + random2(NUM_GODS - 1); } while (altar_type == DNGN_ALTAR_NEMELEX_XOBEH - || altar_type == DNGN_ALTAR_LUCY); + || altar_type == DNGN_ALTAR_LUGONU); break; } } diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 9e9a2373e0..39c350a333 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -109,9 +109,9 @@ enum ability_type ABIL_ELYVILON_HEALING, ABIL_ELYVILON_RESTORATION, ABIL_ELYVILON_GREATER_HEALING, // 224 - ABIL_LUCY_ABYSS_EXIT, - ABIL_LUCY_SUMMON_DEMONS, - ABIL_LUCY_ABYSS_ENTER, + ABIL_LUGONU_ABYSS_EXIT, + ABIL_LUGONU_SUMMON_DEMONS, + ABIL_LUGONU_ABYSS_ENTER, ABIL_CHARM_SNAKE, ABIL_TRAN_SERPENT_OF_HELL, @@ -1052,7 +1052,7 @@ enum dungeon_feature_type DNGN_ALTAR_TROG, DNGN_ALTAR_NEMELEX_XOBEH, // 190 DNGN_ALTAR_ELYVILON, // 191 - DNGN_ALTAR_LUCY, + DNGN_ALTAR_LUGONU, DNGN_BLUE_FOUNTAIN = 200, // 200 DNGN_DRY_FOUNTAIN_I, @@ -1389,7 +1389,7 @@ enum god_type GOD_TROG, // 10 GOD_NEMELEX_XOBEH, GOD_ELYVILON, - GOD_LUCY, + GOD_LUGONU, NUM_GODS, // always after last god GOD_RANDOM = 100 diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 946ae0b55c..98be971353 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -675,8 +675,8 @@ static void describe_floor() { case DNGN_ALTAR_ELYVILON: mpr("There is a silver altar of Elyvilon here."); break; - case DNGN_ALTAR_LUCY: - mpr("There is a corrupted altar of Lucy here."); + case DNGN_ALTAR_LUGONU: + mpr("There is a corrupted altar of Lugonu here."); break; case DNGN_BLUE_FOUNTAIN: mpr("There is a fountain here (q to drink)."); diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 4dc7bc2544..37d70ffb20 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -198,7 +198,7 @@ bool grid_destroys_items( int grid ) // returns 0 if grid is not an altar, else it returns the GOD_* type god_type grid_altar_god( unsigned char grid ) { - if (grid >= DNGN_ALTAR_ZIN && grid <= DNGN_ALTAR_LUCY) + if (grid >= DNGN_ALTAR_ZIN && grid <= DNGN_ALTAR_LUGONU) return (static_cast( grid - DNGN_ALTAR_ZIN + 1 )); return (GOD_NO_GOD); diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 8f8679b85f..38964319ef 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -89,7 +89,7 @@ const char *sacrifice[] = { " glows with a rainbow of weird colours and disappears.", // Elyvilon " evaporates.", - // Lucy + // Lugonu " is consumed by the void." }; @@ -160,7 +160,7 @@ const char* god_gain_power_messages[MAX_NUM_GODS][MAX_GOD_ABILITIES] = "call upon Elyvilon for moderate healing", "call upon Elyvilon to restore your abilities", "call upon Elyvilon for incredible healing" }, - // Lucy + // Lugonu { "depart the Abyss - at a permanent cost", "", "summon the demons of the Abyss to your aid", @@ -236,7 +236,7 @@ const char* god_lose_power_messages[MAX_NUM_GODS][MAX_GOD_ABILITIES] = "call upon Elyvilon for moderate healing", "call upon Elyvilon to restore your abilities", "call upon Elyvilon for incredible healing" }, - // Lucy + // Lugonu { "depart the Abyss at will", "", "summon the demons of the Abyss to your aid", @@ -258,7 +258,7 @@ static bool is_evil_god(int god) god == GOD_MAKHLEB || god == GOD_YREDELEMNUL || god == GOD_VEHUMET || - god == GOD_LUCY; + god == GOD_LUGONU; } void dec_penance(int god, int val) @@ -815,8 +815,8 @@ char *god_name( int which_god, bool long_name ) // mv - rewritten case GOD_ELYVILON: sprintf(godname_buff, "Elyvilon%s", long_name ? " the Healer" : ""); break; - case GOD_LUCY: - sprintf(godname_buff, "Lucy"); + case GOD_LUGONU: + sprintf(godname_buff, "Lugonu"); break; default: sprintf(godname_buff, "The Buggy One (%d)", which_god); @@ -1310,7 +1310,7 @@ bool did_god_conduct( int thing_done, int level ) case GOD_OKAWARU: case GOD_MAKHLEB: case GOD_TROG: - case GOD_LUCY: + case GOD_LUGONU: simple_god_message(" accepts your offering."); ret = true; if (random2(level + 10) > 5) @@ -1338,7 +1338,7 @@ bool did_god_conduct( int thing_done, int level ) case GOD_VEHUMET: case GOD_MAKHLEB: case GOD_TROG: - case GOD_LUCY: + case GOD_LUGONU: simple_god_message(" accepts your kill."); ret = true; if (random2(level + 18) > 5) @@ -1358,7 +1358,7 @@ bool did_god_conduct( int thing_done, int level ) case GOD_OKAWARU: case GOD_VEHUMET: case GOD_MAKHLEB: - case GOD_LUCY: + case GOD_LUGONU: simple_god_message(" accepts your kill."); ret = true; if (random2(level + 18) > 4) @@ -1417,7 +1417,7 @@ bool did_god_conduct( int thing_done, int level ) case GOD_KIKUBAAQUDGHA: case GOD_YREDELEMNUL: case GOD_MAKHLEB: - case GOD_LUCY: + case GOD_LUGONU: snprintf( info, INFO_SIZE, " accepts your %skill.", (thing_done == DID_KILL_ANGEL) ? "" : "collateral " ); @@ -1459,7 +1459,7 @@ bool did_god_conduct( int thing_done, int level ) case GOD_KIKUBAAQUDGHA: // note: reapers aren't undead case GOD_VEHUMET: case GOD_MAKHLEB: - case GOD_LUCY: + case GOD_LUGONU: simple_god_message(" accepts your collateral kill."); ret = true; if (random2(level + 10) > 5) @@ -1477,7 +1477,7 @@ bool did_god_conduct( int thing_done, int level ) case GOD_SHINING_ONE: case GOD_VEHUMET: case GOD_MAKHLEB: - case GOD_LUCY: + case GOD_LUGONU: simple_god_message(" accepts your collateral kill."); ret = true; if (random2(level + 10) > 5) @@ -1686,7 +1686,7 @@ void gain_piety(char pgn) if ( you.piety > 160 && old_piety <= 160 && (you.religion == GOD_SHINING_ONE || you.religion == GOD_ZIN || - you.religion == GOD_LUCY) && you.num_gifts[you.religion] == 0 ) + you.religion == GOD_LUGONU) && you.num_gifts[you.religion] == 0 ) simple_god_message( " will now bless your weapon at an altar...once."); if (you.religion == GOD_SIF_MUNA) @@ -1709,7 +1709,7 @@ void lose_piety(char pgn) { if (you.piety <= 160 && old_piety > 160 && (you.religion == GOD_SHINING_ONE || you.religion == GOD_ZIN || - you.religion == GOD_LUCY) && you.num_gifts[you.religion] == 0) + you.religion == GOD_LUGONU) && you.num_gifts[you.religion] == 0) simple_god_message(" is no longer ready to bless your weapon."); for ( int i = 0; i < MAX_GOD_ABILITIES; ++i ) @@ -2194,7 +2194,7 @@ void divine_retribution( int god ) } break; - case GOD_LUCY: + case GOD_LUGONU: // abyssal servant theme if (random2(you.experience_level) > 7 && !one_chance_in(5)) { @@ -2323,7 +2323,7 @@ void excommunication(void) inc_penance( old_god, 50 ); break; - case GOD_LUCY: + case GOD_LUGONU: if ( you.level_type == LEVEL_DUNGEON ) { simple_god_message(" casts you back into the Abyss!", old_god); @@ -2370,7 +2370,7 @@ static bool bless_weapon( int god, int brand, int colour ) mprf( MSGCH_GOD, "Your weapon shines brightly!" ); simple_god_message( " booms: Use this gift wisely!" ); - if ( god != GOD_LUCY ) + if ( god != GOD_LUGONU ) holy_word( 100, true ); delay(1000); @@ -2427,16 +2427,16 @@ void altar_prayer(void) } } - // Lucy blesses weapons with distortion - if (you.religion == GOD_LUCY - && !you.num_gifts[GOD_LUCY] + // Lugonu blesses weapons with distortion + if (you.religion == GOD_LUGONU + && !you.num_gifts[GOD_LUGONU] && !player_under_penance() && you.piety > 160) { const int wpn = get_player_wielded_weapon(); if (wpn != -1 && get_weapon_brand(you.inv[wpn]) != SPWPN_DISTORTION) - bless_weapon(GOD_LUCY, SPWPN_DISTORTION, RED); + bless_weapon(GOD_LUGONU, SPWPN_DISTORTION, RED); } offer_items(); @@ -2602,7 +2602,7 @@ void god_pitch(unsigned char which_god) } } - if ( you.religion == GOD_LUCY ) + if ( you.religion == GOD_LUGONU ) gain_piety(20); // allow instant access to first power redraw_skill( you.your_name, player_title() ); @@ -2712,7 +2712,7 @@ void handle_god_time(void) break; case GOD_MAKHLEB: - case GOD_LUCY: + case GOD_LUGONU: if (one_chance_in(16)) lose_piety(1); if (you.piety < 1) @@ -2772,7 +2772,7 @@ char god_colour( char god ) //mv - added case GOD_MAKHLEB: case GOD_VEHUMET: case GOD_TROG: - case GOD_LUCY: + case GOD_LUGONU: return(LIGHTRED); case GOD_XOM: diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index 413e73d37a..794e07e41c 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -555,7 +555,7 @@ void initialise_travel() traversable_terrain[DNGN_ALTAR_TROG] = traversable_terrain[DNGN_ALTAR_NEMELEX_XOBEH] = traversable_terrain[DNGN_ALTAR_ELYVILON] = - traversable_terrain[DNGN_ALTAR_LUCY] = + traversable_terrain[DNGN_ALTAR_LUGONU] = traversable_terrain[DNGN_BLUE_FOUNTAIN] = traversable_terrain[DNGN_DRY_FOUNTAIN_I] = traversable_terrain[DNGN_SPARKLING_FOUNTAIN] = diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index e06ced44d1..cd5d8fcaa1 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -1787,7 +1787,7 @@ bool is_feature(int feature, int x, int y) case DNGN_ALTAR_TROG: case DNGN_ALTAR_NEMELEX_XOBEH: case DNGN_ALTAR_ELYVILON: - case DNGN_ALTAR_LUCY: + case DNGN_ALTAR_LUGONU: return true; default: return false; @@ -3148,7 +3148,7 @@ void init_feature_table( void ) Feature[i].seen_colour = LIGHTGREY; break; - case DNGN_ALTAR_LUCY: + case DNGN_ALTAR_LUGONU: Feature[i].colour = GREEN; Feature[i].symbol = Options.char_table[ DCHAR_ALTAR ]; Feature[i].notable = true; -- cgit v1.2.3-54-g00ecf