fiddlerwoaroof/crawl - Change XKL3ATYU6YNHKOGQCVJVQR7YG2I6KPYGWUNICZ7NSDKLNM4UGK3AC

Allow vaults to request use of the acquirement code with "acquire <item_class>" or "acquire:<god> <item_class>" in item specs (due).

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

Created by dshaligram on September 21, 2009

XKL3ATYU6YNHKOGQCVJVQR7YG2I6KPYGWUNICZ7NSDKLNM4UGK3AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.cc at line 1353 [6.224557]
B:BD[5.1146] → [5.1146:1182]
```
    if (colour >= 0 && colour <= 7)
```
[5.1146]
[5.1182]
```
    if (colour <= 7)
```
Replacement in crawl-ref/source/mapdef.h at line 414 [8.591249]
B:BD[7.3259] → [7.3259:3282]
```
    ISPEC_BAD     = -5
```
[7.3259]
[9.303]
```
    ISPEC_BAD     = -5,
    ISPEC_ACQUIREMENT = -9
```
Insertion in crawl-ref/source/mapdef.h at line 430 [8.591249]
[9.479]
[10.2518]
```
    int acquirement_source;
```

Replacement in crawl-ref/source/mapdef.h at line 435 [8.591249]

∅:D[11.2596] → [12.2604:2648]

B:BD[12.2604] → [12.2604:2648]

        race(MAKE_ITEM_RANDOM_RACE), qty(0)

[11.2596]

[9.647]

        race(MAKE_ITEM_RANDOM_RACE), qty(0), acquirement_source(0),
        place()

Insertion in crawl-ref/source/mapdef.h at line 470 [8.591249]
[9.1351]
[9.1351]
```
    int parse_acquirement_source(const std::string &source);
```
Insertion in crawl-ref/source/mapdef.cc at line 37 [8.594797]
[13.73332]
[8.594937]
```
#include "religion.h"
```

Insertion in crawl-ref/source/mapdef.cc at line 2827 [8.594797]

[14.140962]

int item_list::parse_acquirement_source(const std::string &source)
{
    const std::string god_name(replace_all_of(source, "_", " "));
    const god_type god(string_to_god(god_name.c_str(), true));
    if (god == GOD_NO_GOD)
        error = make_stringf("unknown god name: '%s'", god_name.c_str());
    return (god);
}

Insertion in crawl-ref/source/mapdef.cc at line 2856 [8.594797]

[15.405]

[14.141434]


    const std::string acquirement_source = strip_tag_prefix(s, "acquire:");
    if (!acquirement_source.empty() || strip_tag(s, "acquire"))
    {
        if (!acquirement_source.empty())
            result.acquirement_source =
                parse_acquirement_source(acquirement_source);
        // If requesting acquirement, must specify item base type or
        // "any".
        result.level = ISPEC_ACQUIREMENT;
        if (s == "any")
            result.base_type = OBJ_RANDOM;
        else
            parse_random_by_class(s, result);
        return (result);
    }

Insertion in crawl-ref/source/items.h at line 138 [6.2580284]
[16.342184]
[17.61480]
```
void origin_reset(item_def &item);
```

Insertion in crawl-ref/source/items.cc at line 832 [6.2584728]

