fiddlerwoaroof/crawl - Change 5UG3T2OCCPU77EEMYVOMXGM2X6LRRI5LSQT7ISNQECA4QQC2IFUAC

Fix shopping messages mentioning "0 gold piece", and fix reading

unidentified scrolls of immolation counting as attacking friends.

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

Created by dolorous on May 18, 2009

5UG3T2OCCPU77EEMYVOMXGM2X6LRRI5LSQT7ISNQECA4QQC2IFUAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/shopping.cc at line 294 [5.759950]

B:BD[4.2641] → [4.2641:2719]

B:BD[4.2719] → [2.284:333]

            snprintf( info, INFO_SIZE, "You have %d gold piece%s.", you.gold,
                      you.gold > 1 ? "s" : "" );

[4.2641]

[6.2901]

            snprintf(info, INFO_SIZE, "You have %d gold piece%s.", you.gold,
                     you.gold != 1 ? "s" : "");

Replacement in crawl-ref/source/shopping.cc at line 301 [5.759950]

B:BD[4.2863] → [4.2863:3046]

B:BD[4.3046] → [2.334:381]

∅:D[2.381] → [4.3096:3141]

∅:D[7.382] → [4.3096:3141]

B:BD[4.3096] → [4.3096:3141]

B:BD[4.3141] → [2.382:446]

            snprintf( info, INFO_SIZE, "You now have %d gold piece%s. "
                            "You are short %d gold piece%s for the purchase.",
                      you.gold,
                      you.gold > 1 ? "s" : "",
                      total_cost - you.gold,
                      (total_cost - you.gold > 1) ? "s" : "" );

[4.2863]

[4.3206]

            snprintf(info, INFO_SIZE, "You now have %d gold piece%s. "
                           "You are short %d gold piece%s for the purchase.",
                     you.gold,
                     you.gold != 1 ? "s" : "",
                     total_cost - you.gold,
                     (total_cost - you.gold != 1) ? "s" : "");

Replacement in crawl-ref/source/shopping.cc at line 312 [5.759950]

B:BD[4.3273] → [4.3273:3453]

B:BD[4.3453] → [2.447:494]

∅:D[7.431] → [4.3503:3548]

∅:D[2.494] → [4.3503:3548]

B:BD[4.3503] → [4.3503:3548]

B:BD[4.3548] → [2.495:559]

            snprintf( info, INFO_SIZE, "You now have %d gold piece%s. "
                      "After the purchase, you will have %d gold piece%s.",
                      you.gold,
                      you.gold > 1 ? "s" : "",
                      you.gold - total_cost,
                      (you.gold - total_cost > 1) ? "s" : "" );

[4.3273]

[4.3613]

            snprintf(info, INFO_SIZE, "You now have %d gold piece%s. "
                     "After the purchase, you will have %d gold piece%s.",
                     you.gold,
                     you.gold != 1 ? "s" : "",
                     you.gold - total_cost,
                     (you.gold - total_cost != 1) ? "s" : "");

Replacement in crawl-ref/source/religion.cc at line 6216 [5.804403]

B:BD[8.2875] → [9.6243:6307]

    return god_hates_attacking_friend(god, fr->mons_species());

[8.2875]

[9.6307]

    return (god_hates_attacking_friend(god, fr->mons_species()));

Insertion in crawl-ref/source/player.cc at line 3219 [5.962854]
[10.6063]
[5.1014471]

Replacement in crawl-ref/source/beam.cc at line 1843 [5.4128068]

∅:D[11.2973] → [12.18838:18933]

B:BD[12.18838] → [12.18838:18933]

        // Note that this can change the ray position
        // and the solidity of the wall.

[11.2973]

[12.18933]

        // Note that this can change the ray position and the solidity
        // of the wall.

Replacement in crawl-ref/source/beam.cc at line 4469 [5.4128068]

B:BD[5.4238975] → [13.3015:3167]

            // It's not the player's fault if he didn't see the monster or
            // the monster was caught in an unexpected blast of ?immolation.

[5.4238975]

[14.2762]

            // It's not the player's fault if he didn't see the monster
            // or the monster was caught in an unexpected blast of
            // ?immolation.

Replacement in crawl-ref/source/beam.cc at line 4474 [5.4128068]

∅:D[3.3798] → [12.57507:57613]

B:BD[13.3214] → [12.57507:57613]

                 || aux_source == "reading a scroll of immolation"
                    && !effect_known);

[3.3798]

[15.4883]

                    || aux_source == "scroll of immolation" && !effect_known);