fiddlerwoaroof/crawl - Change U3LUN66XOUGBCEA3E4BFKXBFTPGV5ZQRUTXUYRA73LF6YOHOQHEQC

Fix 2028969: excess comma in autoinscriptions of brand-only artefacts.

Also: Tweak inscription prompt.

Fix 2027600: Don't prompt when attacking with inappropriate weapon while confused. Fix 2027328: Throwing projectiles at enslaved monsters.

When saccing to Nemelex, count chunks and !blood like corpses (deck of summoning rather than wonder). Chunks used to be ignored completely but since they're just chopped up corpses and corpses are worth much more than 4 per piece I don't think it hurts. (Rotten chunks have a value of zero.) Also, decrease !blood price to that of !porridge and lower.

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

Created by j-p-e-g on July 27, 2008

U3LUN66XOUGBCEA3E4BFKXBFTPGV5ZQRUTXUYRA73LF6YOHOQHEQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/shopping.cc at line 1287 [7.759950]
B:BD[7.788139] → [8.314:342]
```
            case POT_BLOOD:
```
Replacement in crawl-ref/source/shopping.cc at line 1299 [7.759950]
B:BD[7.788486] → [8.343:382]
```
            case POT_BLOOD_COAGULATED:
```
[7.788486]
[7.788486]
```
            case POT_BLOOD:
```

Insertion in crawl-ref/source/shopping.cc at line 1303 [7.759950]

[7.788570]

            case POT_BLOOD_COAGULATED:
                valued += 5;
                break;

Insertion in crawl-ref/source/shopping.cc at line 1358 [7.759950]

[7.789668]

        case FOOD_CHUNK:
            if (food_is_rotten(item))
                break;

Deletion in crawl-ref/source/shopping.cc at line 1366 [7.759950]
B:BD[7.789778] → [7.789778:789803]
```
        case FOOD_CHUNK:
```
Replacement in crawl-ref/source/religion.cc at line 931 [7.804403]
B:BD[9.222] → [9.222:243]
```
    switch ( which )
```
[9.222]
[9.243]
```
    switch (which)
```

Replacement in crawl-ref/source/religion.cc at line 978 [7.804403]

B:BD[10.1227] → [10.1227:1346]

    float total = (float) (weights[0] + weights[1] + weights[2] + weights[3] +
                           weights[4]);

[10.1227]

[10.1346]

    float total = (float) (weights[0] + weights[1] + weights[2] + weights[3]
                           + weights[4]);

Replacement in crawl-ref/source/religion.cc at line 994 [7.804403]

B:BD[11.1169] → [12.172:230]

    if ( grid_destroys_items(grd[you.x_pos][you.y_pos]) )

[11.1169]

[12.230]

    if (grid_destroys_items(grd[you.x_pos][you.y_pos]))

Replacement in crawl-ref/source/religion.cc at line 2042 [7.804403]

∅:D[13.14217] → [14.6678:6789]

B:BD[15.927] → [14.6678:6789]

    if ( you.religion == GOD_NEMELEX_XOBEH && altar_god == GOD_NO_GOD
         && !_confirm_pray_sacrifice() )

[13.14217]

[16.504]

    if (you.religion == GOD_NEMELEX_XOBEH && altar_god == GOD_NO_GOD
        && !_confirm_pray_sacrifice())

Replacement in crawl-ref/source/religion.cc at line 5198 [7.804403]