[16.344614]

}
void origin_reset(item_def &item)
{
    item.orig_place  = 0;
    item.orig_monnum = 0;

Insertion in crawl-ref/source/effects.h at line 89 [6.3378996]

[6.3380771]

int acquirement_create_item(object_class_type class_wanted,
                            int agent,
                            bool quiet,
                            const coord_def &pos);

Replacement in crawl-ref/source/effects.cc at line 1777 [6.3382105]

∅:D[18.14910] → [19.1014:1120]

B:BD[20.794] → [19.1014:1120]

bool acquirement(object_class_type class_wanted, int agent,
                 bool quiet, int* item_index)

[18.14910]

[20.854]

static int _failed_acquirement(bool quiet)

Replacement in crawl-ref/source/effects.cc at line 1779 [6.3382105]

B:BD[20.856] → [21.4250:4283]

∅:D[21.4283] → [19.1121:1250]

B:BD[20.856] → [19.1121:1250]

∅:D[19.1250] → [20.960:1006]

B:BD[20.960] → [20.960:1006]

B:BD[20.1006] → [19.1251:1275]

∅:D[19.1275] → [20.1006:1024]

B:BD[20.1006] → [20.1006:1024]

B:BD[20.1024] → [4.4216:4362]

∅:D[22.1410] → [20.1229:1353]

∅:D[4.4362] → [20.1229:1353]

B:BD[20.1229] → [20.1229:1353]

B:BD[20.1353] → [23.9945:9968]

∅:D[23.9968] → [22.1436:1446]

B:BD[22.1436] → [22.1436:1446]

B:BD[22.1446] → [4.4363:5056]

∅:D[4.5056] → [18.14911:15136]

B:BD[22.1894] → [18.14911:15136]

B:BD[18.15136] → [3.6270:6701]

∅:D[3.6701] → [22.1918:1928]

∅:D[18.15155] → [22.1918:1928]

B:BD[22.1918] → [22.1918:1928]

∅:D[22.1928] → [20.1912:1918]

B:BD[20.1912] → [20.1912:1918]

∅:D[18.15224] → [20.1918:1919]

B:BD[20.1918] → [20.1918:1919]

B:BD[20.1919] → [24.7027:7072]

∅:D[24.7072] → [6.3417455:3417461]

∅:D[8.942003] → [6.3417455:3417461]

B:BD[6.3417455] → [6.3417455:3417461]

B:BD[6.3417461] → [25.7462:7495]

∅:D[25.7495] → [19.1276:1320]

B:BD[8.942036] → [19.1276:1320]

B:BD[26.4415] → [24.7073:7151]

B:BD[24.7151] → [27.3697:3698]

B:BD[27.3698] → [28.5120:5172]

∅:D[28.5172] → [29.5436:5915]

∅:D[18.15248] → [29.5436:5915]

B:BD[29.5436] → [29.5436:5915]

∅:D[29.5915] → [19.1321:1353]

∅:D[24.7216] → [19.1321:1353]

B:BD[30.7238] → [19.1321:1353]

    ASSERT(!crawl_state.arena);
    int thing_created = NON_ITEM;
    if (item_index == NULL)
        item_index = &thing_created;
    *item_index = NON_ITEM;
    while (class_wanted == OBJ_RANDOM)
    {
        ASSERT(!quiet);
        mesclr();
        mpr("[a] Weapon  [b] Armour  [c] Jewellery      [d] Book");
        mpr("[e] Staff   [f] Wand    [g] Miscellaneous  [h] Food  [i] Gold");
        mpr("What kind of item would you like to acquire? ", MSGCH_PROMPT);
        const int keyin = tolower( get_ch() );
        switch (keyin)
        {
        case 'a': case ')':            class_wanted = OBJ_WEAPONS;    break;
        case 'b': case '[':  case ']': class_wanted = OBJ_ARMOUR;     break;
        case 'c': case '=':  case '"': class_wanted = OBJ_JEWELLERY;  break;
        case 'd': case '+':  case ':': class_wanted = OBJ_BOOKS;      break;
        case 'e': case '\\': case '|': class_wanted = OBJ_STAVES;     break;
        case 'f': case '/':            class_wanted = OBJ_WANDS;      break;
        case 'g': case '}':  case '{': class_wanted = OBJ_MISCELLANY; break;
        case 'h': case '%':            class_wanted = OBJ_FOOD;       break;
        case 'i': case '$':            class_wanted = OBJ_GOLD;       break;
        default:
            // Lets wizards escape out of accidently choosing acquirement.
            if (agent == AQ_WIZMODE)
            {
                canned_msg(MSG_OK);
                return (false);
            }
#if defined(USE_UNIX_SIGNALS) && defined(SIGHUP_SAVE) && defined(USE_CURSES)
            // If we've gotten a HUP signal then the player will be unable
            // to make a selection.
            if (crawl_state.seen_hups)
            {
                mpr("Acquirement interrupted by HUP signal.", MSGCH_ERROR);
                you.turn_is_over = false;
                return (false);
            }
#endif
           break;
        }
    }
    if (grid_destroys_items(grd(you.pos())))
    {
        // How sad (and stupid).
        if (!silenced(you.pos()) && !quiet)
            mprf(MSGCH_SOUND, grid_item_destruction_message(grd(you.pos())));
        if (agent > GOD_NO_GOD && agent < NUM_GODS)
        {
            if (agent == GOD_XOM)
                simple_god_message(" snickers.", GOD_XOM);
            else
            {
                ASSERT(!"God gave gift item while player was on grid which "
                        "destroys items.");
                mprf(MSGCH_ERROR, "%s gave a god gift while you were on "
                                  "terrain which destroys items.",
                     god_name((god_type) agent).c_str());
            }
        }
        *item_index = NON_ITEM;

[20.856]

[31.6771]

    if (!quiet)
        mpr("The demon of the infinite void smiles upon you.");
    return (NON_ITEM);
}

Replacement in crawl-ref/source/effects.cc at line 1784 [6.3382105]

B:BD[31.6772] → [31.6772:6914]

∅:D[19.1353] → [6.3417525:3417531]

∅:D[31.6914] → [6.3417525:3417531]

∅:D[30.7238] → [6.3417525:3417531]

∅:D[32.16134] → [6.3417525:3417531]

∅:D[33.30247] → [6.3417525:3417531]

∅:D[8.942128] → [6.3417525:3417531]

B:BD[6.3417525] → [6.3417525:3417531]

        // Well, the item may have fallen in the drink, but the intent is
        // that acquirement happened. -- bwr
        return (true);
    }

