fiddlerwoaroof/crawl - Change XE5FBYASPYLMBNHWKL5MRN7TQGIWR4O6PF72I7WXRTUJ7HS2O2LAC

Change friendly pickup from a toggle to a more userfriendly, easily

abortable prompt, and move orc names into a file of their own.

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

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

XE5FBYASPYLMBNHWKL5MRN7TQGIWR4O6PF72I7WXRTUJ7HS2O2LAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 1246 [6.804403]

B:BD[4.3823] → [5.4390:4463]

B:BD[5.4463] → [3.2528:2577]

    // These effects happen if no other blessing was chosen (90%), or if
    // the above attempts were all unsuccessful.

[4.3823]

[7.2523]

    // These effects happen if no other blessing was chosen (90%),
    // or if the above attempts were all unsuccessful.

Deletion in crawl-ref/source/mon-util.cc at line 2968 [6.1699344]
B:BD[8.5738] → [3.2689:2690]

Replacement in crawl-ref/source/mon-util.cc at line 3056 [6.1699344]

B:BD[3.2807] → [3.2807:2969]

        bool give_msg = (slot == MSLOT_WEAPON
                         || slot == MSLOT_ALT_WEAPON
                            && mons_wields_two_weapons(this));

[3.2807]

[3.2969]

        bool give_msg = (slot == MSLOT_WEAPON || mons_wields_two_weapons(this));

Replacement in crawl-ref/source/mon-util.cc at line 3154 [6.1699344]

B:BD[3.3206] → [3.3206:3368]

        bool give_msg = (slot == MSLOT_WEAPON
                         || slot == MSLOT_ALT_WEAPON
                            && mons_wields_two_weapons(this));

[3.3206]

[9.6799]

        bool give_msg = (slot == MSLOT_WEAPON || mons_wields_two_weapons(this));

Replacement in crawl-ref/source/mon-util.cc at line 3240 [6.1699344]

B:BD[9.7252] → [9.7252:7326]

        || (eslot == MSLOT_ALT_WEAPON && mons_wields_two_weapons(this) ))

[9.7252]

[9.7326]

        || eslot == MSLOT_ALT_WEAPON && mons_wields_two_weapons(this))

Insertion in crawl-ref/source/database.cc at line 75 [12.13932]

[10.4125]

[11.2684]

            // This doesn't really belong here, but they *are* god gifts...
            "database/monname.txt",  // orcish names for beogh to choose from

Insertion in crawl-ref/source/dat/database/randname.txt at line 49 [13.14728]

[13.16687]

# Randart names may only have a maximum length of 25
# symbols (spaces included). This comparison takes
# place after all replacements have been taken care
# of, and the name is thus complete. If a name turns
# out to be longer than this threshold, the game
# will roll another one.
#