B:BD[17.3280] → [17.3280:3455]

        if (item.base_type == OBJ_CORPSES && one_chance_in(2+you.piety/50)
            // Nemelex piety gain is fairly fast...at least
            // when you have low piety.

[17.3280]

[5.5611]

        // Nemelex piety gain is fairly fast...at least
        // when you have low piety.
        if (item.base_type == OBJ_CORPSES && one_chance_in(2 + you.piety/50)

Replacement in crawl-ref/source/religion.cc at line 5203 [7.804403]
B:BD[17.3518] → [17.3518:3555]
```
            if ( is_artefact(item) )
```
[17.3518]
[17.3555]
```
            if (is_artefact(item))
```

Replacement in crawl-ref/source/religion.cc at line 5215 [7.804403]

B:BD[17.3801] → [17.3801:4003]

        if (item.base_type == OBJ_FOOD && item.sub_type == FOOD_CHUNK)
            // No sacrifice value for chunks of flesh, since food
            // value goes towards decks of wonder.
            ;

[17.3801]

[17.4003]

        if (item.base_type == OBJ_FOOD && item.sub_type == FOOD_CHUNK
            || is_blood_potion(item))
        {
            // Count chunks and blood potions towards decks of Summoning.
            you.sacrifice_value[OBJ_CORPSES] += value;
        }

Replacement in crawl-ref/source/religion.cc at line 5373 [7.804403]
∅:D[18.3741] → [17.5704:5754]
B:BD[17.5704] → [17.5704:5754]
```
        for ( int j = 0; j < item.quantity; ++j )
```
[18.3741]
[7.880131]
```
        for (int j = 0; j < item.quantity; ++j)
```
Replacement in crawl-ref/source/religion.cc at line 5378 [7.804403]
B:BD[17.5877] → [17.5877:5915]
```
            if ( gain != PIETY_NONE )
```
[17.5877]
[7.880543]
```
            if (gain != PIETY_NONE)
```

Replacement in crawl-ref/source/religion.cc at line 5380 [7.804403]

B:BD[7.880557] → [17.5916:5973]

                if ( relative_piety_gain == PIETY_NONE )

[7.880557]

[17.5973]

                if (relative_piety_gain == PIETY_NONE)

Replacement in crawl-ref/source/randart.cc at line 172 [7.893152]

B:BD[19.3316] → [19.3316:3366]

                               "@player_name@'s "

[19.3316]

[19.3366]

                               "@player_name@"

Replacement in crawl-ref/source/randart.cc at line 180 [7.893152]

B:BD[19.3641] → [19.3641:3714]

            // simply overwrite the name with one of type "god's Favour"

[19.3641]

[19.3714]

            // Simply overwrite the name with one of type "God's Favour".

Replacement in crawl-ref/source/randart.cc at line 860 [7.893152]

B:BD[7.916234] → [7.916234:916362]

            || (atype != RING_PROTECTION_FROM_COLD
                && atype != RING_FIRE
                && atype != RING_ICE))

[7.916234]

[7.916362]

            || atype != RING_PROTECTION_FROM_COLD
               && atype != RING_FIRE
               && atype != RING_ICE)

Replacement in crawl-ref/source/randart.cc at line 864 [7.893152]

B:BD[7.916395] → [7.916395:916542]

            || (atype != ARM_DRAGON_ARMOUR
                && atype != ARM_ICE_DRAGON_ARMOUR
                && atype != ARM_GOLD_DRAGON_ARMOUR)))

[7.916395]

[7.916542]

            || atype != ARM_DRAGON_ARMOUR
               && atype != ARM_ICE_DRAGON_ARMOUR
               && atype != ARM_GOLD_DRAGON_ARMOUR))

Replacement in crawl-ref/source/item_use.cc at line 1913 [7.2781507]
B:BD[20.5471] → [3.2643:2699]
```
        if (pbolt.fr_count > 0 || pbolt.beam_cancelled)
```
[20.5471]
[20.5503]
```
        if (pbolt.beam_cancelled)
```
Replacement in crawl-ref/source/fight.cc at line 4078 [7.3140790]
B:BD[18.6712] → [18.6712:6749]
```
    if (!you.received_weapon_warning
```
[18.6712]
[4.7029]
```
    if (!you.received_weapon_warning && !you.duration[DUR_CONF]
```
Replacement in crawl-ref/source/describe.cc at line 318 [7.3736416]
B:BD[21.6400] → [21.6400:6429]
```
        if ( !type.empty() )
```
[21.6400]
[22.5220]
```
        if (!type.empty())
```

