fiddlerwoaroof/crawl - Change VBG2GGMVC66LQM4OSI67VKXGAQK4GVOEHX3OL6V3IFOO52MQL72QC

* Fixed Vault:8 level being generated with no rune (cbus).

Dropped odds of statue vault.
Take note of messages received in dgamelaunch chat.
crawl -vscores, etc. should not attempt to create save/morgue directories (Marc).
Changed wording of "Foo wielding bar comes into view" to "Foo comes into view. It is wielding bar.".
Suppress curse status display of monster items.
TSO worshippers are no longer warned when stabbing monsters if TSO doesn't object to stabbing those monsters.
Wand zap status is now {zapped: N} instead of {zapped N times} to reduce verbosity.

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

Created by dshaligram on September 25, 2007

VBG2GGMVC66LQM4OSI67VKXGAQK4GVOEHX3OL6V3IFOO52MQL72QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 568 [7.16817]
B:BD[5.181] → [5.181:207]
```
	tc |= COLFLAG_TRAP_ITEM;
```
[5.181]
[5.207]
```
        tc |= COLFLAG_TRAP_ITEM;
```
Insertion in crawl-ref/source/religion.h at line 54 [7.800304]
[8.29176]
[8.29176]
```
class actor;
bool tso_stab_safe_monster(const actor *act);
```

Insertion in crawl-ref/source/religion.cc at line 3457 [7.804403]

[9.6128]


// Returns true if The Shining One doesn't mind you stabbing this creature.
bool tso_stab_safe_monster(const actor *act)
{
    const mon_holy_type holy = act->holiness();
    return (holy != MH_NATURAL && holy != MH_HOLY);
}

Insertion in crawl-ref/source/player.cc at line 78 [7.962854]
[10.1049]
[10.1049]
```
    case DESC_NONE:
        return "";
```
Insertion in crawl-ref/source/mon-util.cc at line 1460 [7.1699344]
[11.2151]
[12.5737]
```
    if (desc == DESC_NONE)
        return ("");
    
```

Replacement in crawl-ref/source/mon-util.cc at line 2491 [7.1699344]

B:BD[4.4064] → [4.4064:4111]

             item.name(DESC_NOCAP_A).c_str());

[4.4064]

[4.4111]

             item.name(DESC_NOCAP_A, false, false, true,
                       false, ISFLAG_CURSED).c_str());

Replacement in crawl-ref/source/mon-util.cc at line 2581 [7.1699344]

B:BD[4.5111] → [4.5111:5158]

             item.name(DESC_NOCAP_A).c_str());

[4.5111]

[4.5158]

             item.name(DESC_NOCAP_A, false, false, true,
                       false, ISFLAG_CURSED).c_str());

Insertion in crawl-ref/source/libutil.cc at line 72 [7.2494093]
[13.23963]
[13.23963]
```
    else if (!strcmp("none", desc))
        return DESC_NONE;
```

Replacement in crawl-ref/source/libutil.cc at line 106 [7.2494093]

B:BD[14.1252] → [6.277:345]

    return replace_all_of(s, " .&`\"\'|;:/\\{}()[]<>*%$#@!~?", "");

[14.1252]

[14.1292]

    return replace_all_of(s, " .&`\"\'|;{}()[]<>*%$#@!~?", "");

Insertion in crawl-ref/source/itemname.cc at line 79 [7.2667494]
[7.2676866]
[15.763]
```
    if (descrip == DESC_NONE)
        return ("");
    
```

Replacement in crawl-ref/source/itemname.cc at line 1211 [7.2667494]

B:BD[16.673] → [16.673:779]

            buff << " {zapped " << item_plus2
                 << ((item_plus2 > 1) ? " times" : " time")

[16.673]

[16.779]

            buff << " {zapped: " << item_plus2

Deletion in crawl-ref/source/initfile.cc at line 1300 [7.2957258]
B:BD[17.9028] → [18.548:573]
```
    validate_options();
```
Replacement in crawl-ref/source/initfile.cc at line 1302 [7.2957258]
B:BD[18.576] → [18.576:614]
```
void game_options::validate_options()
```
[18.576]
[18.614]
```
void game_options::fixup_options()
```
Insertion in crawl-ref/source/fight.cc at line 404 [7.3140790]
[19.2268]
[19.2268]
```
    case DESC_NONE:
        return ("");
```

Replacement in crawl-ref/source/fight.cc at line 1198 [7.3140790]

