fiddlerwoaroof/crawl - Change SG76BPJKTQGDFNP5QFMAVR6H72FMMAYCECVGSWWSCLMAVQX7E3FQC

Fix 1933066: Ghosts not being poison resistant.

Fix part of 1940994: Identify scrolls now get properly identified if applied on an unID'd item right away, so that if you get more rounds it isn't offered to you again.

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

Created by j-p-e-g on April 16, 2008

SG76BPJKTQGDFNP5QFMAVR6H72FMMAYCECVGSWWSCLMAVQX7E3FQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mstuff2.cc at line 818 [6.1340842]
[5.611]
[5.611]
```
        {
```
Insertion in crawl-ref/source/mstuff2.cc at line 821 [6.1340842]
[5.741]
[4.7282]
```
        }
```

Replacement in crawl-ref/source/mstuff2.cc at line 905 [6.1340842]

B:BD[6.1361676] → [7.19125:19176]

    bolt theBeam = mons_spells(spell_cast, power);

[6.1361676]

[6.1361735]

    bolt theBeam         = mons_spells(spell_cast, power);
    pbolt.colour         = theBeam.colour;
    pbolt.range          = theBeam.range;
    pbolt.rangeMax       = theBeam.rangeMax;
    pbolt.hit            = theBeam.hit;
    pbolt.damage         = theBeam.damage;

Deletion in crawl-ref/source/mstuff2.cc at line 913 [6.1340842]

B:BD[6.1361736] → [6.1361736:1361907]

    pbolt.colour = theBeam.colour;
    pbolt.range = theBeam.range;
    pbolt.rangeMax = theBeam.rangeMax;
    pbolt.hit = theBeam.hit;
    pbolt.damage = theBeam.damage;

Replacement in crawl-ref/source/mstuff2.cc at line 915 [6.1340842]

∅:D[8.1044] → [6.1361950:1362018]

B:BD[6.1361950] → [6.1361950:1362018]

B:BD[6.1362018] → [9.399481:399518]

    pbolt.type = theBeam.type;
    pbolt.flavour = theBeam.flavour;
    pbolt.thrower = theBeam.thrower;

[8.1044]

[9.399518]


    pbolt.type           = theBeam.type;
    pbolt.flavour        = theBeam.flavour;
    pbolt.thrower        = theBeam.thrower;

Replacement in crawl-ref/source/mstuff2.cc at line 920 [6.1340842]

B:BD[9.399548] → [9.399548:399616]

∅:D[9.399616] → [6.1362171:1362237]

B:BD[6.1362171] → [6.1362171:1362237]

B:BD[6.1362237] → [4.7284:7313]

∅:D[4.7313] → [9.399647:399694]

B:BD[9.399647] → [9.399647:399694]

    pbolt.name = theBeam.name;
    pbolt.is_beam = theBeam.is_beam;
    pbolt.source_x = monster->x;
    pbolt.source_y = monster->y;
    pbolt.is_tracer = false;
    pbolt.is_explosion = theBeam.is_explosion;

[9.399548]

[6.1362266]

    pbolt.name           = theBeam.name;
    pbolt.is_beam        = theBeam.is_beam;
    pbolt.source_x       = monster->x;
    pbolt.source_y       = monster->y;
    pbolt.is_tracer      = false;
    pbolt.is_explosion   = theBeam.is_explosion;

Insertion in crawl-ref/source/monstuff.cc at line 3852 [6.1396662]
[9.426187]
[9.426187]
Insertion in crawl-ref/source/monstuff.cc at line 3941 [6.1396662]
[7.25258]
[4.8489]
```
                        {
```
Insertion in crawl-ref/source/monstuff.cc at line 3945 [6.1396662]
[7.25468]
[7.25468]
```
                        }
```
Insertion in crawl-ref/source/monstuff.cc at line 4320 [6.1396662]
[10.7148]
[7.29548]
```
        {
```
Insertion in crawl-ref/source/monstuff.cc at line 4322 [6.1396662]
[7.29576]
[4.9254]
```
        }
```
Insertion in crawl-ref/source/mon-util.cc at line 295 [6.1699344]
[9.468897]
[11.11848]
```
    mon_resist_def resists;
```