Replacement in crawl-ref/source/describe.cc at line 327 [7.3736416]

B:BD[23.5183] → [24.2932:2983]

∅:D[24.2983] → [23.5211:5260]

B:BD[23.5211] → [23.5211:5260]

            // ugly hack to remove the brackets...
            ego = ego.substr(2, ego.length()-3);

[23.5183]

[25.2828]

            // XXX: Ugly hack to remove the brackets...
            ego = ego.substr(2, ego.length() - 3);

Replacement in crawl-ref/source/describe.cc at line 330 [7.3736416]

∅:D[25.2829] → [24.2997:3057]

B:BD[24.2997] → [24.2997:3057]

B:BD[24.3057] → [26.8199:8262]

∅:D[26.8262] → [24.3122:3274]

B:BD[24.3122] → [24.3122:3274]

            // and another one for adding a comma if needed
            for ( unsigned i = 0; i < ARRAYSZ(propanns); ++i )
                 if (known_proprt(propanns[i].prop))
                 {
                     ego += ",";
                     break;
                 }

[25.2829]

[25.2830]

            // ... and another one for adding a comma if needed.
            for (unsigned i = 0; i < ARRAYSZ(propanns); ++i)
                if (known_proprt(propanns[i].prop)
                    && propanns[i].prop != RAP_BRAND)
                {
                    ego += ",";
                    break;
                }

Replacement in crawl-ref/source/describe.cc at line 343 [7.3736416]
B:BD[22.5266] → [26.8263:8318]
```
    for ( unsigned i = 0; i < ARRAYSZ(propanns); ++i )
```
[22.5266]
[27.5894]
```
    for (unsigned i = 0; i < ARRAYSZ(propanns); ++i)
```

Replacement in crawl-ref/source/describe.cc at line 2093 [7.3736416]

B:BD[28.4248] → [6.3379:3488]

        prompt = (is_inscribed ? "Add to inscription? "
                               : "Inscribe item? ");

[28.4248]

[6.3488]

        prompt = "Press (i) to ";
        prompt += (is_inscribed ? "add to inscription"
                                : "inscribe");

Replacement in crawl-ref/source/describe.cc at line 2099 [7.3736416]

B:BD[28.4325] → [6.3537:3577]

            prompt += "(You may also ";

[28.4325]

[6.3577]

            if (!need_autoinscribe || !is_inscribed)
                prompt += " or ";
            else
                prompt += ", ";

Replacement in crawl-ref/source/describe.cc at line 2106 [7.3736416]

B:BD[6.3626] → [6.3626:3670]

                prompt += "(a)utoinscribe";

[6.3626]

[6.3670]

                prompt += "(a) to autoinscribe";

Replacement in crawl-ref/source/describe.cc at line 2111 [7.3736416]

B:BD[28.4395] → [6.3758:3827]

                prompt += "(c)lear it";
            prompt += ".) ";

[28.4395]

[28.4429]

                prompt += "(c) to clear it";

Insertion in crawl-ref/source/describe.cc at line 2113 [7.3736416]
[28.4439]
[28.4532]
```
        prompt += ". ";
```

Replacement in crawl-ref/source/describe.cc at line 2906 [7.3736416]

B:BD[29.6675] → [29.6675:6740]

                         "  decks of Summoning   -- corpses" EOL

[29.6675]

[2.2760]

                         "  decks of Summoning   -- corpses, chunks, blood" EOL

Fix 2028969: excess comma in autoinscriptions of brand-only artefacts.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/shopping.cc at line 1287 [7.759950]

Replacement in crawl-ref/source/shopping.cc at line 1299 [7.759950]

Insertion in crawl-ref/source/shopping.cc at line 1303 [7.759950]

Insertion in crawl-ref/source/shopping.cc at line 1358 [7.759950]

Deletion in crawl-ref/source/shopping.cc at line 1366 [7.759950]

Replacement in crawl-ref/source/religion.cc at line 931 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 978 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 994 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 2042 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 5198 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 5203 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 5215 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 5373 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 5378 [7.804403]