fiddlerwoaroof/crawl - Change M27JU3PI7UXV4S4LTHOCGVASHX2RBXL5ZU4MLFWCQCSMGQC53IAAC

For now use normal tiles for the blessed blades (WPN_FALCHION rather

than WPN_BLESSED_FALCHION etc.)

FR 1928401: for undead attempting to Evoke an amulet of rage, print "cannot raise a blood rage" message right away instead of printing the "too hungry" message when applicable.

FR 1899121: prompt when using stairs that have an exclusion area centered on them.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4492 c06c8d41-db1a-0410-9941-cceddc491573

Created by j-p-e-g on April 22, 2008

M27JU3PI7UXV4S4LTHOCGVASHX2RBXL5ZU4MLFWCQCSMGQC53IAAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tile1.cc at line 1113 [4.96318]

[3.12661]


    case WPN_BLESSED_FALCHION:
        return TILE_WPN_FALCHION;
    case WPN_BLESSED_LONG_SWORD:
        return TILE_WPN_LONG_SWORD + etable[1][etype];
    case WPN_BLESSED_SCIMITAR:
        return TILE_WPN_SCIMITAR + etable[1][etype];
    case WPN_BLESSED_KATANA:
        return TILE_WPN_KATANA + etable[1][etype];
    case WPN_BLESSED_GREAT_SWORD:
        return TILE_WPN_GREAT_SWORD + etable[1][etype];
    case WPN_BLESSED_DOUBLE_SWORD:
        return TILE_WPN_DOUBLE_SWORD;
    case WPN_BLESSED_TRIPLE_SWORD:
        return TILE_WPN_TRIPLE_SWORD;

Insertion in crawl-ref/source/misc.cc at line 1530 [6.1933596]

[5.10170]


static bool _check_annotation_exclusion_warning()
{
    coord_def pos(you.x_pos, you.y_pos);
    level_id  next_level_id = level_id::get_next_level_id(pos);

Insertion in crawl-ref/source/misc.cc at line 1536 [6.1933596]

[5.10171]

    crawl_state.level_annotation_shown = false;
    bool might_be_dangerous = false;
    if (level_annotation_has("!", next_level_id)
        && next_level_id != level_id::current()
        && next_level_id.level_type == LEVEL_DUNGEON)
    {
        mpr("Warning: level annotation for next level is:", MSGCH_PROMPT);
        mpr(get_level_annotation(next_level_id).c_str(), MSGCH_PLAIN, YELLOW);
        might_be_dangerous = true;
        crawl_state.level_annotation_shown = true;
    }
    else if (is_exclude_root(pos))
    {
        mpr("This staircase is marked as excluded!", MSGCH_WARN);
        might_be_dangerous = true;
    }
    if (might_be_dangerous
        && !yesno("Enter next level anyway?", true, 'n', true, false))
    {
        canned_msg(MSG_OK);
        interrupt_activity( AI_FORCE_INTERRUPT );
        crawl_state.level_annotation_shown = false;
        return false;
    }
    return true;
}

Replacement in crawl-ref/source/misc.cc at line 1593 [6.1933596]

B:BD[7.16596] → [7.16596:16751]

B:BD[7.16751] → [8.11140:11189]

∅:D[8.11189] → [7.16803:17002]

B:BD[7.16803] → [7.16803:17002]

B:BD[7.17002] → [8.11190:11269]

∅:D[8.11269] → [7.17074:17075]

B:BD[7.17074] → [7.17074:17075]

B:BD[7.17075] → [9.17296:17366]

∅:D[9.17366] → [7.17146:17292]

B:BD[7.17146] → [7.17146:17292]

∅:D[7.17292] → [6.1944243:1944249]

