fiddlerwoaroof/crawl - Change JJVROJMJVKS7VN5HJNB4ZNCG7Y6EMHJQZR3MDN2VZCFTZC73HOZQC

Add another optional parameter to items() of makeitem.{cc,h}, the agent

parameter. If not -1 then it will be used to set the acquirement agent of the item. This is done in items() so that make_item_randart() can use it if it's called from items(). Before this _god_fits_artefact() in randart.cc was only being called for choosing an appropriate god for random artifact names, and not to check the appropriateness of the randart proeprties chosen for randart god gifts.

Changed _god_fits_artefact() so that if a bug leads a god to gifting an item with an inapropriate base_type or sub_type that it will give an assertion or error message instead of causing make_item_randart() to go into an infinite loop.

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

Created by zelgadis on December 3, 2008

JJVROJMJVKS7VN5HJNB4ZNCG7Y6EMHJQZR3MDN2VZCFTZC73HOZQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 248 [5.3]
[5.4944]
[5.4944]
```
    god_acting gdact(GOD_XOM);
```

Replacement in crawl-ref/source/xom.cc at line 251 [5.3]

B:BD[5.4968] → [5.4968:5040]

        items(true, base, subtype, true, power, MAKE_ITEM_RANDOM_RACE);

[5.4968]

[6.168]

        items(true, base, subtype, true, power, MAKE_ITEM_RANDOM_RACE,
              0, 0, GOD_XOM);

Deletion in crawl-ref/source/xom.cc at line 262 [5.3]
∅:D[4.879] → [7.36:67]
B:BD[5.5159] → [7.36:67]
∅:D[7.67] → [8.290:291]
B:BD[8.290] → [8.290:291]
```
    god_acting gdact(GOD_XOM);
```
Deletion in crawl-ref/source/xom.cc at line 266 [5.3]
∅:D[9.23] → [5.5261:5313]
B:BD[5.5261] → [5.5261:5313]
```
    origin_acquired(mitm[thing_created], GOD_XOM);
```

Replacement in crawl-ref/source/religion.cc at line 1140 [12.804403]

∅:D[10.2644] → [11.2327:2396]

B:BD[11.2327] → [11.2327:2396]

                                   true, 1, MAKE_ITEM_RANDOM_RACE );

[10.2644]

[11.2396]

                                   true, 1, MAKE_ITEM_RANDOM_RACE,
                                   0, 0, GOD_NEMELEX_XOBEH );

Deletion in crawl-ref/source/religion.cc at line 1178 [12.804403]
∅:D[13.16843] → [11.3916:3965]
B:BD[11.3916] → [11.3916:3965]
```
            origin_acquired(deck, you.religion);
```

Replacement in crawl-ref/source/religion.cc at line 1975 [12.804403]

B:BD[5.29675] → [5.29675:29749]

                                                  MAKE_ITEM_RANDOM_RACE);

[5.29675]

[14.179896]

                                                  MAKE_ITEM_RANDOM_RACE,
                                                  0, 0, you.religion);

Deletion in crawl-ref/source/religion.cc at line 1986 [12.804403]
∅:D[15.2782] → [14.180197:180277]
B:BD[14.180197] → [14.180197:180277]
```
                            origin_acquired(mitm[thing_created], you.religion);
```

Replacement in crawl-ref/source/religion.cc at line 4202 [12.804403]

B:BD[16.2723] → [2.2589:2666]

                             am_orc ? MAKE_ITEM_NO_RACE : MAKE_ITEM_ORCISH);

[16.2723]

[12.867764]

                             am_orc ? MAKE_ITEM_NO_RACE : MAKE_ITEM_ORCISH,
                             0, 0, GOD_BEOGH);

Replacement in crawl-ref/source/randart.cc at line 43 [12.893152]

B:BD[17.3106] → [18.2761:2840]

static bool _god_fits_artefact(const god_type which_god, const item_def &item)

[17.3106]

[17.3184]

static bool _god_fits_artefact(const god_type which_god, const item_def &item,
                               bool name_check_only = false)

Insertion in crawl-ref/source/randart.cc at line 47 [12.893152]

[17.3219]

        return (false);
    // First check the item's base_type and sub_type, then check the
    // item's brand and other randart properties.
    bool type_bad = false;
    switch (which_god)
    {
    case GOD_ELYVILON: // peaceful healer god, no weapons, no berserking
        if (item.base_type == OBJ_WEAPONS)
            type_bad = true;
        if (item.base_type == OBJ_JEWELLERY && item.sub_type == AMU_RAGE)
            type_bad = true;
        break;
    case GOD_OKAWARU: // precision fighter
        if (item.base_type == OBJ_JEWELLERY && item.sub_type == AMU_INACCURACY)
            type_bad = true;
        break;
    case GOD_ZIN:
        if (item.base_type == OBJ_JEWELLERY && item.sub_type == RING_HUNGER)
            type_bad = true;
        break;
    case GOD_SIF_MUNA:
    case GOD_KIKUBAAQUDGHA:
    case GOD_VEHUMET:
        // The magic gods: no weapons, no preventing spellcasting.
        if (item.base_type == OBJ_WEAPONS)
            type_bad = true;
        break;
    case GOD_TROG: // hates anything enhancing magic
        if (item.base_type == OBJ_JEWELLERY && (item.sub_type == RING_WIZARDRY
            || item.sub_type == RING_FIRE || item.sub_type == RING_ICE
            || item.sub_type == RING_MAGICAL_POWER))
        {
            type_bad = true;
        }
        break;
    default:
        break;
    }
    if (type_bad && !name_check_only)
    {
        ASSERT(!"God attempting to gift invalid type of item.");
        mprf(MSGCH_ERROR, "%s attempting to gift invalid type of item.");
        // Prevent infinite loop in make_item_randart()
        return (true);
    }
    if (type_bad)

