fiddlerwoaroof/crawl - Change FN7DJD6MTAC4RM4CPGE5ZNEEW2I2CS7ABVWBOHOOEKWQQJQ2HPFAC

Prompt before blessing the player's wielded weapon. Since TSO uses the

altar for evil item sacrifices as well as weapon blessings, this allows the player to do the latter without doing the former.

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

Created by dolorous on July 11, 2009

FN7DJD6MTAC4RM4CPGE5ZNEEW2I2CS7ABVWBOHOOEKWQQJQ2HPFAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 6086 [6.804403]
B:BD[4.193471] → [5.2595:2628]
B:BD[5.2628] → [7.2761:2813]
∅:D[8.2597] → [4.193694:193764]
∅:D[9.2633] → [4.193694:193764]
∅:D[10.2801] → [4.193694:193764]
∅:D[7.2813] → [4.193694:193764]
B:BD[4.193694] → [4.193694:193764]
```
    // Only bless melee weapons.
    if (!is_artefact(wpn) && !is_range_weapon(wpn))
    {
        you.duration[DUR_WEAPON_BRAND] = 0;     // just in case
```
[4.193471]
[4.193764]
```
    // Only bless non-artefact melee weapons.
    if (is_artefact(wpn) || is_range_weapon(wpn))
        return (false);
```

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

B:BD[4.193765] → [7.2814:2940]

        set_equip_desc(wpn, ISFLAG_GLOWING);
        set_item_ego_type(wpn, OBJ_WEAPONS, brand);
        wpn.colour = colour;

[4.193765]

[6.879476]

    if (!yesno("Do you wish to have your weapon blessed?", true, 'n'))
        return (false);
    you.duration[DUR_WEAPON_BRAND] = 0;     // just in case

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

B:BD[6.879477] → [7.2941:2990]

        const bool is_cursed = item_cursed(wpn);

[6.879477]

[11.2528]

    set_equip_desc(wpn, ISFLAG_GLOWING);
    set_item_ego_type(wpn, OBJ_WEAPONS, brand);
    wpn.colour = colour;
    const bool is_cursed = item_cursed(wpn);
    enchant_weapon(ENCHANT_TO_HIT, true, wpn);

Insertion in crawl-ref/source/religion.cc at line 6103 [6.804403]
[11.2529]
[7.2991]
```
    if (coinflip())
```

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

B:BD[12.2529] → [12.2529:2553]

B:BD[12.2553] → [7.3043:3098]

        if (coinflip())
            enchant_weapon(ENCHANT_TO_HIT, true, wpn);

[12.2529]

[12.2619]

    enchant_weapon(ENCHANT_TO_DAM, true, wpn);

Insertion in crawl-ref/source/religion.cc at line 6108 [6.804403]
[12.2620]
[7.3099]
```
    if (coinflip())
```

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

B:BD[6.879478] → [12.2621:2645]

B:BD[12.2645] → [7.3151:3206]

        if (coinflip())
            enchant_weapon(ENCHANT_TO_DAM, true, wpn);

[6.879478]

[7.3206]

    if (is_cursed)
        do_uncurse_item(wpn);

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

B:BD[7.3207] → [7.3207:3264]

        if (is_cursed)
            do_uncurse_item(wpn);

[7.3207]

[12.2711]

    if (god == GOD_SHINING_ONE)
    {
        convert2good(wpn);

Replacement in crawl-ref/source/religion.cc at line 6118 [6.804403]
B:BD[12.2712] → [7.3265:3301]
```
        if (god == GOD_SHINING_ONE)
```
[12.2712]
[13.2523]
```
        if (is_blessed_blade_convertible(wpn))
```

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

B:BD[13.2533] → [7.3302:3333]

            convert2good(wpn);

[13.2533]

[14.2686]

            origin_acquired(wpn, GOD_SHINING_ONE);
            make_item_blessed_blade(wpn);
        }

