fiddlerwoaroof/crawl - Change 4M56FGNV3IDCB7I4H7TMK3EWSQKWEJ5Z2AKIMHED272TOB34DO4QC

Put skeletal dragons back in the dragon genus, and treat all

dragon-types consistently when dealing with weapons of dragon slaying (dragons, draconians, dragon-transformed players, zombified dragons, and zombified draconians). New function is_dragonkind() handles this.

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

Created by dolorous on November 24, 2008

4M56FGNV3IDCB7I4H7TMK3EWSQKWEJ5Z2AKIMHED272TOB34DO4QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 710 [4.1340842]
∅:D[3.2071] → [4.1364043:1364101]
∅:D[5.400830] → [4.1364043:1364101]
B:BD[4.1364043] → [4.1364043:1364101]
```
}                               // end monster_teleport()
```
[3.2071]
[4.1364101]
```
}
```
Replacement in crawl-ref/source/mstuff2.cc at line 712 [4.1340842]
B:BD[4.1364102] → [4.1364102:1364166]
```
void setup_dragon(struct monsters *monster, struct bolt &pbolt)
```
[4.1364102]
[4.1364166]
```
void setup_dragon(struct monsters *monster, bolt &pbolt)
```

Replacement in crawl-ref/source/mstuff2.cc at line 714 [4.1340842]

B:BD[4.1364168] → [6.7324:7393]

∅:D[6.7393] → [5.400901:400976]

B:BD[5.400901] → [5.400901:400976]

    const int type = (mons_genus( monster->type ) == MONS_DRACONIAN)
                            ? draco_subspecies( monster ) : monster->type;

[4.1364168]

[5.400976]

    const int type = (mons_genus(monster->type) == MONS_DRACONIAN)
                            ? draco_subspecies(monster) : monster->type;

Replacement in crawl-ref/source/mstuff2.cc at line 791 [4.1340842]

B:BD[7.9623] → [7.9623:9728]

    if (mons_genus(monster->type) == MONS_DRAGON
        || mons_genus(monster->type) == MONS_DRACONIAN)

[7.9623]

[8.3961]

    if (is_dragonkind(monster, monster))

Replacement in crawl-ref/source/mon-data.h at line 1913 [4.1826214]

B:BD[9.57494] → [2.2481:2551]

    0, 12, MONS_SKELETAL_DRAGON, MONS_SKELETAL_DRAGON, MH_UNDEAD, -4,

[9.57494]

[10.4056]

    0, 12, MONS_DRAGON, MONS_SKELETAL_DRAGON, MH_UNDEAD, -4,

Insertion in crawl-ref/source/misc.h at line 112 [4.1928926]
[11.2964]
[12.10009]
```
bool is_dragonkind(const actor *act, const monsters *mon);
```

Insertion in crawl-ref/source/misc.cc at line 2864 [4.1933596]

[11.3201]


bool is_dragonkind(const actor *act, const monsters *mon)
{
    if (mons_genus(act->mons_species()) == MONS_DRAGON
        || mons_genus(act->mons_species()) == MONS_DRACONIAN)
    {
        return (true);
    }
    else if (act->atype() == ACT_PLAYER
        && you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON)
    {
        return (true);
    }
    else if (act->atype() == ACT_MONSTER
        && mons_is_zombified(mon)
        && (mons_genus(mon->base_monster) == MONS_DRAGON
            || mons_genus(mon->base_monster) == MONS_DRACONIAN))
    {
        return (true);
    }
    return (false);
}

Replacement in crawl-ref/source/fight.cc at line 2173 [4.3140790]

B:BD[13.4471] → [13.4471:4535]

B:BD[13.4535] → [14.4116:4302]

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

[13.4471]

[15.8208]

        if (is_dragonkind(defender, def))