Deletion in crawl-ref/source/randart.cc at line 124 [12.893152]
B:BD[17.3767] → [19.2639:2710]
∅:D[19.2710] → [20.9403:9404]
B:BD[17.3840] → [20.9403:9404]
B:BD[20.9404] → [19.2711:2813]
∅:D[19.2813] → [17.3958:3959]
B:BD[17.3958] → [17.3958:3959]
```
        if (item.base_type == OBJ_WEAPONS)
            return (false);
        if (item.base_type == OBJ_JEWELLERY && item.sub_type == AMU_RAGE)
            return (false);
```

Deletion in crawl-ref/source/randart.cc at line 129 [12.893152]

B:BD[19.2972] → [19.2972:2987]

∅:D[19.2987] → [17.4138:4182]

B:BD[17.4138] → [17.4138:4182]

B:BD[17.4182] → [19.2988:3096]

        break;
    case GOD_OKAWARU: // precision fighter
        if (item.base_type == OBJ_JEWELLERY && item.sub_type == AMU_INACCURACY)
            return (false);

Deletion in crawl-ref/source/randart.cc at line 132 [12.893152]
B:BD[17.4327] → [19.3112:3244]
∅:D[19.3244] → [17.4461:4462]
B:BD[17.4461] → [17.4461:4462]
```
        if (item.base_type == OBJ_JEWELLERY && item.sub_type == RING_HUNGER)
            return (false); // goes against food theme
```

Deletion in crawl-ref/source/randart.cc at line 155 [12.893152]

B:BD[21.3152] → [21.3152:3219]

∅:D[21.3219] → [22.5621:5693]

B:BD[22.5621] → [22.5621:5693]

        // The magic gods: no weapons, no preventing spellcasting.
        if (item.base_type == OBJ_WEAPONS)
            return (false);

Deletion in crawl-ref/source/randart.cc at line 160 [12.893152]

B:BD[17.4843] → [19.5119:5370]

        if (item.base_type == OBJ_JEWELLERY && (item.sub_type == RING_WIZARDRY
            || item.sub_type == RING_FIRE || item.sub_type == RING_ICE
            || item.sub_type == RING_MAGICAL_POWER))
        {
            return (false);
        }

Replacement in crawl-ref/source/randart.cc at line 277 [12.893152]

B:BD[18.3925] → [18.3925:3983]

            while (!_god_fits_artefact(which_god, item));

[18.3925]

[17.7977]

            while (!_god_fits_artefact(which_god, item), true);

Replacement in crawl-ref/source/makeitem.h at line 26 [23.516]

B:BD[23.701] → [24.8049:8103]

           unsigned mapmask = 0, int force_ego = 0 );

[23.701]

[23.768]

           unsigned mapmask = 0, int force_ego = 0, int agent = -1 );

Replacement in crawl-ref/source/makeitem.cc at line 2651 [23.927]

B:BD[24.9814] → [24.9814:9871]

           int force_ego)           // desired ego/brand

[24.9814]

[25.53941]

           int force_ego,           // desired ego/brand
           int agent)               // acquirement agent, if not -1

Insertion in crawl-ref/source/makeitem.cc at line 2670 [23.927]

[25.54181]

[23.94172]


    // make_item_randart() might do things differently based upon the
    // acquirement agent, especially for god gifts.
    if (agent != -1)
        origin_acquired(item, agent);

Replacement in crawl-ref/source/effects.cc at line 1463 [12.3382105]

∅:D[26.3698] → [27.7152:7216]

B:BD[28.4426] → [27.7152:7216]

        item_was_destroyed(mitm[igrd(you.pos())], NON_MONSTER);

[26.3698]

[29.1321]

        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());
            }
        }

Replacement in crawl-ref/source/effects.cc at line 1491 [12.3382105]

B:BD[30.2841] → [2.3516:3592]

                                   MAKE_GOOD_ITEM, MAKE_ITEM_RANDOM_RACE );

[30.2841]

[31.16427]

                                   MAKE_GOOD_ITEM, MAKE_ITEM_RANDOM_RACE,
                                   0, 0, agent );

Deletion in crawl-ref/source/effects.cc at line 1710 [12.3382105]
B:BD[32.6419] → [3.2768:2815]
```
                origin_acquired(thing, agent);
```
Deletion in crawl-ref/source/effects.cc at line 1727 [12.3382105]
∅:D[29.1562] → [33.450168:450225]
B:BD[12.3425046] → [33.450168:450225]
```
            origin_acquired(mitm[thing_created], agent);
```

Add another optional parameter to items() of makeitem.{cc,h}, the agent

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/xom.cc at line 248 [5.3]

Replacement in crawl-ref/source/xom.cc at line 251 [5.3]

Deletion in crawl-ref/source/xom.cc at line 262 [5.3]

Deletion in crawl-ref/source/xom.cc at line 266 [5.3]