Replacement in crawl-ref/source/religion.cc at line 6124 [6.804403]
B:BD[14.2687] → [7.3334:3385]
∅:D[15.2645] → [16.2523:2537]
∅:D[9.2678] → [16.2523:2537]
∅:D[17.2757] → [16.2523:2537]
∅:D[10.3269] → [16.2523:2537]
∅:D[7.3385] → [16.2523:2537]
B:BD[13.2576] → [16.2523:2537]
B:BD[16.2537] → [7.3386:3487]
∅:D[18.2620] → [16.2602:2616]
∅:D[10.3373] → [16.2602:2616]
∅:D[7.3487] → [16.2602:2616]
B:BD[19.2611] → [16.2602:2616]
```
            if (is_blessed_blade_convertible(wpn))
            {
                origin_acquired(wpn, GOD_SHINING_ONE);
                make_item_blessed_blade(wpn);
            }
```
[14.2687]
[2.2523]
```
        burden_change();
    }
```
Replacement in crawl-ref/source/religion.cc at line 6127 [6.804403]
B:BD[2.2524] → [2.2524:2553]
∅:D[2.2553] → [13.2632:2642]
∅:D[19.2611] → [13.2632:2642]
∅:D[16.2616] → [13.2632:2642]
B:BD[13.2632] → [13.2632:2642]
```
            burden_change();
        }
```
[2.2524]
[13.2642]
```
    you.wield_change = true;
    you.num_gifts[god]++;
    take_note(Note(NOTE_GOD_GIFT, you.religion));
```
Replacement in crawl-ref/source/religion.cc at line 6131 [6.804403]
∅:D[13.2643] → [4.194061:194124]
∅:D[14.2687] → [4.194061:194124]
B:BD[6.879478] → [4.194061:194124]
B:BD[4.194124] → [20.3716:3770]
```
        you.wield_change = true;
        you.num_gifts[god]++;
        take_note(Note(NOTE_GOD_GIFT, you.religion));
```
[13.2643]
[4.194171]
```
    you.flash_colour = colour;
    viewwindow(true, false);
```

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

B:BD[4.194172] → [4.194172:194207]

B:BD[4.194207] → [21.7060:7093]

        you.flash_colour = colour;
        viewwindow(true, false);

[4.194172]

[4.194242]

    mpr("Your weapon shines brightly!", MSGCH_GOD);
    simple_god_message(" booms: Use this gift wisely!");

Replacement in crawl-ref/source/religion.cc at line 6137 [6.804403]
B:BD[4.194243] → [3.3003:3059]
∅:D[3.3059] → [7.3545:3606]
B:BD[7.3545] → [7.3545:3606]
∅:D[7.3606] → [4.194365:194366]
B:BD[4.194365] → [4.194365:194366]
B:BD[4.194366] → [7.3607:3643]
∅:D[22.2555] → [23.3581:3591]
∅:D[19.2650] → [23.3581:3591]
∅:D[7.3643] → [23.3581:3591]
B:BD[23.3581] → [23.3581:3591]
B:BD[23.3591] → [24.2843:2903]
```
        mpr("Your weapon shines brightly!", MSGCH_GOD);
        simple_god_message(" booms: Use this gift wisely!");
        if (god == GOD_SHINING_ONE)
        {
            holy_word(100, HOLY_WORD_TSO, you.pos(), true);
```
[4.194243]
[21.7094]
```
    if (god == GOD_SHINING_ONE)
    {
        holy_word(100, HOLY_WORD_TSO, you.pos(), true);
```
Replacement in crawl-ref/source/religion.cc at line 6141 [6.804403]
B:BD[21.7111] → [21.7111:7136]
```
            delay(1000);
```
[21.7111]
[21.7136]
```
        delay(1000);
```

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

B:BD[25.2528] → [5.2629:2677]

B:BD[5.2677] → [26.4310:4383]

∅:D[26.4383] → [10.3449:3491]

B:BD[10.3449] → [10.3449:3491]

B:BD[10.3491] → [26.4384:4446]

∅:D[10.3547] → [23.3901:3911]

∅:D[26.4446] → [23.3901:3911]

B:BD[23.3901] → [23.3901:3911]

B:BD[23.3911] → [27.3645:3646]

B:BD[4.194495] → [4.194495:194518]

            // Un-bloodify surrounding squares.
            for (radius_iterator ri(you.pos(), 3, true, true); ri; ++ri)
                if (is_bloodcovered(*ri))
                    env.map(*ri).property &= ~(FPROP_BLOODY);
        }
        return (true);

[25.2528]

[4.194518]

        // Un-bloodify surrounding squares.
        for (radius_iterator ri(you.pos(), 3, true, true); ri; ++ri)
            if (is_bloodcovered(*ri))
                env.map(*ri).property &= ~(FPROP_BLOODY);

Replacement in crawl-ref/source/religion.cc at line 6150 [6.804403]
B:BD[4.194525] → [4.194525:194545]
```
    return (false);
```
[4.194525]
[28.896]
```
    return (true);
```

Prompt before blessing the player's wielded weapon. Since TSO uses the

Dependencies

In channels

Change contents

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

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

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

Insertion in crawl-ref/source/religion.cc at line 6103 [6.804403]

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

Insertion in crawl-ref/source/religion.cc at line 6108 [6.804403]

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

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

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

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

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

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

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

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

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

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

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

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