Replacement in crawl-ref/source/mon-util.cc at line 297 [6.1699344]

B:BD[11.11927] → [11.11927:11965]

        return (mon->ghost->resists);

[11.11927]

[3.2548]

        resists = (mon->ghost->resists);
    else
        resists = mon_resist_def();
    resists |= get_mons_class_resists(mon->type);

Replacement in crawl-ref/source/mon-util.cc at line 303 [6.1699344]

∅:D[3.2549] → [11.11970:12034]

B:BD[11.11970] → [11.11970:12034]

∅:D[11.12034] → [12.81:208]

B:BD[9.468960] → [12.81:208]

    mon_resist_def resists = get_mons_class_resists(mon->type);
    if ((mons_genus(mon->type) == MONS_DRACONIAN &&
         mon->type != MONS_DRACONIAN) ||
        mon->type == MONS_TIAMAT)

[3.2549]

[9.469053]

    if (mons_genus(mon->type) == MONS_DRACONIAN && mon->type != MONS_DRACONIAN
        || mon->type == MONS_TIAMAT)

Insertion in crawl-ref/source/item_use.cc at line 3898 [6.2781507]
[13.4747]
[13.4747]
```
    {
```
Insertion in crawl-ref/source/item_use.cc at line 3901 [6.2781507]
[13.4898]
[13.4898]
```
    }
```

Insertion in crawl-ref/source/item_use.cc at line 3987 [6.2781507]

[14.7064]

            set_ident_type( OBJ_SCROLLS, SCR_IDENTIFY, ID_KNOWN_TYPE );

Replacement in crawl-ref/source/ghost.cc at line 91 [15.9890]
B:BD[15.11838] → [2.288:318]
```
    SPELL_FREEZING_CLOUD,    
```
[15.11838]
[7.50533]
```
    SPELL_FREEZING_CLOUD,
```

Replacement in crawl-ref/source/ghost.cc at line 113 [15.9890]

B:BD[15.12197] → [11.19502:19581]

    species = SP_UNKNOWN;
    job = JOB_UNKNOWN;
    best_skill = SK_FIGHTING;

[15.12197]

[11.19581]

    species          = SP_UNKNOWN;
    job              = JOB_UNKNOWN;
    best_skill       = SK_FIGHTING;

Replacement in crawl-ref/source/ghost.cc at line 117 [15.9890]

B:BD[11.19607] → [11.19607:19843]

    xl = 0;
    max_hp = 0;
    ev = 0;
    ac = 0;
    damage = 0;
    speed = 10;
    see_invis = false;
    brand = SPWPN_NORMAL;
    resists = mon_resist_def();
    spellcaster = false;
    cycle_colours = false;
    fly = FL_NONE;

[11.19607]

[15.12246]

    xl               = 0;
    max_hp           = 0;
    ev               = 0;
    ac               = 0;
    damage           = 0;
    speed            = 10;
    see_invis        = false;
    brand            = SPWPN_NORMAL;
    resists          = mon_resist_def();
    // HACKY: demons and ghosts always resist poison
//    resists.poison   = 1;
    spellcaster      = false;
    cycle_colours    = false;
    fly              = FL_NONE;

Replacement in crawl-ref/source/ghost.cc at line 180 [15.9890]
B:BD[16.349] → [11.20380:20424]
```
        } while (brand == SPWPN_HOLY_WRATH 
```
[16.349]
[11.20424]
```
        } while (brand == SPWPN_HOLY_WRATH
```

Replacement in crawl-ref/source/ghost.cc at line 185 [15.9890]

B:BD[17.3885] → [11.20525:20614]

                 || brand == SPWPN_PROTECTION 
                 || brand == SPWPN_FLAME

[17.3885]

[11.20614]

                 || brand == SPWPN_PROTECTION
                 || brand == SPWPN_FLAME

