diff options
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/dat/descript/monsters.txt | 2 | ||||
-rw-r--r-- | crawl-ref/source/describe.cc | 20 | ||||
-rw-r--r-- | crawl-ref/source/fight.cc | 10 | ||||
-rw-r--r-- | crawl-ref/source/skills.cc | 8 | ||||
-rw-r--r-- | crawl-ref/source/tutorial.cc | 21 |
5 files changed, 41 insertions, 20 deletions
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt index f896d7c484..91102adfbd 100644 --- a/crawl-ref/source/dat/descript/monsters.txt +++ b/crawl-ref/source/dat/descript/monsters.txt @@ -116,7 +116,7 @@ greater naga A hybrid; human from the chest up, with a scaly, muscular torso trailing off like that of a snake. -It looks strong an agressive. +It looks strong and agressive. %%%% Green Death diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index f6e1e51e30..503d7e4e12 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -3420,9 +3420,10 @@ void describe_item( item_def &item, bool allow_inscribe ) if (Options.tutorial_left) { tutorial_describe_item(item); + getch(); } - // Don't ask if there aren't enough rows left - if (allow_inscribe && wherey() <= get_number_of_lines() - 3) + // Don't ask during tutorial, or if there aren't enough rows left + else if (allow_inscribe && wherey() <= get_number_of_lines() - 3) { gotoxy(1, wherey() + 2); formatted_string::parse_string("<cyan>Do you wish to inscribe this item? ").display(); @@ -4240,8 +4241,23 @@ void describe_god( god_type which_god, bool give_title ) "sometimes"); // less than 2:3 if (which_god == GOD_ZIN) + { cprintf("Praying to %s will provide sustenance if starving." EOL, god_name(which_god)); + } + } + + if (which_god == GOD_TROG) + { + have_any = true; + cprintf("You can call upon %s to burn books in your surroundings." + EOL, god_name(which_god)); + } + else if (which_god == GOD_ELYVILON) + { + have_any = true; + cprintf("You can call upon %s to destroy weapons " + "lying on the ground." EOL, god_name(which_god)); } // mv: No abilities (except divine protection) under penance diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 6b500c2af4..adda527f80 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -1127,6 +1127,14 @@ int melee_attack::player_apply_weapon_bonuses(int damage) if (coinflip()) damage++; } + + if (you.species == SP_DEMONSPAWN + && (weapon->sub_type == WPN_DEMON_BLADE || + weapon->sub_type == WPN_DEMON_WHIP || + weapon->sub_type == WPN_DEMON_TRIDENT)) + { + damage += random2(3); + } } return (damage); @@ -2322,7 +2330,7 @@ int melee_attack::player_to_hit(bool random_factor) { your_to_hit++; } - + } else if (item_is_staff( *weapon )) { diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc index e615753db4..af9dd22cee 100644 --- a/crawl-ref/source/skills.cc +++ b/crawl-ref/source/skills.cc @@ -231,14 +231,6 @@ static int exercise2( int exsk ) { bonus += random2(3); } - - /* Darts and Throwing */ - if ((exsk == SK_DARTS || exsk == SK_THROWING) - && (you.skills[SK_DARTS] > you.skills[exsk] - || you.skills[SK_THROWING] > you.skills[exsk])) - { - bonus += random2(3); - } } // Quick fix for the fact that stealth can't be gained fast enough to diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index 38cb5fe1c6..d35efb4ba4 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -753,6 +753,9 @@ void tutorial_dissection_reminder() // occasionally remind injured characters of resting void tutorial_healing_reminder() { + if (!Options.tutorial_left) + return; + if (you.duration[DUR_POISONING] && 2*you.hp < you.hp_max) { if (Options.tutorial_events[TUT_NEED_POISON_HEALING]) @@ -762,7 +765,8 @@ void tutorial_healing_reminder() { if (Options.tutorial_events[TUT_NEED_HEALING]) learned_something_new(TUT_NEED_HEALING); - else if (you.num_turns - Options.tut_last_healed >= 50 && !you.duration[DUR_POISONING]) + else if (you.num_turns - Options.tut_last_healed >= 50 + && !you.duration[DUR_POISONING]) { if (Options.tut_just_triggered) return; @@ -780,6 +784,7 @@ void tutorial_healing_reminder() "<w>a<magenta>."; } print_formatted_paragraph(text, get_tutorial_cols(), MSGCH_TUTORIAL); + Options.tut_just_triggered = 1; } Options.tut_last_healed = you.num_turns; } @@ -1316,7 +1321,7 @@ void learned_something_new(tutorial_event_type seen_what, int x, int y) case TUT_SHIFT_RUN: text << "Walking around takes less keystrokes if you press " - "<w>Shift-direction<magenta> or <w>/ direction<magenta>. " + "<w>Shift-direction<magenta> or <w>/ <w>direction<magenta>. " "That will let you run until a monster comes into sight or " "your character sees something interesting."; break; @@ -1973,7 +1978,7 @@ void tutorial_describe_feature(dungeon_feature_type feat) "causes the trap to go off, so it can be quite a " "dangerous task."; } - Options.tutorial_events[TUT_SEEN_TRAP]; + Options.tutorial_events[TUT_SEEN_TRAP] = 0; break; case DNGN_STONE_STAIRS_DOWN_I: case DNGN_STONE_STAIRS_DOWN_II: @@ -1981,7 +1986,7 @@ void tutorial_describe_feature(dungeon_feature_type feat) ostr << "You can enter the next (deeper) level by following them " "down (<w>><magenta>). To get back to this level again, " "press <w><<<magenta> while standing on the upstairs."; - Options.tutorial_events[TUT_SEEN_STAIRS]; + Options.tutorial_events[TUT_SEEN_STAIRS] = 0; break; case DNGN_STONE_STAIRS_UP_I: case DNGN_STONE_STAIRS_UP_II: @@ -1995,11 +2000,11 @@ void tutorial_describe_feature(dungeon_feature_type feat) else { ostr << "You can enter the previous (lower) level by following " - "these down (<w><<<magenta>). To get back to this level " + "these up (<w><<<magenta>). To get back to this level " "again, press <w>><magenta> while standing on the " "downstairs."; } - Options.tutorial_events[TUT_SEEN_STAIRS]; + Options.tutorial_events[TUT_SEEN_STAIRS] = 0; break; case DNGN_ROCK_STAIRS_DOWN: @@ -2007,7 +2012,7 @@ void tutorial_describe_feature(dungeon_feature_type feat) ostr << "Escape hatches can be used to quickly leave a level with " "<w><<<magenta> and <w>><magenta>, respectively. Note that " "you will usually be unable to return right away."; - Options.tutorial_events[TUT_SEEN_ESCAPE_HATCH]; + Options.tutorial_events[TUT_SEEN_ESCAPE_HATCH] = 0; break; case DNGN_ALTAR_ZIN: @@ -2067,7 +2072,7 @@ void tutorial_describe_feature(dungeon_feature_type feat) << " press <w>^<magenta>."; } } - Options.tutorial_events[TUT_SEEN_ALTAR]; + Options.tutorial_events[TUT_SEEN_ALTAR] = 0; break; } case DNGN_ENTER_ORCISH_MINES: |