fiddlerwoaroof/crawl - Change AIVXE6QBRVCZAASKQRZO6LBDGTYEYSSD2DZCWRX4VLSKE3GCNIDAC

Revert the change on ammo handling for Tiles, and replace it with a more

generic logic that uses item tiles for BEAM_MISSILE, else bolts according to flavour. Identify monster fired ammunition ego if the launcher ego is known, not that it has much of an effect because plain ammo gets no special description. In the message list the fired item as it will look to the player (i.e. "arrow of ice" for a plain arrow fired off a bow of frost), even though the item actually dropped will still be a plain one. I hope this isn't too confusing. (And if it is, it should be easy to revert. :p)

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

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

AIVXE6QBRVCZAASKQRZO6LBDGTYEYSSD2DZCWRX4VLSKE3GCNIDAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tile1.cc at line 1895 [4.96318]

B:BD[4.146028] → [4.146028:146192]

/*
  Determine Octant of missile direction
  ---> X+
 |
 |  701
 Y  6O2
 +  543
  the octant boundary slope tan(pi/8)=sqrt(2)-1 = 0.414 is approximated by 2/5
*/

[4.146028]

[5.20756]

//  Determine Octant of missile direction
//   .---> X+
//   |
//   |  701
//   Y  6O2
//   +  543
//
// The octant boundary slope tan(pi/8)=sqrt(2)-1 = 0.414 is approximated by 2/5.

Deletion in crawl-ref/source/tile1.cc at line 1924 [4.96318]

B:BD[5.20841] → [2.172:397]


        switch (get_ammo_brand(item))
        {
        case SPMSL_FLAME:
            return (tileidx_zap(RED));
        case SPMSL_ICE:
            return (tileidx_zap(WHITE));
        default:
            break;
        }

Replacement in crawl-ref/source/mstuff2.cc at line 1195 [7.1340842]

∅:D[6.2691] → [7.1367143:1367234]

B:BD[7.1367143] → [7.1367143:1367234]

    int wepClass = mitm[hand_used].base_type;
    int wepType  = mitm[hand_used].sub_type;

[6.2691]

[7.1367234]

    int wepClass  = mitm[hand_used].base_type;
    int wepType   = mitm[hand_used].sub_type;

Replacement in crawl-ref/source/mstuff2.cc at line 1198 [7.1340842]
B:BD[7.1367235] → [7.1367235:1367280]
```
    int weapon = monster->inv[MSLOT_WEAPON];
```
[7.1367235]
[7.1367353]
```
    int weapon    = monster->inv[MSLOT_WEAPON];
```
Insertion in crawl-ref/source/mstuff2.cc at line 1453 [7.1340842]
[8.17668]
[9.189]
Insertion in crawl-ref/source/mstuff2.cc at line 1455 [7.1340842]
[9.217]
[9.217]
```
    {
```

Insertion in crawl-ref/source/mstuff2.cc at line 1458 [7.1340842]

[7.1373266]

[10.7510]

        if (projected == LRET_LAUNCHED
            && item_type_known(mitm[monster->inv[MSLOT_WEAPON]]))
        {
            set_ident_flags(mitm[hand_used], ISFLAG_KNOW_TYPE);
        }
    }

Replacement in crawl-ref/source/mon-util.cc at line 3322 [7.1699344]
B:BD[11.6555] → [11.6555:6602]
```
            mpr("It glows red for a moment.");
```
[11.6555]
[11.6602]
```
            mpr("It bursts into flame!");
```

Replacement in crawl-ref/source/items.cc at line 1198 [7.2584728]

B:BD[7.2609841] → [12.79992:80077]

        // deliberately allowing the player to pick up
        // a killed item here

[7.2609841]

[13.352023]

        // Deliberately allowing the player to pick up
        // a killed item here.

Replacement in crawl-ref/source/items.cc at line 1216 [7.2584728]

B:BD[7.2610252] → [14.8364:8433]

            if ( num_nonsquelched && _invisible_to_player(mitm[o]) )

[7.2610252]

[12.80146]

            if (num_nonsquelched && _invisible_to_player(mitm[o]))

Replacement in crawl-ref/source/itemname.cc at line 1703 [7.2667494]
B:BD[15.7388] → [16.253:305]
```
    if ( idt != NUM_IDTYPE && item.sub_type < 50  )
```
[15.7388]
[17.31676]
```
    if (idt != NUM_IDTYPE && item.sub_type < 50 )
```

Replacement in crawl-ref/source/item_use.cc at line 367 [7.2781507]

B:BD[18.732284] → [18.732284:732455]

    return (impact > 160? "severely "       :
            impact > 130? "significantly "  :
            impact > 110? ""                :
                          NULL);

[18.732284]

[18.732455]

    return (impact > 160 ? "severely "      :
            impact > 130 ? "significantly " :
            impact > 110 ? ""
                         : NULL);

Replacement in crawl-ref/source/item_use.cc at line 608 [7.2781507]

B:BD[7.2792205] → [7.2792205:2792260]

                    mpr("It glows red for a moment.");

