fiddlerwoaroof/crawl - Change NQXYTPHC5ZBLJDIC5OVAUIDYYOXLPSGWUVD464ODH4KBHYGRDPPAC

Consolidate beam and cloud handling routines a bit, and allow clouds to

destroy items on the floor where applicable. Also allow grey smoke as a random potion effect from Evaporate.

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

Created by dolorous on May 14, 2008

NQXYTPHC5ZBLJDIC5OVAUIDYYOXLPSGWUVD464ODH4KBHYGRDPPAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/misc.h at line 43 [3.1928926]

[3.1930989]

cloud_type beam2cloud(beam_type flavour);
beam_type cloud2beam(cloud_type flavour);

Insertion in crawl-ref/source/misc.cc at line 1214 [3.1933596]

[3.1938292]

[4.3227]

cloud_type beam2cloud(beam_type flavour)
{
    switch (flavour)
    {
    default:
    case BEAM_NONE:
        return CLOUD_NONE;
    case BEAM_FIRE:
    case BEAM_POTION_FIRE:
        return CLOUD_FIRE;
    case BEAM_POTION_STINKING_CLOUD:
        return CLOUD_STINK;
    case BEAM_COLD:
    case BEAM_POTION_COLD:
        return CLOUD_COLD;
    case BEAM_POISON:
    case BEAM_POTION_POISON:
        return CLOUD_POISON;
    case BEAM_POTION_BLACK_SMOKE:
        return CLOUD_BLACK_SMOKE;
    case BEAM_POTION_GREY_SMOKE:
        return CLOUD_GREY_SMOKE;
    case BEAM_POTION_BLUE_SMOKE:
        return CLOUD_BLUE_SMOKE;
    case BEAM_POTION_PURP_SMOKE:
        return CLOUD_PURP_SMOKE;
    case BEAM_STEAM:
    case BEAM_POTION_STEAM:
        return CLOUD_STEAM;
    case BEAM_MIASMA:
    case BEAM_POTION_MIASMA:
        return CLOUD_MIASMA;
    case BEAM_RANDOM:
        return CLOUD_RANDOM;
    }
}
beam_type cloud2beam(cloud_type flavour)
{
    switch (flavour)
    {
    default:
    case CLOUD_NONE:
        return BEAM_NONE;
    case CLOUD_FIRE:
        return BEAM_FIRE;
    case CLOUD_STINK:
        return BEAM_POTION_STINKING_CLOUD;
    case CLOUD_COLD:
        return BEAM_COLD;
    case CLOUD_POISON:
        return BEAM_POISON;
    case CLOUD_BLACK_SMOKE:
        return BEAM_POTION_BLACK_SMOKE;
    case CLOUD_GREY_SMOKE:
        return BEAM_POTION_GREY_SMOKE;
    case CLOUD_BLUE_SMOKE:
        return BEAM_POTION_BLUE_SMOKE;
    case CLOUD_PURP_SMOKE:
        return BEAM_POTION_PURP_SMOKE;
    case CLOUD_STEAM:
        return BEAM_STEAM;
    case CLOUD_MIASMA:
        return BEAM_MIASMA;
    case CLOUD_RANDOM:
        return BEAM_RANDOM;
    }
}

Insertion in crawl-ref/source/enum.h at line 254 [3.3287960]
[3.3298128]
[3.3298128]
```
    BEAM_POTION_GREY_SMOKE,
```
Insertion in crawl-ref/source/enum.h at line 392 [3.3287960]
[5.8042]
[5.8042]
```
    CLOUD_BLACK_SMOKE,
```
Deletion in crawl-ref/source/enum.h at line 398 [3.3287960]
B:BD[5.8143] → [5.8143:8166]
```
    CLOUD_BLACK_SMOKE,
```
Insertion in crawl-ref/source/cloud.cc at line 25 [3.4095717]
[6.2342]
[7.8623]
```
#include "ouch.h"
```

Replacement in crawl-ref/source/cloud.cc at line 156 [3.4095717]

B:BD[8.6336] → [8.6336:6393]

        dissipate_cloud( cc, env.cloud[cc], dissipate );

[8.6336]

[8.6393]

        expose_items_to_element(cloud2beam(env.cloud[cc].type),
                                env.cloud[cc].x, env.cloud[cc].y);
        dissipate_cloud(cc, env.cloud[cc], dissipate);

Replacement in crawl-ref/source/cloud.cc at line 523 [3.4095717]

B:BD[9.1052] → [9.1052:1119]

    return (whose == KC_YOU? KILL_YOU_MISSILE : KILL_MON_MISSILE);

[9.1052]

[10.672]

    return (whose == KC_YOU ? KILL_YOU_MISSILE : KILL_MON_MISSILE);

