fiddlerwoaroof/crawl - Change 23I5KJ245D43B6QYWS4TDQYJO2W2PKTDCLFBWPVAFDWS6L7NMGKQC

FR 1836617: Add item brand for plants (and mimics) in Tiles.

FR 1870291: Give a message when gaining exp for killing monsters outside LOS. (This is something the player can find out by checking their xp pool, anyway, so it's not like it gives anything away. Currently does not happen for pet kills, should it?)

Implement 1829910: Make Daevas fully resist negative energy, with the reasoning that TSO will protect them.

Also, fix dragon slaying to actually have an effect on draconian players (whoops!) as well as on characters in Dragon Form.

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

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

23I5KJ245D43B6QYWS4TDQYJO2W2PKTDCLFBWPVAFDWS6L7NMGKQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tile1.cc at line 3628 [5.96318]

[4.335]

            // if necessary add item brand
            if (igrd[gx][gy] != NON_ITEM)
            {
                if (foreground)
                    t |= TILE_FLAG_S_UNDER;
                else
                    t0 |= TILE_FLAG_S_UNDER;
            }

Insertion in crawl-ref/source/tile1.cc at line 3646 [5.96318]

[4.664]

        }
    }
    else if (menv[idx].holiness() == MH_PLANT)
    {
        // if necessary add item brand
        if (igrd[gx][gy] != NON_ITEM)
        {
            if (foreground)
                t |= TILE_FLAG_S_UNDER;
            else
                t0 |= TILE_FLAG_S_UNDER;

Replacement in crawl-ref/source/player.cc at line 167 [8.962854]

B:BD[6.1261] → [7.1011:1076]

                                          DESC_BASENAME, false);

[6.1261]

[6.1323]

                                          false, DESC_BASENAME, false);

Insertion in crawl-ref/source/player.cc at line 6070 [8.962854]

[9.5058]

    if (player_genus(GENPC_DRACONIAN))
        return (MONS_DRACONIAN);

Insertion in crawl-ref/source/player.cc at line 6080 [8.962854]
[9.5256]
[9.5256]
```
        
```
Insertion in crawl-ref/source/monstuff.cc at line 407 [8.1396662]
[10.11215]
[11.994]
```
    {
        int old_lev = you.experience_level;
```

Insertion in crawl-ref/source/monstuff.cc at line 410 [8.1396662]

[11.1048]

[12.638]

        // Give a message for monsters dying out of sight
        if (exp_gain > 0 && !mons_near(monster) && you.experience_level == old_lev)
            mpr("You feel a bit more experienced.");
    }

Replacement in crawl-ref/source/monstuff.cc at line 978 [8.1396662]

B:BD[8.1418128] → [13.40304:40374]

                    simple_monster_message( monster, " vaporises!" );

[8.1418128]

[8.1418198]

                    simple_monster_message( monster, " vapourises!" );

Replacement in crawl-ref/source/mon-util.h at line 179 [8.1682293]

B:BD[14.69735] → [14.69735:69804]

    // - negative energy is mostly handled via mons_has_life_force()

[14.69735]

[14.69804]

    // - negative energy is mostly handled via mons_res_negative_energy()

Replacement in crawl-ref/source/mon-util.cc at line 1019 [8.1699344]

B:BD[15.473012] → [15.473012:473054]

        || mon->type == MONS_DEATH_DRAKE)

[15.473012]

[8.1715348]

        || mon->type == MONS_DEATH_DRAKE
           // TSO protects his warriors' life force
        || mon->type == MONS_DAEVA)

Insertion in crawl-ref/source/mon-util.cc at line 1027 [8.1699344]
[8.1715431]
[8.1715431]
```
    
```

Replacement in crawl-ref/source/luadgn.cc at line 1278 [18.1232]

B:BD[16.17193] → [17.5329:5393]

        feature_description(feat, NUM_TRAPS, dtype, need_stop);

[16.17193]

[17.5393]

        feature_description(feat, NUM_TRAPS, false, dtype, need_stop);

Replacement in crawl-ref/source/luadgn.cc at line 1291 [18.1232]