[7.2792205]

[7.2792260]

                    mpr("It bursts into flame!");

Insertion in crawl-ref/source/item_use.cc at line 1722 [7.2781507]
[18.740705]
[18.740705]
```
// positive: frost, negative: flame, zero: neither
```

Replacement in crawl-ref/source/item_use.cc at line 1725 [7.2781507]

B:BD[18.740771] → [18.740771:740962]

    int element = (launcher_brand == SPWPN_FROST)
                + (ammo_brand == SPMSL_ICE)
                - (launcher_brand == SPWPN_FLAME)
                - (ammo_brand == SPMSL_FLAME);

[18.740771]

[18.740962]

    int element = (launcher_brand == SPWPN_FROST
                   + ammo_brand == SPMSL_ICE
                   - launcher_brand == SPWPN_FLAME
                   - ammo_brand == SPMSL_FLAME);

Replacement in crawl-ref/source/item_use.cc at line 2013 [7.2781507]
∅:D[19.583] → [18.742538:742598]
B:BD[18.742538] → [18.742538:742598]
```
        const int bow_brand = get_weapon_brand( launcher );
```
[19.583]
[7.2816398]
```
        const int bow_brand  = get_weapon_brand( launcher );
```

Replacement in crawl-ref/source/item_use.cc at line 2239 [7.2781507]

B:BD[20.342] → [2.7548:7615]

        if (bow_brand == SPWPN_FLAME || ammo_brand == SPMSL_FLAME)

[20.342]

[7.2822703]

        if ((bow_brand == SPWPN_FLAME || ammo_brand == SPMSL_FLAME)
            && ammo_brand != SPMSL_ICE && bow_brand != SPWPN_FROST)

Replacement in crawl-ref/source/item_use.cc at line 2242 [7.2781507]

B:BD[7.2822713] → [2.7616:7890]

            if (ammo_brand != SPMSL_ICE && bow_brand != SPWPN_FROST)
            {
#ifdef USE_TILE
                // Mark brand for tile output.
                if (ammo_brand != SPMSL_FLAME)
                    set_item_ego_type( item, OBJ_MISSILES, SPMSL_FLAME );
#endif

[7.2822713]

[2.7890]

            // [dshaligram] Branded arrows are much stronger.
            dice_mult = (dice_mult * 150) / 100;

Replacement in crawl-ref/source/item_use.cc at line 2245 [7.2781507]

B:BD[2.7891] → [2.7891:8010]

                // [dshaligram] Branded arrows are much stronger.
                dice_mult = (dice_mult * 150) / 100;

[2.7891]

[18.747934]

            pbolt.flavour = BEAM_FIRE;
            pbolt.name    = "bolt of ";

Replacement in crawl-ref/source/item_use.cc at line 2248 [7.2781507]

B:BD[18.747935] → [2.8011:8098]

                pbolt.flavour = BEAM_FIRE;
                pbolt.name    = "bolt of ";

[18.747935]

[7.2822840]

            if (poisoned)
                pbolt.name += "poison ";

Replacement in crawl-ref/source/item_use.cc at line 2251 [7.2781507]

B:BD[7.2822841] → [2.8099:8174]

∅:D[2.8174] → [7.2822919:2822920]

∅:D[18.748015] → [7.2822919:2822920]

B:BD[7.2822919] → [7.2822919:2822920]

B:BD[7.2822920] → [2.8175:8531]

                if (poisoned)
                    pbolt.name += "poison ";
                pbolt.name += "flame";
                pbolt.colour  = RED;
                pbolt.type    = dchar_glyph(DCHAR_FIRED_BOLT);
                pbolt.thrower = KILL_YOU_MISSILE;
                pbolt.aux_source.clear();
            }
#ifdef USE_TILE
            else
                set_item_ego_type( item, OBJ_MISSILES, SPMSL_NORMAL );
#endif

[7.2822841]

[7.2823379]

            pbolt.name += "flame";
            pbolt.colour  = RED;
            pbolt.type    = dchar_glyph(DCHAR_FIRED_BOLT);
            pbolt.thrower = KILL_YOU_MISSILE;
            pbolt.aux_source.clear();

Replacement in crawl-ref/source/item_use.cc at line 2258 [7.2781507]

B:BD[7.2823390] → [2.8532:8597]

        if (bow_brand == SPWPN_FROST || ammo_brand == SPMSL_ICE)

[7.2823390]

[7.2823526]

        if ((bow_brand == SPWPN_FROST || ammo_brand == SPMSL_ICE)
            && ammo_brand != SPMSL_FLAME && bow_brand != SPWPN_FLAME)

Replacement in crawl-ref/source/item_use.cc at line 2261 [7.2781507]

B:BD[7.2823536] → [2.8598:8870]

∅:D[21.2447] → [18.748200:748201]

∅:D[2.8870] → [18.748200:748201]

B:BD[18.748200] → [18.748200:748201]