B:BD[20.48689] → [20.48689:48799]

        
        if (mons_holiness(def) == MH_NATURAL
            || mons_holiness(def) == MH_HOLY)
        {

[20.48689]

[20.48799]


        if (!tso_stab_safe_monster(defender))

Deletion in crawl-ref/source/fight.cc at line 1201 [7.3140790]
B:BD[20.48845] → [20.48845:48855]
```
        }
```

Replacement in crawl-ref/source/fight.cc at line 2477 [7.3140790]

B:BD[7.3194437] → [2.323:379]

    if (stab_attempt && you.religion == GOD_SHINING_ONE

[7.3194437]

[2.379]

    if (stab_attempt
        && you.religion == GOD_SHINING_ONE

Replacement in crawl-ref/source/fight.cc at line 2481 [7.3140790]

B:BD[21.327] → [21.327:400]

        if (!yesno("Really attack this helpless creature?", false, 'n'))

[21.327]

[21.400]

        if (!tso_stab_safe_monster(defender)
            && !yesno("Really attack this helpless creature?", false, 'n'))

Insertion in crawl-ref/source/externs.h at line 1657 [7.3270163]

[22.901298]


    // Fix option values if necessary, specifically file paths.
    void fixup_options();

Deletion in crawl-ref/source/externs.h at line 1691 [7.3270163]
B:BD[17.10942] → [18.696:725]
```
    void validate_options();
```

Replacement in crawl-ref/source/enum.h at line 759 [7.3287960]

B:BD[23.15065] → [23.15065:15142]

    DESC_QUALNAME                      // Name without articles, quantities,

[23.15065]

[23.15142]

    DESC_QUALNAME,                     // Name without articles, quantities,

Insertion in crawl-ref/source/enum.h at line 761 [7.3287960]
[23.15198]
[7.3307232]
```
    DESC_NONE
```

Replacement in crawl-ref/source/direct.h at line 149 [7.3696722]

B:BD[24.5152] → [25.1097:1171]

std::string get_monster_desc(const monsters *mon, bool full_desc = true);

[24.5152]

[22.974734]

std::string get_monster_desc(const monsters *mon,
                             bool full_desc = true,
                             description_level_type mondtype = DESC_CAP_A);

Insertion in crawl-ref/source/direct.cc at line 1447 [7.3697945]
[26.36215]
[26.36215]
```
    case DESC_NONE:
        return ("");
```
Replacement in crawl-ref/source/direct.cc at line 1780 [7.3697945]
∅:D[25.2090] → [27.15373:15378]
B:BD[27.15373] → [27.15373:15378]
```
    
```
[25.2090]
[27.15378]

Replacement in crawl-ref/source/direct.cc at line 1782 [7.3697945]

B:BD[27.15392] → [27.15392:15434]

        name1 = weap->name(DESC_NOCAP_A);

[27.15392]

[27.15434]

        name1 = weap->name(DESC_NOCAP_A, false, false, true,
                           false, ISFLAG_KNOW_CURSE);

Replacement in crawl-ref/source/direct.cc at line 1785 [7.3697945]

B:BD[27.15491] → [27.15491:15532]

        name2 = alt->name(DESC_NOCAP_A);

[27.15491]

[27.15532]

        name2 = alt->name(DESC_NOCAP_A, false, false, true,
                          false, ISFLAG_KNOW_CURSE);

Replacement in crawl-ref/source/direct.cc at line 1795 [7.3697945]

B:BD[27.15698] → [27.15698:15764]

        name1 = dup.name(DESC_NOCAP_A, false, false, true, true);

[27.15698]

[27.15764]

        name1 = dup.name(DESC_NOCAP_A, false, false, true, true,
                         ISFLAG_KNOW_CURSE);

Deletion in crawl-ref/source/direct.cc at line 1814 [7.3697945]
B:BD[28.3982] → [25.2242:2244]

Replacement in crawl-ref/source/direct.cc at line 1916 [7.3697945]

B:BD[25.4661] → [25.4661:4727]

std::string get_monster_desc(const monsters *mon, bool full_desc)

[25.4661]

[25.4727]

std::string get_monster_desc(const monsters *mon, bool full_desc,
                             description_level_type mondtype)

Replacement in crawl-ref/source/direct.cc at line 1919 [7.3697945]
B:BD[25.4729] → [25.4729:4775]
```
    std::string desc = mon->name(DESC_CAP_A);
```
[25.4729]
[25.4775]
```
    std::string desc = mon->name(mondtype);
```

Replacement in crawl-ref/source/delay.cc at line 1038 [7.3963459]

B:BD[29.5706] → [29.5706:5794]

                     mprf(MSGCH_WARN, "You feel that %s is too close now for comfort.",

[29.5706]

[29.5794]

                     mprf(MSGCH_WARN,
                          "You feel that %s is too close now for comfort.",

Replacement in crawl-ref/source/delay.cc at line 1043 [7.3963459]

B:BD[29.5912] → [29.5912:5997]

                     mprf(MSGCH_WARN, "%s's presence makes you stop your activity.",

[29.5912]

[29.5997]

                     mprf(MSGCH_WARN,
                          "%s's presence makes you stop your activity.",

Replacement in crawl-ref/source/delay.cc at line 1051 [7.3963459]

B:BD[29.6148] → [29.6148:6341]

                std::string text = get_monster_desc(mon, false);
                text += " comes into view.";
                print_formatted_paragraph(text, get_number_of_cols(), MSGCH_WARN);

[29.6148]

[29.6341]

                const std::string mweap =
                    get_monster_desc(mon, false, DESC_NONE);
                std::string text = mon->name(DESC_CAP_A) + " comes into view.";
                if (!mweap.empty())
                    text += " " + mon->pronoun(PRONOUN_CAP)
                        + " is" + mweap + ".";
                print_formatted_paragraph(text,
                                          get_number_of_cols(),
                                          MSGCH_WARN);

Replacement in crawl-ref/source/dat/vaults.des at line 193 [22.1041446]
B:BD[3.463] → [3.463:478]
```
KFEAT:   O = .
```
[3.463]
[30.9268]
Insertion in crawl-ref/source/dat/mini.des at line 370 [30.75280]
[30.83354]
[30.83354]
```
TAGS: uniq
CHANCE: 4
```

Insertion in crawl-ref/source/acr.cc at line 2788 [7.4397395]

[31.11060]

        take_note(Note( NOTE_MESSAGE, MSGCH_PLAIN, 0, line.c_str() ));

Replacement in crawl-ref/source/acr.cc at line 2795 [7.4397395]

B:BD[31.11282] → [31.11282:11336]

        mprf("%s: %s", sender.c_str(), line.c_str());

[31.11282]

[31.11336]

        formatted_string fs;
        fs.textcolor(WHITE);
        fs.cprintf("%s: ", sender.c_str());
        fs.textcolor(LIGHTGREY);
        fs.cprintf("%s", line.c_str());
        formatted_mpr(fs, MSGCH_PLAIN, 0);

Insertion in crawl-ref/source/acr.cc at line 3299 [7.4397395]
[7.4468469]
[22.1279835]
```
    Options.fixup_options();
    
```
Insertion in crawl-ref/source/acr.cc at line 3419 [7.4397395]
[32.552769]
[32.552769]
```
    Options.fixup_options();
```

* Fixed Vault:8 level being generated with no rune (cbus).

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 568 [7.16817]

Insertion in crawl-ref/source/religion.h at line 54 [7.800304]

Insertion in crawl-ref/source/religion.cc at line 3457 [7.804403]

Insertion in crawl-ref/source/player.cc at line 78 [7.962854]

Insertion in crawl-ref/source/mon-util.cc at line 1460 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2491 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2581 [7.1699344]

Insertion in crawl-ref/source/libutil.cc at line 72 [7.2494093]

Replacement in crawl-ref/source/libutil.cc at line 106 [7.2494093]

Insertion in crawl-ref/source/itemname.cc at line 79 [7.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1211 [7.2667494]

Deletion in crawl-ref/source/initfile.cc at line 1300 [7.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1302 [7.2957258]

Insertion in crawl-ref/source/fight.cc at line 404 [7.3140790]

Replacement in crawl-ref/source/fight.cc at line 1198 [7.3140790]

Deletion in crawl-ref/source/fight.cc at line 1201 [7.3140790]

Replacement in crawl-ref/source/fight.cc at line 2477 [7.3140790]

Replacement in crawl-ref/source/fight.cc at line 2481 [7.3140790]

Insertion in crawl-ref/source/externs.h at line 1657 [7.3270163]

Deletion in crawl-ref/source/externs.h at line 1691 [7.3270163]

Replacement in crawl-ref/source/enum.h at line 759 [7.3287960]

Insertion in crawl-ref/source/enum.h at line 761 [7.3287960]

Replacement in crawl-ref/source/direct.h at line 149 [7.3696722]

Insertion in crawl-ref/source/direct.cc at line 1447 [7.3697945]

Replacement in crawl-ref/source/direct.cc at line 1780 [7.3697945]

Replacement in crawl-ref/source/direct.cc at line 1782 [7.3697945]

Replacement in crawl-ref/source/direct.cc at line 1785 [7.3697945]

Replacement in crawl-ref/source/direct.cc at line 1795 [7.3697945]

Deletion in crawl-ref/source/direct.cc at line 1814 [7.3697945]

Replacement in crawl-ref/source/direct.cc at line 1916 [7.3697945]

Replacement in crawl-ref/source/direct.cc at line 1919 [7.3697945]

Replacement in crawl-ref/source/delay.cc at line 1038 [7.3963459]

Replacement in crawl-ref/source/delay.cc at line 1043 [7.3963459]

Replacement in crawl-ref/source/delay.cc at line 1051 [7.3963459]

Replacement in crawl-ref/source/dat/vaults.des at line 193 [22.1041446]

Insertion in crawl-ref/source/dat/mini.des at line 370 [30.75280]

Insertion in crawl-ref/source/acr.cc at line 2788 [7.4397395]

Replacement in crawl-ref/source/acr.cc at line 2795 [7.4397395]

Insertion in crawl-ref/source/acr.cc at line 3299 [7.4397395]

Insertion in crawl-ref/source/acr.cc at line 3419 [7.4397395]