Deletion in crawl-ref/source/dat/database/randname.txt at line 694 [13.14728]
B:BD[13.24781] → [13.24781:24786]
B:BD[13.24786] → [14.12469:12779]
B:BD[14.12779] → [15.4274:4304]
B:BD[15.4304] → [16.5672:5680]
∅:D[16.5680] → [14.12787:12788]
B:BD[14.12787] → [14.12787:12788]
B:BD[14.12788] → [16.5681:5690]
∅:D[16.5690] → [14.12796:12844]
B:BD[14.12796] → [14.12796:12844]
B:BD[14.12874] → [14.12874:12889]
B:BD[14.12889] → [15.4305:4314]
B:BD[15.4314] → [16.5691:5699]
∅:D[16.5699] → [15.4314:4322]
B:BD[15.4314] → [15.4314:4322]
∅:D[15.4322] → [14.12889:12917]
B:BD[14.12889] → [14.12889:12917]
B:BD[14.12917] → [15.4323:4332]
```
%%%%
##############################################
# monster names
##############################################
orc name
# Some important syllables
#   beogh, bog = referring to Beogh
#   ork, orc, org, ok, oc, og (and more) = referring to orcs
#
# Other syllables may be borrowed from real life, or made up.
# Obvious references to Beogh
Arbeogh
Bogbarth
# slavic name, meaning "god's gift" :)
Bogdan
Bogdar
Bogmar
Bogric
Bogrim
Bogwald
Bogward
Bogwik
Morbeogh
Sharbogh
```
Deletion in crawl-ref/source/dat/database/randname.txt at line 695 [13.14728]
B:BD[14.12926] → [14.12926:13010]
B:BD[14.13016] → [15.4333:4341]
B:BD[15.4341] → [17.6068:6074]
∅:D[15.4341] → [14.13016:13053]
∅:D[17.6074] → [14.13016:13053]
B:BD[14.13016] → [14.13016:13053]
∅:D[14.13053] → [13.24786:24787]
B:BD[13.24786] → [13.24786:24787]
B:BD[13.24787] → [14.13054:13062]
B:BD[14.13062] → [16.5700:5708]
∅:D[16.5708] → [14.13062:13077]
B:BD[14.13062] → [14.13062:13077]
B:BD[14.13077] → [16.5709:5719]
∅:D[16.5719] → [15.4342:4360]
B:BD[14.13077] → [15.4342:4360]
B:BD[15.4360] → [16.5720:5738]
∅:D[16.5738] → [15.4360:4379]
B:BD[15.4360] → [15.4360:4379]
∅:D[15.4379] → [14.13077:13084]
B:BD[14.13077] → [14.13077:13084]
B:BD[14.13084] → [16.5739:5748]
∅:D[16.5748] → [14.13084:13099]
B:BD[14.13084] → [14.13084:13099]
B:BD[14.13099] → [15.4380:4396]
∅:D[15.4396] → [14.13099:13100]
B:BD[14.13099] → [14.13099:13100]
B:BD[14.13100] → [15.4397:4404]
B:BD[15.4404] → [2.2722:2732]
∅:D[2.2732] → [15.4404:4405]
B:BD[15.4404] → [15.4404:4405]
∅:D[15.4405] → [14.13100:13117]
B:BD[14.13100] → [14.13100:13117]
B:BD[14.13117] → [16.5749:5758]
∅:D[16.5758] → [14.13117:13154]
B:BD[14.13117] → [14.13117:13154]
B:BD[14.13154] → [16.5759:5774]
∅:D[16.5774] → [14.13154:13161]
B:BD[14.13154] → [14.13154:13161]
B:BD[14.13161] → [16.5775:5784]
∅:D[16.5784] → [14.13161:13177]
B:BD[14.13161] → [14.13161:13177]
B:BD[14.13177] → [16.5785:5791]
∅:D[16.5791] → [14.13183:13184]
B:BD[14.13183] → [14.13183:13184]
```
# Obvious references to orcs in general
Alork
Boruk
Marbork
Milork
Okrist
Oreg
Orgrim
Orik
Orkrul
Orkwin
Oruk
# Other
Agrik
Arbolt
Argrim
Arkwar
Berold
Bladwarg
Blodwig
Boderik
Bolgrim
Borgoth
Brandogh
Brunolf
Dorog
Garbold
Gorbash
Gorg
Grimold
Herok
Hilgar
Koronagh
Learuk
Margrim
Morguth
Morun
Murdo
Norbak
Olfik
Olfrun
Ugbert
Ugrim
Wardok
Wargrak
Worak
Wulfoc
Zorug
```

File addition: monname.txt (----------)

[13.14636]