B:BD[17.5793] → [17.5793:5865]

        feature_description(luaL_checkint(ls, 1), luaL_checkint(ls, 2),

[17.5793]

[17.5865]

        feature_description(luaL_checkint(ls, 1), luaL_checkint(ls, 2), false,

Insertion in crawl-ref/source/item_use.cc at line 517 [8.2781507]

[2.3495]

                        || you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON

Replacement in crawl-ref/source/fight.cc at line 1972 [8.3140790]

B:BD[2.4535] → [2.4535:4606]

            || mons_genus(defender->mons_species()) == MONS_DRACONIAN)

[2.4535]

[19.8208]

            || mons_genus(defender->mons_species()) == MONS_DRACONIAN
            || defender->atype() == ACT_PLAYER
               && you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON)

Replacement in crawl-ref/source/direct.h at line 171 [8.3696722]
B:BD[8.3697902] → [20.34827:34875]
```
std::string feature_description(int mx, int my,
```
[8.3697902]
[20.34875]
```
std::string feature_description(int mx, int my, bool bloody = false,
```

Replacement in crawl-ref/source/direct.h at line 176 [8.3696722]

∅:D[17.7639] → [21.14896:14955]

∅:D[20.35191] → [21.14896:14955]

B:BD[22.450860] → [21.14896:14955]

B:BD[21.14955] → [20.35192:35252]

std::string feature_description(dungeon_feature_type grid,
                                trap_type trap = NUM_TRAPS,

[17.7639]

[20.35308]

std::string feature_description(dungeon_feature_type grid, 
                                trap_type trap = NUM_TRAPS, bool bloody = false,

Replacement in crawl-ref/source/direct.cc at line 1472 [8.3697945]

B:BD[23.5498] → [20.35462:35537]

    feat = feature_description(you.x_pos, you.y_pos, DESC_NOCAP_A, false);

[23.5498]

[23.5552]

    feat = feature_description(you.x_pos, you.y_pos,
                               is_bloodcovered(you.x_pos, you.y_pos),
                               DESC_NOCAP_A, false);

Replacement in crawl-ref/source/direct.cc at line 1533 [8.3697945]

B:BD[17.8019] → [17.8019:8067]

                                trap_type trap,

[17.8019]

[17.8067]

                                trap_type trap, bool bloody,

Insertion in crawl-ref/source/direct.cc at line 1538 [8.3697945]
[17.8238]
[17.8238]
```
    if (bloody)
        desc += ", spattered with blood";
```

Replacement in crawl-ref/source/direct.cc at line 1790 [8.3697945]

B:BD[15.980767] → [20.40642:40767]

std::string feature_description(int mx, int my, description_level_type dtype,
                                bool add_stop)

[15.980767]

[15.980815]

std::string feature_description(int mx, int my, bool bloody,
                                description_level_type dtype, bool add_stop)

Replacement in crawl-ref/source/direct.cc at line 1802 [8.3697945]

∅:D[24.23242] → [17.8834:8902]

B:BD[15.981063] → [17.8834:8902]

        return (feature_description(grid, trap_type_at_xy(mx, my),

[24.23242]

[20.40842]

        return (feature_description(grid, trap_type_at_xy(mx, my), bloody,

Replacement in crawl-ref/source/direct.cc at line 1812 [8.3697945]

B:BD[15.982354] → [17.9089:9161]

        return (feature_description(grid, NUM_TRAPS, dtype, add_stop));

[15.982354]

[15.982369]

        return (feature_description(grid, NUM_TRAPS, bloody, dtype, add_stop));

Replacement in crawl-ref/source/direct.cc at line 2132 [8.3697945]

B:BD[8.3728309] → [22.474528:474588]

    std::string feature_desc = feature_description(mx, my);

[8.3728309]

[25.1808]

    bool bloody = false;
    if (is_bloodcovered(mx, my))
        bloody = true;
    std::string feature_desc = feature_description(mx, my, bloody);

Deletion in crawl-ref/source/direct.cc at line 2160 [8.3697945]

B:BD[26.23033] → [3.9396:9494]

        if (is_bloodcovered(mx, my))
          feature_desc += EOL "It is spattered with blood.";

Deletion in crawl-ref/source/direct.cc at line 2169 [8.3697945]

B:BD[27.1892] → [3.9496:9673]


        bool bloody = false;
        if (is_bloodcovered(mx, my))
        {
            feature_desc += EOL "It is spattered with blood.";
            bloody = true;
        }