fiddlerwoaroof/crawl - Change P2YNOE2TUTZFAOBTHJOIVD6TCV7J7D2UKUX67LHZUL6QY44ZMENQC

Several bugfixes.

In no particular order:

Beogh shouldn't care about you attacking non-orc friends.
Mummies don't get "Food" listed as ability costs.
corrected order of invis flickering
modified (and tidied) you_can_wear checks and output
added ']' command to list currently worn equipment (inv)
wielded cursed items can no longer be fired
Wanderers no longer get inappropriate armour
Fixed "bad item" message for confirm-inscribed items
copied "Discharge" to "Static Discharge" in spells.txt (Maybe we should remove the first, but I was unsure about that, so I left it for now.)

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

Created by j-p-e-g on August 30, 2007

P2YNOE2TUTZFAOBTHJOIVD6TCV7J7D2UKUX67LHZUL6QY44ZMENQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.cc at line 1095 [7.569242]

B:BD[7.597658] → [8.35:73]

        if (mons_friendly( monster ))

[7.597658]

[8.73]

        if (mons_friendly( monster )
            && (you.religion != GOD_BEOGH // Beogh only cares about orcs
                || mons_species(monster->type) == MONS_ORC))
        {

Insertion in crawl-ref/source/spells2.cc at line 1100 [7.569242]
[8.126]
[8.126]
```
        }
```
Replacement in crawl-ref/source/player.h at line 306 [7.945993]
B:BD[7.958773] → [9.169:198]
```
bool you_can_wear( int eq );
```
[7.958773]
[3.1059]
```
bool you_can_wear( int eq, bool special_armour = false );
```

Replacement in crawl-ref/source/player.cc at line 436 [7.962854]

B:BD[9.502] → [9.502:604]

// Centaurs and Naga are ignored for now, seeing how
// Boots are changed to Barding in the % screen.

[9.502]

[9.604]

// If special_armour is set to true, special cases
// such as bardings, light armour and caps are
// considered. Otherwise these simply return false.

Replacement in crawl-ref/source/player.cc at line 440 [7.962854]
B:BD[9.657] → [9.657:683]
```
bool you_can_wear(int eq)
```
[9.657]
[9.683]
```
bool you_can_wear(int eq, bool special_armour)
```

Replacement in crawl-ref/source/player.cc at line 456 [7.962854]

B:BD[9.1117] → [9.1117:1222]

//   if (eq == EQ_BOOTS && (you.species == SP_NAGA || you.species == SP_CENTAUR))
//       return false;

[9.1117]

[9.1222]

   // anyone can wear caps/hats and robes
   if (special_armour && (eq == EQ_HELMET || eq == EQ_BODY_ARMOUR))
       return true;
   if (eq == EQ_BOOTS && (you.species == SP_NAGA || you.species == SP_CENTAUR))
       return (special_armour);

Insertion in crawl-ref/source/player.cc at line 474 [7.962854]

[9.1549]


   if (you.species == SP_MINOTAUR && eq == EQ_HELMET)
       return false;

Replacement in crawl-ref/source/player.cc at line 5257 [7.962854]

B:BD[10.6802] → [10.6802:6835]

        if (mons_friendly(mons))

[10.6802]

[10.6835]

        if (mons_friendly(mons)
            && (you.religion != GOD_BEOGH // Beogh only cares about orcs
                || ::mons_species(mons->type) == MONS_ORC))
        {

Insertion in crawl-ref/source/player.cc at line 5262 [7.962854]
[10.6886]
[10.6886]
```
        }
```
Insertion in crawl-ref/source/output.cc at line 26 [7.1088282]
[11.51906]
[12.59]
```
#include "describe.h"
```
Insertion in crawl-ref/source/output.cc at line 31 [7.1088282]
[7.1088734]
[11.51907]
```
#include "items.h"
```
Replacement in crawl-ref/source/output.cc at line 642 [7.1088282]
B:BD[13.206065] → [13.206065:206092]
```
    if (equip == EQ_RINGS)
```
[13.206065]
[13.206092]
```
    if (equip == EQ_RINGS || equip == EQ_LEFT_RING || equip == EQ_RIGHT_RING)
```

Insertion in crawl-ref/source/output.cc at line 644 [7.1088282]

[13.206115]


    if (equip == EQ_BOOTS &&
           (you.species == SP_CENTAUR || you.species == SP_NAGA))
        return "Barding";

Deletion in crawl-ref/source/output.cc at line 854 [7.1088282]

B:BD[13.210604] → [13.210604:210702]

B:BD[13.210702] → [14.360202:360321]

∅:D[14.360321] → [13.210845:210879]

B:BD[13.210845] → [13.210845:210879]

            if (eqslot == EQ_LEFT_RING || eqslot == EQ_RIGHT_RING)
                slot = "Ring";
            else if (eqslot == EQ_BOOTS &&
                     (you.species == SP_CENTAUR || you.species == SP_NAGA))
                slot = "Barding";

Deletion in crawl-ref/source/output.cc at line 1250 [7.1088282]

B:BD[11.60788] → [11.60788:61039]

            if (eqslot == EQ_LEFT_RING || eqslot == EQ_RIGHT_RING)
                slot = "Ring";
            else if (eqslot == EQ_BOOTS &&
                     (you.species == SP_CENTAUR || you.species == SP_NAGA))
                slot = "Barding";

Replacement in crawl-ref/source/output.cc at line 1276 [7.1088282]

B:BD[11.61972] → [9.1597:1649]

                else if (!you_can_wear(e_order[i]))

[11.61972]

[9.1649]

                else if (!you_can_wear(e_order[i], true))

Replacement in crawl-ref/source/output.cc at line 1278 [7.1088282]

B:BD[9.1667] → [9.1667:1770]

B:BD[9.1770] → [5.11976:12516]

∅:D[5.12516] → [9.1906:2025]

B:BD[9.1906] → [9.1906:2025]

B:BD[9.2025] → [3.2513:2597]

∅:D[3.2597] → [9.2110:2132]

B:BD[9.2110] → [9.2110:2132]

                    if (e_order[i] == EQ_BODY_ARMOUR || e_order[i] == EQ_HELMET)
                    {
                        if (!you_tran_can_wear(e_order[i]))
                        {
                            snprintf(buf, sizeof buf, "%-7s: "
                                     "<darkgray>(currently unavailable)</darkgray>",
                                     slot);
                        }
                        else
                        {   snprintf(buf, sizeof buf,
                                     "%-7s: <lightgray>(ill-fitting)</lightgray>",
                                     slot);
                        }
                    }
                    else
                    {
                        snprintf(buf, sizeof buf,
                                 "%-7s: <darkgray>(unavailable)</darkgray>", slot);
                    }

[9.1667]

[9.2132]

                    snprintf(buf, sizeof buf,
                             "%-7s: <darkgray>(unavailable)</darkgray>", slot);

Insertion in crawl-ref/source/output.cc at line 1285 [7.1088282]

[3.2805]

                             slot);
                }
                else if (!you_can_wear(e_order[i]))
                {
                    snprintf(buf, sizeof buf,
                             "%-7s: <lightgray>(ill-fitting)</lightgray>",

Deletion in crawl-ref/source/newgame.cc at line 2430 [7.1132300]

B:BD[7.1191298] → [7.1191298:1191407]

        you.inv[ slot ].sub_type = ARM_CLOAK;
        you.equip[EQ_CLOAK] = slot;
        break;
    case 1:

Replacement in crawl-ref/source/newgame.cc at line 2432 [7.1132300]

B:BD[7.1191489] → [7.1191489:1191504]

        break;

[7.1191489]

[7.1191504]

        if (you_can_wear(EQ_BOOTS))
            break;
        // else fall through
    case 1:
        you.inv[ slot ].sub_type = ARM_HELMET;
        you.equip[EQ_HELMET] = slot;
        if (you_can_wear(EQ_HELMET))
            break;
        // else fall through

Replacement in crawl-ref/source/newgame.cc at line 2444 [7.1132300]

B:BD[7.1191600] → [7.1191600:1191711]

        break;
    case 3:
        you.inv[ slot ].sub_type = ARM_HELMET;
        you.equip[EQ_HELMET] = slot;

[7.1191600]

[7.1191711]

        if (you_can_wear(EQ_GLOVES))
            break;
        // else fall through
    case 3: // anyone can wear this
        you.inv[ slot ].sub_type = ARM_CLOAK;
        you.equip[EQ_CLOAK] = slot;

Insertion in crawl-ref/source/newgame.cc at line 2452 [7.1132300]
[7.1191732]
[7.1191732]
```
    
```

Insertion in crawl-ref/source/item_use.cc at line 1177 [7.2781507]

[2.713]

            && !(you.equip[EQ_WEAPON] == item.link && item_cursed(item))

Insertion in crawl-ref/source/invent.cc at line 636 [7.2920632]

[13.379724]

    case OSEL_EQUIP:
        for (int eq = 0; eq < NUM_EQUIP; eq++)
        {
             if (you.equip[eq] == i.link)
                 return (true);
        }
        // fall through

Replacement in crawl-ref/source/invent.cc at line 923 [7.2920632]

B:BD[15.1073] → [15.1073:1120]

    if ( has_warning_inscription(item, oper) )

[15.1005]

[15.1120]

    if (is_valid_item( item ) && has_warning_inscription(item, oper) )

Insertion in crawl-ref/source/enum.h at line 622 [7.3287960]
[7.3304007]
[7.3304007]
```
    CMD_LIST_EQUIPMENT,
```
Replacement in crawl-ref/source/enum.h at line 2798 [7.3287960]
B:BD[16.462] → [16.462:484]
```
    OSEL_UNIDENT = -3
```
[16.462]
[13.449505]
```
    OSEL_UNIDENT = -3,
    OSEL_EQUIP   = -4
```

Insertion in crawl-ref/source/dat/descript/spells.txt at line 569 [4.2853]

[4.24093]

%%%%
Static Discharge
This spell releases electric charges against those next to the caster. These may arc to adjacent monsters (or even the caster) before they eventually ground out.

Replacement in crawl-ref/source/command.cc at line 377 [7.4082507]

B:BD[17.25227] → [6.727:1095]


        if (!you_can_wear(i))
        {
            if (i == EQ_BODY_ARMOUR || i == EQ_HELMET)
            {
                if (!you_tran_can_wear(i))
                    estr << "    (currently unavailable)";
                else
                    estr << "    (ill-fitting)";
            }
            else
                estr << "    (unavailable)";
        }

[17.25227]

[6.1095]

        else if (!you_can_wear(i,true))
            estr << "    (unavailable)";

Insertion in crawl-ref/source/command.cc at line 381 [7.4082507]

[6.1186]

[7.4092558]

        else if (!you_can_wear(i))
            estr << "    (ill-fitting)";

Replacement in crawl-ref/source/command.cc at line 457 [7.4082507]

B:BD[7.4094432] → [7.4094432:4094473]

        if (is_valid_item( you.inv[i] ))

[7.4094432]

[17.26254]

        if (is_valid_item( you.inv[i]) &&
               (you.inv[i].base_type == OBJ_WEAPONS
                || you.inv[i].base_type == OBJ_STAVES
                || you.inv[i].base_type == OBJ_MISCELLANY))
        {

Replacement in crawl-ref/source/command.cc at line 463 [7.4082507]

B:BD[17.26316] → [6.1382:1484]

        else if (!you_tran_can_wear(EQ_WEAPON))
            wstring += "    (currently unavailable)";

[17.26316]

[7.4094629]

Replacement in crawl-ref/source/beam.cc at line 3528 [7.4128068]

B:BD[14.1247908] → [14.1247908:1247950]

                if (mons_friendly( mon ))

[14.1247908]

[14.1247950]

                if (mons_friendly( mon )
                     && (you.religion != GOD_BEOGH // Beogh only cares about orcs
                         || mons_species(mon->type) == MONS_ORC))
                {

Insertion in crawl-ref/source/beam.cc at line 3533 [7.4128068]
[14.1248011]
[14.1248011]
```
                }
```
Deletion in crawl-ref/source/acr.cc at line 1579 [7.4397395]
B:BD[7.4436703] → [14.1266494:1266509]
∅:D[14.1266509] → [7.4436719:4436720]
B:BD[7.4436719] → [7.4436719:4436720]
B:BD[7.4436720] → [14.1266510:1266563]
```
        break;
    case CMD_INSCRIBE_ITEM:
        inscribe_item();
```
Replacement in crawl-ref/source/acr.cc at line 1584 [7.4397395]
∅:D[14.1266603] → [7.4436799:4436800]
B:BD[7.4436799] → [7.4436799:4436800]
[14.1266603]
[7.4436814]
```
        
```

Insertion in crawl-ref/source/acr.cc at line 1589 [7.4397395]

[7.4436886]

    case CMD_LIST_EQUIPMENT:
        get_invent( OSEL_EQUIP );
        break;
    case CMD_INSCRIBE_ITEM:
        inscribe_item();
        break;

Replacement in crawl-ref/source/acr.cc at line 1895 [7.4397395]

B:BD[18.4871] → [18.4871:5033]

    decrement_a_duration(DUR_INVIS, "You flicker for a moment.",
                         6, coinflip(),
                         "You flicker back into view.");

[18.4871]

[19.4876]

    decrement_a_duration(DUR_INVIS, "You flicker back into view.",
                         6, coinflip(), "You flicker for a moment.");

Replacement in crawl-ref/source/acr.cc at line 2535 [7.4397395]
B:BD[14.1275178] → [14.1275178:1275216]
```
    case ']': return CMD_LIST_ARMOUR;
```
[14.1275178]
[14.1275216]
```
    case ']': return CMD_LIST_EQUIPMENT;
```
Replacement in crawl-ref/source/abl-show.cc at line 361 [7.4494389]
B:BD[7.4504849] → [7.4504849:4504873]
```
    if (abil.food_cost)
```
[7.4504849]
[7.4504873]
```
    if (abil.food_cost && you.species != SP_MUMMY)
```

Several bugfixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells2.cc at line 1095 [7.569242]

Insertion in crawl-ref/source/spells2.cc at line 1100 [7.569242]

Replacement in crawl-ref/source/player.h at line 306 [7.945993]

Replacement in crawl-ref/source/player.cc at line 436 [7.962854]

Replacement in crawl-ref/source/player.cc at line 440 [7.962854]

Replacement in crawl-ref/source/player.cc at line 456 [7.962854]

Insertion in crawl-ref/source/player.cc at line 474 [7.962854]

Replacement in crawl-ref/source/player.cc at line 5257 [7.962854]

Insertion in crawl-ref/source/player.cc at line 5262 [7.962854]

Insertion in crawl-ref/source/output.cc at line 26 [7.1088282]

Insertion in crawl-ref/source/output.cc at line 31 [7.1088282]

Replacement in crawl-ref/source/output.cc at line 642 [7.1088282]