Replacement in crawl-ref/source/ghost.cc at line 198 [15.9890]
B:BD[11.20811] → [11.20811:20816]
```
    
```
[11.20811]
[15.14463]
Replacement in crawl-ref/source/ghost.cc at line 211 [15.9890]
∅:D[11.20945] → [18.2362:2375]
B:BD[15.15002] → [18.2362:2375]
```
    {       
```
[11.20945]
[15.15086]
```
    {
```
Replacement in crawl-ref/source/ghost.cc at line 227 [15.9890]
∅:D[11.21272] → [19.519:530]
B:BD[19.519] → [19.519:530]
```
        } 
```
[11.21272]
[15.15559]
```
        }
```
Replacement in crawl-ref/source/ghost.cc at line 282 [15.9890]
B:BD[15.17455] → [15.17455:17481]
```
    name = you.your_name;
```
[15.17455]
[11.22235]
```
    name   = you.your_name;
```

Replacement in crawl-ref/source/ghost.cc at line 290 [15.9890]

B:BD[11.22383] → [11.22383:22588]

    see_invis = player_see_invis();
    resists.fire = player_res_fire();
    resists.cold = player_res_cold();
    resists.elec = player_res_electricity();
    speed = player_ghost_base_movement_speed();

[11.22383]

[15.17988]

    see_invis      = player_see_invis();
    resists.fire   = player_res_fire();
    resists.cold   = player_res_cold();
    resists.elec   = player_res_electricity();
    speed          = player_ghost_base_movement_speed();

Replacement in crawl-ref/source/ghost.cc at line 429 [15.9890]
B:BD[15.21935] → [15.21935:21987]
```
    if (player_has_spell( SPELL_CONTROLLED_BLINK ) 
```
[15.21935]
[15.21987]
```
    if (player_has_spell( SPELL_CONTROLLED_BLINK )
```
Replacement in crawl-ref/source/ghost.cc at line 538 [15.9890]
B:BD[15.26340] → [15.26340:26345]
```
    
```
[15.26340]
[15.26345]
Replacement in crawl-ref/source/ghost.cc at line 553 [15.9890]
B:BD[15.26815] → [15.26815:26820]
```
    
```
[15.26815]
[20.335]

Fix 1933066: Ghosts not being poison resistant.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/mstuff2.cc at line 818 [6.1340842]

Insertion in crawl-ref/source/mstuff2.cc at line 821 [6.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 905 [6.1340842]

Deletion in crawl-ref/source/mstuff2.cc at line 913 [6.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 915 [6.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 920 [6.1340842]

Insertion in crawl-ref/source/monstuff.cc at line 3852 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 3941 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 3945 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4320 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4322 [6.1396662]

Insertion in crawl-ref/source/mon-util.cc at line 295 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 297 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 303 [6.1699344]

Insertion in crawl-ref/source/item_use.cc at line 3898 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3901 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3987 [6.2781507]

Replacement in crawl-ref/source/ghost.cc at line 91 [15.9890]

Replacement in crawl-ref/source/ghost.cc at line 113 [15.9890]

Replacement in crawl-ref/source/ghost.cc at line 117 [15.9890]

Replacement in crawl-ref/source/ghost.cc at line 180 [15.9890]

Replacement in crawl-ref/source/ghost.cc at line 185 [15.9890]

Replacement in crawl-ref/source/ghost.cc at line 198 [15.9890]

Replacement in crawl-ref/source/ghost.cc at line 211 [15.9890]

Replacement in crawl-ref/source/ghost.cc at line 227 [15.9890]

Replacement in crawl-ref/source/ghost.cc at line 282 [15.9890]

Replacement in crawl-ref/source/ghost.cc at line 290 [15.9890]

Replacement in crawl-ref/source/ghost.cc at line 429 [15.9890]

Replacement in crawl-ref/source/ghost.cc at line 538 [15.9890]

Replacement in crawl-ref/source/ghost.cc at line 553 [15.9890]