Insertion in crawl-ref/source/beam.cc at line 2416 [3.4128068]
[3.4202527]
[3.4202527]
```
        case BEAM_POTION_GREY_SMOKE:
```
Deletion in crawl-ref/source/beam.cc at line 2924 [3.4128068]
B:BD[3.4218569] → [4.8353:8388]
∅:D[4.8388] → [3.4218607:4218627]
B:BD[3.4218607] → [3.4218607:4218627]
```
            cl_type = CLOUD_STINK;
            break;
```
Deletion in crawl-ref/source/beam.cc at line 2925 [3.4128068]
B:BD[3.4218660] → [4.8389:8425]
∅:D[4.8425] → [3.4218699:4218719]
B:BD[3.4218699] → [3.4218699:4218719]
```
            cl_type = CLOUD_POISON;
            break;
```
Replacement in crawl-ref/source/beam.cc at line 2926 [3.4128068]
B:BD[3.4218752] → [4.8426:8462]
∅:D[4.8462] → [3.4218791:4218849]
B:BD[3.4218791] → [3.4218791:4218849]
B:BD[3.4218849] → [4.8463:8504]
∅:D[4.8504] → [3.4218893:4218913]
B:BD[3.4218893] → [3.4218893:4218913]
```
            cl_type = CLOUD_MIASMA;
            break;
        case BEAM_POTION_BLACK_SMOKE:
            cl_type = CLOUD_BLACK_SMOKE;
            break;
```
[3.4218752]
[3.4218913]
```
        case BEAM_POTION_STEAM:
```
Deletion in crawl-ref/source/beam.cc at line 2928 [3.4128068]
B:BD[3.4218944] → [4.8505:8539]
∅:D[4.8539] → [3.4218981:4219001]
B:BD[3.4218981] → [3.4218981:4219001]
```
            cl_type = CLOUD_FIRE;
            break;
```
Replacement in crawl-ref/source/beam.cc at line 2929 [3.4128068]
B:BD[3.4219032] → [4.8540:8574]
∅:D[4.8574] → [3.4219069:4219089]
B:BD[3.4219069] → [3.4219069:4219089]
```
            cl_type = CLOUD_COLD;
            break;
```
[3.4219032]
[3.4219089]
```
        case BEAM_POTION_BLACK_SMOKE:
        case BEAM_POTION_GREY_SMOKE:
```
Deletion in crawl-ref/source/beam.cc at line 2932 [3.4128068]
B:BD[3.4219126] → [4.8575:8615]
∅:D[4.8615] → [3.4219169:4219189]
B:BD[3.4219169] → [3.4219169:4219189]
```
            cl_type = CLOUD_BLUE_SMOKE;
            break;
```
Replacement in crawl-ref/source/beam.cc at line 2933 [3.4128068]
B:BD[3.4219226] → [4.8616:8656]
```
            cl_type = CLOUD_PURP_SMOKE;
```
[3.4219226]
[3.4219269]
```
            cl_type = beam2cloud(beam.flavour);
```
Replacement in crawl-ref/source/beam.cc at line 2937 [3.4128068]
B:BD[3.4219322] → [2.15086:15119]
```
            switch (random2(10))
```
[3.4219322]
[3.4219356]
```
            switch (random2(11))
```

Replacement in crawl-ref/source/beam.cc at line 2944 [3.4128068]

B:BD[4.8957] → [4.8957:9077]

            case 5:  cl_type = CLOUD_BLUE_SMOKE;     break;
            case 6:  cl_type = CLOUD_PURP_SMOKE;     break;

[4.8957]

[4.9077]

            case 5:  cl_type = CLOUD_GREY_SMOKE;     break;
            case 6:  cl_type = CLOUD_BLUE_SMOKE;     break;
            case 7:  cl_type = CLOUD_PURP_SMOKE;     break;

Deletion in crawl-ref/source/beam.cc at line 2951 [3.4128068]
B:BD[3.4219908] → [3.4219908:4219940]
```
        case BEAM_POTION_STEAM:
```

Consolidate beam and cloud handling routines a bit, and allow clouds to

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/misc.h at line 43 [3.1928926]

Insertion in crawl-ref/source/misc.cc at line 1214 [3.1933596]

Insertion in crawl-ref/source/enum.h at line 254 [3.3287960]

Insertion in crawl-ref/source/enum.h at line 392 [3.3287960]

Deletion in crawl-ref/source/enum.h at line 398 [3.3287960]

Insertion in crawl-ref/source/cloud.cc at line 25 [3.4095717]

Replacement in crawl-ref/source/cloud.cc at line 156 [3.4095717]

Replacement in crawl-ref/source/cloud.cc at line 523 [3.4095717]

Insertion in crawl-ref/source/beam.cc at line 2416 [3.4128068]

Deletion in crawl-ref/source/beam.cc at line 2924 [3.4128068]

Deletion in crawl-ref/source/beam.cc at line 2925 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 2926 [3.4128068]

Deletion in crawl-ref/source/beam.cc at line 2928 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 2929 [3.4128068]

Deletion in crawl-ref/source/beam.cc at line 2932 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 2933 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 2937 [3.4128068]

Replacement in crawl-ref/source/beam.cc at line 2944 [3.4128068]

Deletion in crawl-ref/source/beam.cc at line 2951 [3.4128068]