fiddlerwoaroof/crawl - Change 2FWCWK23M4RXDNZ2WOCHAGSLXNOHLLCMLOZTVJMCOGLC54HMEUXAC

Fix [2586695]: you can no longer throw items (including via Portal

Projectile) if you can't wield weapons. Don't allow base-shape breath attacks when shapechanged, except for Nagas in spider form. Fix [2589913]: melded shields counted for heavy armour penalties.

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

Created by haranp on February 11, 2009

2FWCWK23M4RXDNZ2WOCHAGSLXNOHLLCMLOZTVJMCOGLC54HMEUXAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/transfor.cc at line 297 [6.143977]

B:BD[4.1221] → [5.805:863]

    if (prop_str >= you.strength || prop_int >= you.intel

[4.1221]

[5.863]

    if (prop_str >= you.strength
        || prop_int >= you.intel

Insertion in crawl-ref/source/transfor.cc at line 316 [6.143977]
[7.3019]
[8.588]
```
        const item_def& item = you.inv[you.equip[e]];
```

Replacement in crawl-ref/source/transfor.cc at line 321 [6.143977]

B:BD[8.687] → [8.687:715]

        if (e == EQ_WEAPON)

[8.687]

[8.715]

        if (e == EQ_WEAPON
            && item.base_type != OBJ_WEAPONS && item.base_type != OBJ_STAVES)

Replacement in crawl-ref/source/transfor.cc at line 324 [6.143977]

B:BD[8.725] → [8.725:889]

            const item_def item = you.inv[ you.equip[e] ];
            if (item.base_type != OBJ_WEAPONS && item.base_type != OBJ_STAVES)
                continue;

[8.725]

[8.889]

            continue;

Replacement in crawl-ref/source/transfor.cc at line 327 [6.143977]

B:BD[7.3020] → [7.3020:3067]

        item_def item = you.inv[you.equip[e]];

[7.3020]

[7.3067]

        // Currently, the only nonartefacts which have stat-changing
        // effects are rings.

Replacement in crawl-ref/source/transfor.cc at line 331 [6.143977]

B:BD[7.3122] → [7.3122:3179]

            if (!item_ident( item, ISFLAG_KNOW_PLUSES ))

[7.3122]

[7.3179]

            if (!item_ident(item, ISFLAG_KNOW_PLUSES))

Replacement in crawl-ref/source/transfor.cc at line 336 [6.143977]

B:BD[7.3255] → [7.3255:3706]

            case RING_STRENGTH:
                if (item.plus != 0)
                    prop_str += item.plus;
                break;
            case RING_DEXTERITY:
                if (item.plus != 0)
                    prop_dex += item.plus;
                break;
            case RING_INTELLIGENCE:
                if (item.plus != 0)
                    prop_int += item.plus;
                break;
            default:
                break;

[7.3255]

[7.3706]

            case RING_STRENGTH:     prop_str += item.plus; break;
            case RING_DEXTERITY:    prop_dex += item.plus; break;
            case RING_INTELLIGENCE: prop_int += item.plus; break;
            default:                                       break;

Replacement in crawl-ref/source/transfor.cc at line 343 [6.143977]
B:BD[7.3731] → [7.3731:3771]
```
        if (is_random_artefact( item ))
```
[7.3731]
[7.3771]
```
        if (is_random_artefact(item))
```

Replacement in crawl-ref/source/transfor.cc at line 354 [6.143977]

B:BD[7.4287] → [7.4287:4349]

        if (prop_str >= you.strength || prop_int >= you.intel

[7.4287]

[7.4349]

        if (prop_str >= you.strength
            || prop_int >= you.intel

Replacement in crawl-ref/source/transfor.cc at line 835 [6.143977]
∅:D[9.362] → [6.155487:155585]
∅:D[10.467] → [6.155487:155585]
∅:D[11.1524] → [6.155487:155585]
B:BD[6.155487] → [6.155487:155585]
```
    you.attribute[ ATTR_TRANSFORMATION ] = TRAN_NONE;
    you.duration[ DUR_TRANSFORMATION ] = 0;
```
[11.1524]
[6.155585]
```
    you.attribute[ATTR_TRANSFORMATION] = TRAN_NONE;
    you.duration[DUR_TRANSFORMATION] = 0;
```

Replacement in crawl-ref/source/religion.cc at line 6638 [6.804403]

B:BD[12.2912] → [13.2995:3076]

bool god_hates_your_god(god_type god,
                        god_type your_god)

[12.2912]

[12.2950]

bool god_hates_your_god(god_type god, god_type your_god)

Replacement in crawl-ref/source/religion.cc at line 6653 [6.804403]

B:BD[13.3169] → [13.3169:3282]

std::string god_hates_your_god_reaction(god_type god,
                                        god_type your_god)

[13.3169]

[13.3282]

std::string god_hates_your_god_reaction(god_type god, god_type your_god)

Insertion in crawl-ref/source/religion.cc at line 6768 [6.804403]
[14.69460]
[2.2531]
```
        {
```

Replacement in crawl-ref/source/religion.cc at line 6771 [6.804403]

B:BD[14.69498] → [14.69498:69845]

                case GOD_BEOGH:
                    death_type = KILLED_BY_BEOGH_SMITING;
                    break;
                case GOD_SHINING_ONE:
                    death_type = KILLED_BY_TSO_SMITING;
                    break;
                default:
                    death_type = KILLED_BY_DIVINE_WRATH;
                    break;

[14.69498]

[14.69845]

                case GOD_BEOGH:     death_type = KILLED_BY_BEOGH_SMITING; break;
                case GOD_SHINING_ONE: death_type = KILLED_BY_TSO_SMITING; break;
                default:            death_type = KILLED_BY_DIVINE_WRATH;  break;

Insertion in crawl-ref/source/religion.cc at line 6775 [6.804403]
[14.69859]
[14.69859]
```
        }
```
Replacement in crawl-ref/source/religion.cc at line 6782 [6.804403]
B:BD[14.69998] → [2.2557:2588]
∅:D[2.2588] → [14.70030:70064]
B:BD[14.70030] → [14.70030:70064]
```
            aux = "smote by ";
            aux += god_name(god);
```
[14.69998]
[14.70064]
```
            aux = "smote by " + god_name(god);
```

Replacement in crawl-ref/source/religion.cc at line 6810 [6.804403]

B:BD[15.3005] → [15.3005:3065]

    const int max_chunks = mons_weight( mons_class ) / 150;

[15.3005]

[16.17404]

    const int max_chunks = mons_weight(mons_class) / 150;

Replacement in crawl-ref/source/religion.cc at line 6953 [6.804403]

B:BD[6.888349] → [17.2705:2768]

    std::string msg = god_name(which_deity);
    msg += event;

[6.888248]

[3.2747]

    std::string msg = god_name(which_deity) + event;

Replacement in crawl-ref/source/item_use.cc at line 1478 [6.2781507]

B:BD[18.7198] → [18.7198:7254]

    if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)

[18.7198]

[18.7254]

    // FIXME: merge this into transform_can_equip_slot()
    const int trans = you.attribute[ATTR_TRANSFORMATION];
    // If you can't wield it, you can't throw it.
    if (trans == TRAN_SPIDER
        || trans == TRAN_BLADE_HANDS
        || trans == TRAN_ICE_BEAST
        || trans == TRAN_DRAGON
        || trans == TRAN_SERPENT_OF_HELL
        || trans == TRAN_AIR
        || trans == TRAN_BAT)

Replacement in crawl-ref/source/describe.cc at line 598 [6.3736416]
B:BD[19.983271] → [19.983271:983326]
```
        return trap_names[ static_cast<int>( trap ) ];
```
[19.983271]
[19.983326]
```
        return trap_names[trap];
```

Replacement in crawl-ref/source/abl-show.cc at line 2092 [6.4494389]

B:BD[6.4536453] → [6.4536453:4536485]

    if (you.species == SP_NAGA)

[6.4536118]

[6.4536485]

    // Spit Poison. Nontransformed nagas can upgrade to Breathe Poison.
    // Transformed nagas, or non-nagas, can only get Spit Poison.
    if (you.species == SP_NAGA
        && (!transform_changed_physiology()
            || you.attribute[ATTR_TRANSFORMATION] == TRAN_SPIDER))

Replacement in crawl-ref/source/abl-show.cc at line 2101 [6.4494389]

B:BD[6.4536655] → [20.36160:36213]

∅:D[20.36213] → [21.5505:5570]

B:BD[6.4536699] → [21.5505:5570]

    else if (player_mutation_level(MUT_SPIT_POISON))
        _add_talent(talents, ABIL_SPIT_POISON, check_confused );

[6.4536655]

[6.4536755]

    else if (player_mutation_level(MUT_SPIT_POISON)
             || player_mutation_level(MUT_BREATHE_POISON))
    {
        _add_talent(talents, ABIL_SPIT_POISON, check_confused);
    }

Replacement in crawl-ref/source/abl-show.cc at line 2107 [6.4494389]

B:BD[6.4536756] → [6.4536756:4536795]

    if (player_genus(GENPC_DRACONIAN))

[6.4536756]

[6.4536795]

    if (player_genus(GENPC_DRACONIAN)
        && you.experience_level >= 7
        && !transform_changed_physiology())

Replacement in crawl-ref/source/abl-show.cc at line 2111 [6.4494389]

B:BD[6.4536801] → [6.4536801:4536850]

B:BD[6.4536850] → [22.19214:19257]

∅:D[23.1664] → [6.4536874:4537102]

∅:D[22.19257] → [6.4536874:4537102]

B:BD[6.4536874] → [6.4536874:4537102]

B:BD[6.4537102] → [24.3311:3383]

∅:D[24.3383] → [6.4537174:4537406]

B:BD[6.4537174] → [6.4537174:4537406]

B:BD[6.4537406] → [25.7310:7465]

∅:D[25.7465] → [22.19330:19375]

B:BD[22.19330] → [22.19330:19375]

B:BD[22.19375] → [21.5571:5635]

∅:D[26.1700] → [6.4537621:4537631]

∅:D[21.5635] → [6.4537621:4537631]

∅:D[22.19438] → [6.4537621:4537631]

B:BD[6.4537621] → [6.4537621:4537631]

        if (you.experience_level >= 7)
        {
            const ability_type ability = (
                (you.species == SP_GREEN_DRACONIAN)  ? ABIL_BREATHE_POISON :
                (you.species == SP_RED_DRACONIAN)    ? ABIL_BREATHE_FIRE :
                (you.species == SP_WHITE_DRACONIAN)  ? ABIL_BREATHE_FROST :
                (you.species == SP_YELLOW_DRACONIAN) ? ABIL_SPIT_ACID :
                (you.species == SP_BLACK_DRACONIAN)  ? ABIL_BREATHE_LIGHTNING :
                (you.species == SP_PURPLE_DRACONIAN) ? ABIL_BREATHE_POWER :
                (you.species == SP_PALE_DRACONIAN)   ? ABIL_BREATHE_STEAM :
                (you.species == SP_MOTTLED_DRACONIAN)? ABIL_BREATHE_STICKY_FLAME
                                                     : ABIL_NON_ABILITY);
            if (ability != ABIL_NON_ABILITY)
                _add_talent(talents, ability, check_confused );
        }

[6.4536801]

[6.4537631]

        const ability_type ability = (
            (you.species == SP_GREEN_DRACONIAN)  ? ABIL_BREATHE_POISON :
            (you.species == SP_RED_DRACONIAN)    ? ABIL_BREATHE_FIRE :
            (you.species == SP_WHITE_DRACONIAN)  ? ABIL_BREATHE_FROST :
            (you.species == SP_YELLOW_DRACONIAN) ? ABIL_SPIT_ACID :
            (you.species == SP_BLACK_DRACONIAN)  ? ABIL_BREATHE_LIGHTNING :
            (you.species == SP_PURPLE_DRACONIAN) ? ABIL_BREATHE_POWER :
            (you.species == SP_PALE_DRACONIAN)   ? ABIL_BREATHE_STEAM :
            (you.species == SP_MOTTLED_DRACONIAN)? ABIL_BREATHE_STICKY_FLAME
                                                 : ABIL_NON_ABILITY);
        if (ability != ABIL_NON_ABILITY)
            _add_talent(talents, ability, check_confused );

Replacement in crawl-ref/source/abl-show.cc at line 2132 [6.4494389]
∅:D[27.7519] → [28.2396:2427]
B:BD[29.27406] → [28.2396:2427]
```
    if (!player_is_airborne())
```
[27.7519]
[6.4538015]
```
    if (!player_is_airborne() && !transform_changed_physiology())
```
Deletion in crawl-ref/source/abl-show.cc at line 2256 [6.4494389]
B:BD[6.4545202] → [30.16417:16474]
```
    // jmf: "upgrade" for draconians -- expensive flight
```