fiddlerwoaroof/crawl - Change 6FYEYTS5NRD5JAFIBSFHPBCQOKZBMWPWEI26USCI6OBUDGLJQKAAC

Fix TSO's artefact weapon blessing. A blessed weapon will now be marked

as a gift from him, gifts from him will always be of holy wrath and never poisoned, and make_item_randart() will now check for appropriateness of god gifts.

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

Created by dolorous on April 16, 2008

6FYEYTS5NRD5JAFIBSFHPBCQOKZBMWPWEI26USCI6OBUDGLJQKAAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 4073 [4.804403]

[3.2576]

[2.2562]

            {
                origin_acquired(you.inv[wpn], GOD_SHINING_ONE);

Insertion in crawl-ref/source/religion.cc at line 4076 [4.804403]
[2.2611]
[3.2632]
```
            }
```

Replacement in crawl-ref/source/randart.cc at line 62 [4.893152]

B:BD[5.3648] → [5.3648:3677]

             return (false);

[5.3648]

[5.3677]

             return (false); // goes against orcish theme

Insertion in crawl-ref/source/randart.cc at line 90 [4.893152]

[5.4586]

         break;
    case GOD_SHINING_ONE:
         if (brand == SPWPN_VENOM)
             return (false); // goes against anti-poison theme
         if (brand != SPWPN_HOLY_WRATH)
             return (false); // goes against holiness theme

Replacement in crawl-ref/source/randart.cc at line 127 [4.893152]

B:BD[4.903225] → [5.5348:5472]

static std::string replace_name_parts(const std::string name_in,
                                      const item_def item)

[4.903225]

[5.5472]

static god_type gift_from_god(const item_def item)

Deletion in crawl-ref/source/randart.cc at line 129 [4.893152]
B:BD[5.5474] → [5.5474:5506]
B:BD[5.5506] → [6.9409:9410]
```
    std::string name = name_in;
```
Insertion in crawl-ref/source/randart.cc at line 131 [4.893152]
[5.5570]
[5.5570]

Insertion in crawl-ref/source/randart.cc at line 138 [4.893152]

[5.5756]

[4.904871]


    return god_gift;
}
static std::string replace_name_parts(const std::string name_in,
                                      const item_def item)
{
    std::string name = name_in;
    god_type god_gift = gift_from_god(item);

Deletion in crawl-ref/source/randart.cc at line 1256 [4.893152]
B:BD[5.9880] → [2.2697:2724]
```
        std::string name;
```

Replacement in crawl-ref/source/randart.cc at line 1257 [4.893152]

B:BD[2.2725] → [2.2725:2928]

        // special case for blessed artefact weapons, since they're unique
        if (is_blessed(item))
            name = "of @player_name@";
        else
            name = getRandNameString(lookup);

[2.2725]

[6.10004]

        std::string name = getRandNameString(lookup);

Insertion in crawl-ref/source/randart.cc at line 1290 [4.893152]

[4.931305]

[7.4897]

    if (is_blessed(item) && god_gift)
    {
        result = item_base_name(item) + " ";
        std::string name = "of @player_name@";
        result += replace_name_parts(name, item);
    }

Insertion in crawl-ref/source/randart.cc at line 1696 [4.893152]
[3.2772]
[2.2971]
```
    god_type god_gift = gift_from_god(item);
```

Replacement in crawl-ref/source/randart.cc at line 1702 [4.893152]

B:BD[3.2924] → [2.3039:3075]

    while (randart_is_bad( item ));

[3.2924]

[8.5292]

    while (randart_is_bad(item)
        || (god_gift != GOD_NO_GOD && !god_fits_artefact(god_gift, item)));