[31.6772]

[34.2781]

int acquirement_create_item(object_class_type class_wanted,
                            int agent,
                            bool quiet,
                            const coord_def &pos)
{
    ASSERT(class_wanted != OBJ_RANDOM);

Insertion in crawl-ref/source/effects.cc at line 1791 [6.3382105]
[34.2782]
[34.2782]
```
    int thing_created = NON_ITEM;
```

Replacement in crawl-ref/source/effects.cc at line 1945 [6.3382105]

B:BD[34.6151] → [34.6151:6307]

    {
        if (!quiet)
            mpr("The demon of the infinite void smiles upon you.");
        *item_index = NON_ITEM;
        return (false);
    }

[34.6151]

[8.942129]

        return _failed_acquirement(quiet);

Deletion in crawl-ref/source/effects.cc at line 1968 [6.3382105]

B:BD[18.15496] → [34.6766:6898]

            if (!quiet)
                mpr("The demon of the infinite void smiles upon you.");
            *item_index = NON_ITEM;

Replacement in crawl-ref/source/effects.cc at line 1969 [6.3382105]
B:BD[34.6937] → [34.6937:6965]
```
            return (false);
```
[34.6937]
[18.15545]
```
            return _failed_acquirement(quiet);
```
Replacement in crawl-ref/source/effects.cc at line 2093 [6.3382105]
B:BD[35.36036] → [34.10319:10371]
```
    move_item_to_grid( &thing_created, you.pos() );
```
[35.36036]
[6.3424771]
```
    move_item_to_grid( &thing_created, pos );
```

Replacement in crawl-ref/source/effects.cc at line 2098 [6.3382105]

B:BD[34.10547] → [34.10547:10582]

    if (thing_created != NON_ITEM)

[34.10547]

[34.10582]

    if (thing_created != NON_ITEM && !quiet)
        canned_msg(MSG_SOMETHING_APPEARS);
    return (thing_created);
}
bool acquirement(object_class_type class_wanted, int agent,
                 bool quiet, int* item_index)
{
    ASSERT(!crawl_state.arena);
    int thing_created = NON_ITEM;
    if (item_index == NULL)
        item_index = &thing_created;
    *item_index = NON_ITEM;
    while (class_wanted == OBJ_RANDOM)
    {
        ASSERT(!quiet);
        mesclr();
        mpr("[a] Weapon  [b] Armour  [c] Jewellery      [d] Book");
        mpr("[e] Staff   [f] Wand    [g] Miscellaneous  [h] Food  [i] Gold");
        mpr("What kind of item would you like to acquire? ", MSGCH_PROMPT);
        const int keyin = tolower( get_ch() );
        switch (keyin)
        {
        case 'a': case ')':            class_wanted = OBJ_WEAPONS;    break;
        case 'b': case '[':  case ']': class_wanted = OBJ_ARMOUR;     break;
        case 'c': case '=':  case '"': class_wanted = OBJ_JEWELLERY;  break;
        case 'd': case '+':  case ':': class_wanted = OBJ_BOOKS;      break;
        case 'e': case '\\': case '|': class_wanted = OBJ_STAVES;     break;
        case 'f': case '/':            class_wanted = OBJ_WANDS;      break;
        case 'g': case '}':  case '{': class_wanted = OBJ_MISCELLANY; break;
        case 'h': case '%':            class_wanted = OBJ_FOOD;       break;
        case 'i': case '$':            class_wanted = OBJ_GOLD;       break;
        default:
            // Lets wizards escape out of accidently choosing acquirement.
            if (agent == AQ_WIZMODE)
            {
                canned_msg(MSG_OK);
                return (false);
            }
#if defined(USE_UNIX_SIGNALS) && defined(SIGHUP_SAVE) && defined(USE_CURSES)
            // If we've gotten a HUP signal then the player will be unable
            // to make a selection.
            if (crawl_state.seen_hups)
            {
                mpr("Acquirement interrupted by HUP signal.", MSGCH_ERROR);
                you.turn_is_over = false;
                return (false);
            }
#endif
           break;
        }
    }
    if (grid_destroys_items(grd(you.pos())))

Replacement in crawl-ref/source/effects.cc at line 2160 [6.3382105]

B:BD[34.10588] → [34.10588:10655]

        if (!quiet)
            canned_msg(MSG_SOMETHING_APPEARS);

[34.10588]

[6.3425046]

        // How sad (and stupid).
        if (!silenced(you.pos()) && !quiet)
            mprf(MSGCH_SOUND, grid_item_destruction_message(grd(you.pos())));
        if (agent > GOD_NO_GOD && agent < NUM_GODS)
        {
            if (agent == GOD_XOM)
                simple_god_message(" snickers.", GOD_XOM);
            else
            {
                ASSERT(!"God gave gift item while player was on grid which "
                        "destroys items.");
                mprf(MSGCH_ERROR, "%s gave a god gift while you were on "
                                  "terrain which destroys items.",
                     god_name((god_type) agent).c_str());
            }
        }
        *item_index = NON_ITEM;
        // Well, the item may have fallen in the drink, but the intent is
        // that acquirement happened. -- bwr
        return (true);

Deletion in crawl-ref/source/effects.cc at line 2184 [6.3382105]
B:BD[6.3425052] → [34.10656:10689]
```
    *item_index = thing_created;
```

Replacement in crawl-ref/source/effects.cc at line 2185 [6.3382105]

B:BD[6.3425053] → [36.3340:3410]

∅:D[36.3410] → [6.3425124:3425184]

B:BD[6.3425124] → [6.3425124:3425184]

    // Well, the item may have fallen in the drink, but the intent is
    // that acquirement happened. -- bwr
    return (true);

[6.3425053]

[37.2864]

    *item_index =
        acquirement_create_item(class_wanted, agent, quiet, you.pos());
    return (*item_index != NON_ITEM);

Insertion in crawl-ref/source/dungeon.cc at line 26 [6.3429798]
[6.3431012]
[6.3431012]
```
#include "effects.h"
```
Insertion in crawl-ref/source/dungeon.cc at line 4442 [6.3429798]
[2.2820]
[38.10438]
```
    bool acquire = false;
```

Insertion in crawl-ref/source/dungeon.cc at line 4460 [6.3429798]

[39.849]

[2.2855]

            break;
        case ISPEC_ACQUIREMENT:
            acquire = true;

Replacement in crawl-ref/source/dungeon.cc at line 4473 [6.3429798]

B:BD[38.10493] → [2.3046:3110]

∅:D[2.3110] → [23.11821:11941]

B:BD[23.11821] → [23.11821:11941]

    const int item_made = items( spec.allow_uniques, base_type,
                                 spec.sub_type, true, level, spec.race, 0,
                                 spec.ego );

[38.10493]

[40.14610]

    const int item_made =
        (acquire ?
         acquirement_create_item(base_type, spec.acquirement_source,
                                 true, where)
         : items( spec.allow_uniques, base_type,
                  spec.sub_type, true, level, spec.race, 0,
                  spec.ego ));

Insertion in crawl-ref/source/dungeon.cc at line 4485 [6.3429798]

[12.3683]

        // Remove unsuitable inscriptions such as {god gift}.
        item.inscription.clear();
        // And wipe item origin to remove "this is a god gift!" from there.
        origin_reset(item);

Insertion in crawl-ref/docs/level_design.txt at line 565 [42.350]

[41.5317]

[9.14357]

          * "acquire" requests the use of the acquirement code itself,
            ensuring that the player gets wearable armour, etc. You can
            also use acquire:<god> to request that the acquired item be
            treated as a god gift. Examples: "acquire any", "acquire armour",
            "acquire:sif_muna book", "acquire:trog weapon".

Allow vaults to request use of the acquirement code with "acquire <item_class>" or "acquire:<god> <item_class>" in item specs (due).

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/stuff.cc at line 1353 [6.224557]

Replacement in crawl-ref/source/mapdef.h at line 414 [8.591249]

Insertion in crawl-ref/source/mapdef.h at line 430 [8.591249]

Replacement in crawl-ref/source/mapdef.h at line 435 [8.591249]

Insertion in crawl-ref/source/mapdef.h at line 470 [8.591249]

Insertion in crawl-ref/source/mapdef.cc at line 37 [8.594797]

Insertion in crawl-ref/source/mapdef.cc at line 2827 [8.594797]

Insertion in crawl-ref/source/mapdef.cc at line 2856 [8.594797]

Insertion in crawl-ref/source/items.h at line 138 [6.2580284]