B:BD[18.748201] → [2.8871:8990]

            if (ammo_brand != SPMSL_FLAME && bow_brand != SPWPN_FLAME)
            {
#ifdef USE_TILE
                // Mark brand for tile output.
                if (ammo_brand != SPMSL_ICE)
                    set_item_ego_type( item, OBJ_MISSILES, SPMSL_ICE );
#endif
                // [dshaligram] Branded arrows are much stronger.
                dice_mult = (dice_mult * 150) / 100;

[7.2823536]

[2.8990]

            // [dshaligram] Branded arrows are much stronger.
            dice_mult = (dice_mult * 150) / 100;

Replacement in crawl-ref/source/item_use.cc at line 2264 [7.2781507]

B:BD[2.8991] → [2.8991:9078]

                pbolt.flavour = BEAM_COLD;
                pbolt.name    = "bolt of ";

[2.8991]

[7.2823663]

            pbolt.flavour = BEAM_COLD;
            pbolt.name    = "bolt of ";

Replacement in crawl-ref/source/item_use.cc at line 2267 [7.2781507]

B:BD[7.2823664] → [2.9079:9154]

                if (poisoned)
                    pbolt.name += "poison ";

[7.2823664]

[7.2823742]

            if (poisoned)
                pbolt.name += "poison ";

Replacement in crawl-ref/source/item_use.cc at line 2270 [7.2781507]

B:BD[7.2823743] → [2.9155:9515]

                pbolt.name   += "frost";
                pbolt.colour  = WHITE;
                pbolt.type    = dchar_glyph(DCHAR_FIRED_BOLT);
                pbolt.thrower = KILL_YOU_MISSILE;
                pbolt.aux_source.clear();
            }
#ifdef USE_TILE
            else
                set_item_ego_type( item, OBJ_MISSILES, SPMSL_NORMAL );
#endif

[7.2823743]

[7.2824543]

            pbolt.name   += "frost";
            pbolt.colour  = WHITE;
            pbolt.type    = dchar_glyph(DCHAR_FIRED_BOLT);
            pbolt.thrower = KILL_YOU_MISSILE;
            pbolt.aux_source.clear();

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

[7.2829631]

[22.15125]

    // Print type of item as influenced by launcher.
    item_def ammo = item;
    if (pbolt.flavour == BEAM_FIRE)
    {
        if (ammo.special != SPMSL_FLAME)
            ammo.special = SPMSL_FLAME;
    }
    else if (pbolt.flavour == BEAM_COLD)
    {
        if (ammo.special != SPMSL_ICE)
            ammo.special = SPMSL_ICE;
    }
    else
    {
        if (ammo.special != SPMSL_NORMAL && ammo.special != SPMSL_POISONED)
            ammo.special = SPMSL_NORMAL;
    }

Replacement in crawl-ref/source/item_use.cc at line 2569 [7.2781507]
∅:D[23.443] → [24.22639:22684]
∅:D[25.14348] → [24.22639:22684]
B:BD[24.22639] → [24.22639:22684]
```
          item.name(DESC_NOCAP_A).c_str() );
```
[23.443]
[7.2830181]
```
          ammo.name(DESC_NOCAP_A).c_str() );
```
Insertion in crawl-ref/source/beam.cc at line 217 [7.4128068]
[18.1222133]
[18.1222133]
Replacement in crawl-ref/source/beam.cc at line 1765 [7.4128068]
B:BD[4.5937009] → [26.7846:7880]
```
    if (item && !pbolt.is_tracer)
```
[4.5937009]
[4.5937023]
```
    if (item && !pbolt.is_tracer && pbolt.flavour == BEAM_MISSILE)
```

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

B:BD[3.3777] → [3.3777:3828]

                       beam.dont_stop_foe = true;

[3.3777]

[22.34097]

                       beam.dont_stop_foe = true;

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

B:BD[3.4181] → [3.4181:4229]

                    beam.dont_stop_foe = true;

[3.4181]

[27.5130]

                    beam.dont_stop_foe = true;

Insertion in crawl-ref/source/acr.cc at line 1967 [7.4397395]
[28.5603]
[29.3560]
```
#ifndef WIZARD
```
Replacement in crawl-ref/source/acr.cc at line 1981 [7.4397395]
B:BD[30.11537] → [30.11537:11538]
[30.11537]
[31.8864]
```
#endif
```

Revert the change on ammo handling for Tiles, and replace it with a more

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tile1.cc at line 1895 [4.96318]

Deletion in crawl-ref/source/tile1.cc at line 1924 [4.96318]

Replacement in crawl-ref/source/mstuff2.cc at line 1195 [7.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1198 [7.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 1453 [7.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 1455 [7.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 1458 [7.1340842]

Replacement in crawl-ref/source/mon-util.cc at line 3322 [7.1699344]

Replacement in crawl-ref/source/items.cc at line 1198 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 1216 [7.2584728]

Replacement in crawl-ref/source/itemname.cc at line 1703 [7.2667494]

Replacement in crawl-ref/source/item_use.cc at line 367 [7.2781507]

Replacement in crawl-ref/source/item_use.cc at line 608 [7.2781507]

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