######################################################
# monname.txt: lookup monster names
#
# This file contains a lists of names for monster
# names. This is currently only used when one of your
# orcish follower as Beogh's messiah gets named by 
# Beogh.
#
# Some important syllables
#   beogh, bog = referring to Beogh
#   ork, orc, org, ok etc. = referring to orcs
#
# Other syllables may be borrowed from real life, 
# or made up.
# 
# Feel free to add to this list. Like for the other
# database lists, you may add weights (defaults to 
# w:10) to make certain names more or less likely.
######################################################
%%%%
orc name
# Obvious references to Beogh
Arbeogh
Bogbarth
# slavic name, meaning "god's gift" :)
Bogdan
Bogdar
Bogmar
Bogric
Bogrim
Bogwald
Bogward
Bogwik
Morbeogh
Sharbogh
# Obvious references to orcs in general
Alork
Boruk
Marbork
Milork
Okrist
Oreg
Orgrim
Orik
Orkrul
Orkwin
Oruk
# Other
Agrik
Arbolt
Argrim
Arkwar
Berold
Bladwarg
Blodwig
Boderik
Bolgrim
Borgoth
Brandogh
Brunolf
Dorog
Garbold
Gorbash
Gorg
Grimold
Herok
Hilgar
Koronagh
Learuk
Margrim
Morguth
Morun
Murdo
Norbak
Olfik
Olfrun
Ugbert
Ugrim
Wardok
Wargrak
Worak
Wulfoc
Zorug
%%%%

Insertion in crawl-ref/source/acr.cc at line 1851 [6.4397395]

[18.1262965]

[6.4424324]


static void _print_friendly_pickup_setting(bool was_changed)
{
    std::string now = (was_changed? "now " : "");

Replacement in crawl-ref/source/acr.cc at line 1856 [6.4397395]

B:BD[6.4424325] → [18.1262966:1263064]

/* note that in some actions, you don't want to clear afterwards.
   e.g. list_jewellery, etc. */

[6.4424325]

[6.4424436]

    if (Options.friendly_pickup == -1)
    {
        mprf("Your allies are %sforbidden to pick up anything at all.",
             now.c_str());
    }
    else if (Options.friendly_pickup == 0)
    {
        mprf("Your allies may %sonly pick up items dropped by allies.",
             now.c_str());
    }
    else if (Options.friendly_pickup == 1)
    {
        mprf("Your allies may %spick up anything they need.", now.c_str());
    }
    else
    {
        mprf("Your allies are %scollecting bugs!", now.c_str());
    }
}

Insertion in crawl-ref/source/acr.cc at line 1876 [6.4397395]

[6.4424437]

[19.90594]

// note that in some actions, you don't want to clear afterwards.
//  e.g. list_jewellery, etc.

Insertion in crawl-ref/source/acr.cc at line 2042 [6.4397395]
[5.8864]
[5.8864]
```
    {
```

Replacement in crawl-ref/source/acr.cc at line 2044 [6.4397395]

B:BD[5.8910] → [5.8910:8963]

        if (Options.friendly_pickup == -1)
        {

[5.8910]

[5.8963]

        _print_friendly_pickup_setting(false);
        mpr("Change to (n)othing, (f)riend-dropped, or (a)ll? ", MSGCH_PROMPT);
        char type = (char) getchm(KC_DEFAULT);
        type = tolower(type);
        if (type == 'n')
            Options.friendly_pickup = -1;
        else if (type == 'f')

Replacement in crawl-ref/source/acr.cc at line 2054 [6.4397395]

B:BD[5.9004] → [5.9004:9149]

            mpr("Your allies may now only pick up items dropped by allies.");
        }
        else if (Options.friendly_pickup == 0)
        {

[5.9004]

[5.9149]

        else if (type == 'a')

Deletion in crawl-ref/source/acr.cc at line 2056 [6.4397395]

B:BD[5.9190] → [5.9190:9268]

            mpr("Your allies may now pick up anything they need.");
        }

Replacement in crawl-ref/source/acr.cc at line 2058 [6.4397395]

B:BD[5.9291] → [5.9291:9411]

            Options.friendly_pickup = -1;
            mpr("Your allies are now forbidden to pick up anything at all.");

[5.9291]

[5.9411]

            canned_msg( MSG_OK );
            break;

Insertion in crawl-ref/source/acr.cc at line 2061 [6.4397395]
[5.9421]
[5.9421]
```
        _print_friendly_pickup_setting(true);
```
Replacement in crawl-ref/source/acr.cc at line 2063 [6.4397395]
B:BD[5.9436] → [5.9436:9437]
[5.9436]
[18.1265280]
```
    }
```