B:BD[6.1944243] → [6.1944243:1944249]

    coord_def pos(you.x_pos, you.y_pos);
    level_id  next_level_id = level_id::get_next_level_id(pos);
    crawl_state.level_annotation_shown = false;
    if (level_annotation_has("!", next_level_id)
        && next_level_id != level_id::current()
        && next_level_id.level_type == LEVEL_DUNGEON && !force_stair)
    {
        mpr("Warning: level annotation for next level is:", MSGCH_PROMPT);
        mpr(get_level_annotation(next_level_id).c_str(), MSGCH_PLAIN, YELLOW);
        if (!yesno("Enter next level anyway?", true, 0, true, false))
        {
            interrupt_activity( AI_FORCE_INTERRUPT );
            return;
        }
        crawl_state.level_annotation_shown = true;
    }

[7.16596]

[6.1944249]

    if (!force_stair && !_check_annotation_exclusion_warning())
        return;

Replacement in crawl-ref/source/misc.cc at line 1960 [6.1933596]

B:BD[7.19047] → [7.19047:19192]

B:BD[7.19192] → [8.11376:11425]

∅:D[8.11425] → [7.19244:19443]

B:BD[7.19244] → [7.19244:19443]

B:BD[7.19443] → [8.11426:11505]

    coord_def pos = you.pos();
    level_id  next_level_id = level_id::get_next_level_id(pos);
    crawl_state.level_annotation_shown = false;
    if (level_annotation_has("!", next_level_id)
        && next_level_id != level_id::current()
        && next_level_id.level_type == LEVEL_DUNGEON && !force_stair)
    {
        mpr("Warning: level annotation for next level is:", MSGCH_PROMPT);
        mpr(get_level_annotation(next_level_id).c_str(), MSGCH_PLAIN, YELLOW);

[7.19047]

[7.19515]

    if (!force_stair && !_check_annotation_exclusion_warning())
        return;

Deletion in crawl-ref/source/misc.cc at line 1963 [6.1933596]
B:BD[7.19516] → [10.2940:3010]
∅:D[10.3010] → [7.19587:19651]
B:BD[7.19587] → [7.19587:19651]
∅:D[7.19651] → [6.1950682:1950712]
B:BD[6.1950682] → [6.1950682:1950712]
B:BD[6.1950712] → [7.19652:19704]
∅:D[7.19704] → [6.1950712:1950719]
B:BD[6.1950712] → [6.1950712:1950719]
```
        if (!yesno("Enter next level anyway?", true, 0, true, false))
        {
            interrupt_activity( AI_FORCE_INTERRUPT );
            return;
        }
        crawl_state.level_annotation_shown = true;
    }
```

Replacement in crawl-ref/source/food.cc at line 844 [6.3043806]

B:BD[11.10445] → [2.3731:3779]

        if (!_player_can_eat_rotten_meat(true))

[11.10445]

[12.1102]

        if (rotten && !_player_can_eat_rotten_meat(true))

Insertion in crawl-ref/source/abl-show.cc at line 907 [6.4494389]

[13.6999]

        crawl_state.zero_turns_taken();
        return (false);
    }
    if ((tal.which == ABIL_EVOKE_BERSERK || tal.which == ABIL_TROG_BERSERK)
        && !you.can_go_berserk(true))
    {

Deletion in crawl-ref/source/abl-show.cc at line 964 [6.4494389]
∅:D[13.7074] → [14.4562:4682]
B:BD[14.4562] → [14.4562:4682]
∅:D[15.974] → [16.41774:41814]
∅:D[14.4682] → [16.41774:41814]
B:BD[16.41774] → [16.41774:41814]
∅:D[16.41814] → [17.15692:15716]
B:BD[17.15692] → [17.15692:15716]
B:BD[17.15716] → [16.41815:41821]
∅:D[16.41821] → [17.15716:15717]
B:BD[17.15716] → [17.15716:15717]
```
    if ((tal.which == ABIL_EVOKE_BERSERK || tal.which == ABIL_TROG_BERSERK)
        && !you.can_go_berserk(true))
    {
        crawl_state.zero_turns_taken();
        return (false);
    }
```