fiddlerwoaroof/crawl - Change YX2LDGNQNB6AQRKAVXNYQ473X6EVPQEBT5AJKBIIWFIMS3U2BNQQC

Experimental support for monster shields, needs more work for rationalising shield class for monsters with player and beam to-hit.

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

Created by dshaligram on November 2, 2007

YX2LDGNQNB6AQRKAVXNYQ473X6EVPQEBT5AJKBIIWFIMS3U2BNQQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 2768 [5.1699344]

B:BD[4.4580] → [4.4580:4617]

    ac += property( item, PARM_AC );

[4.4580]

[4.4617]

    const equipment_type eq = get_armour_slot(item);
    if (eq != EQ_SHIELD)
    {
        ac += property( item, PARM_AC );

Replacement in crawl-ref/source/mon-util.cc at line 2773 [5.1699344]

B:BD[4.4618] → [4.4618:4751]

    const int armour_plus = item.plus;
    ASSERT(abs(armour_plus) < 20);
    if (abs(armour_plus) < 20) 
        ac += armour_plus;

[4.4618]

[4.4751]

        const int armour_plus = item.plus;
        ASSERT(abs(armour_plus) < 20);
        if (abs(armour_plus) < 20)
            ac += armour_plus;
    }
    // Shields can affect evasion.

Deletion in crawl-ref/source/mon-util.cc at line 2781 [5.1699344]
B:BD[4.4797] → [4.4797:4806]
```
        
```

Replacement in crawl-ref/source/mon-util.cc at line 2850 [5.1699344]

B:BD[4.6209] → [4.6209:6246]

    ac -= property( item, PARM_AC );

[4.6209]

[4.6246]

    const equipment_type eq = get_armour_slot(item);
    if (eq != EQ_SHIELD)
    {
        ac -= property( item, PARM_AC );

Replacement in crawl-ref/source/mon-util.cc at line 2855 [5.1699344]

B:BD[4.6247] → [4.6247:6380]

    const int armour_plus = item.plus;
    ASSERT(abs(armour_plus) < 20);
    if (abs(armour_plus) < 20) 
        ac -= armour_plus;

[4.6247]

[4.6380]

        const int armour_plus = item.plus;
        ASSERT(abs(armour_plus) < 20);
        if (abs(armour_plus) < 20) 
            ac -= armour_plus;
    }

Deletion in crawl-ref/source/mon-util.cc at line 2862 [5.1699344]
B:BD[4.6426] → [4.6426:6435]
```
        
```

Insertion in crawl-ref/source/mon-util.cc at line 3117 [5.1699344]

[2.403]

}
static mon_inv_type equip_slot_to_mslot(equipment_type eq)
{
    switch (eq)
    {
    case EQ_WEAPON: return MSLOT_WEAPON;
    case EQ_BODY_ARMOUR: return MSLOT_ARMOUR;
    case EQ_SHIELD: return MSLOT_SHIELD;
    default: return (NUM_MONSTER_SLOTS);
    }

Replacement in crawl-ref/source/mon-util.cc at line 3137 [5.1699344]

B:BD[2.586] → [2.586:696]

    // XXX: Monsters can only equip body armour (as of 0.3).
    if (get_armour_slot(item) != EQ_BODY_ARMOUR)

[2.586]

[2.696]

    const equipment_type eq = get_armour_slot(item);
    // XXX: Monsters can only equip body armour and shields (as of 0.4).
    // They can still be forced to wear stuff - this is needed for bardings.
    if (!force && eq != EQ_BODY_ARMOUR && eq != EQ_SHIELD)

Insertion in crawl-ref/source/mon-util.cc at line 3143 [5.1699344]
[2.721]
[2.721]
```
    const mon_inv_type mslot = equip_slot_to_mslot(eq);
```

Replacement in crawl-ref/source/mon-util.cc at line 3145 [5.1699344]

B:BD[2.783] → [2.783:852]

    if (const item_def *existing_armour = slot_item(EQ_BODY_ARMOUR))

[2.783]

[2.852]

    if (const item_def *existing_armour = slot_item(eq))

Replacement in crawl-ref/source/mon-util.cc at line 3150 [5.1699344]
B:BD[2.967] → [2.967:1011]
```
        if (!drop_item(MSLOT_ARMOUR, near))
```
[2.967]
[2.1011]
```
        if (!drop_item(mslot, near))
```
Replacement in crawl-ref/source/mon-util.cc at line 3154 [5.1699344]
B:BD[2.1046] → [2.1046:1091]
```
    return pickup(item, MSLOT_ARMOUR, near);
```
[2.1046]
[2.1091]
```
    return pickup(item, mslot, near);
```

Deletion in crawl-ref/source/mon-util.cc at line 3325 [5.1699344]

B:BD[6.17561] → [6.17561:17631]

∅:D[6.17631] → [7.11865:11974]

B:BD[7.11865] → [7.11865:11974]

B:BD[7.11974] → [6.17632:17673]

    }
}
static mon_inv_type equip_slot_to_mslot(equipment_type eq)
{
    switch (eq)
    {
    case EQ_WEAPON: return MSLOT_WEAPON;
    case EQ_BODY_ARMOUR: return MSLOT_ARMOUR;
    default: return (NUM_MONSTER_SLOTS);

Replacement in crawl-ref/source/mon-util.cc at line 3341 [5.1699344]
B:BD[8.9782] → [8.9782:9801]
```
    return (NULL);
```
[8.9782]
[8.9801]
```
    return (mslot_item(MSLOT_SHIELD));
```
Deletion in crawl-ref/source/mon-util.cc at line 3481 [5.1699344]
B:BD[7.13275] → [7.13275:13328]
```
    // XXX: Monsters don't actually get shields yet.
```

Replacement in crawl-ref/source/mon-util.cc at line 3485 [5.1699344]

B:BD[7.13467] → [7.13467:13529]

        return (random2(shld_c + random2(hit_dice / 2)) / 2);

[7.13467]

[7.13529]

        return (random2(1 + shld_c) + random2(hit_dice / 2));

Replacement in crawl-ref/source/makeitem.cc at line 3225 [9.927]

B:BD[9.109561] → [9.109561:110011]

                             (temp_rand > 59) ? WPN_SHORT_SWORD :   // 20%
                             (temp_rand > 45) ? WPN_SCIMITAR :      // 14%
                             (temp_rand > 31) ? WPN_MACE :          // 14%
                             (temp_rand > 18) ? WPN_BOW :           // 13%
                             (temp_rand >  5) ? WPN_HAND_CROSSBOW   // 13%
                                              : WPN_LONGBOW);       //  6%

[9.109561]

[10.4843]

                         (temp_rand > 59) ? WPN_SHORT_SWORD :   // 20%
                         (temp_rand > 45) ? WPN_SCIMITAR :      // 14%
                         (temp_rand > 31) ? WPN_MACE :          // 14%
                         (temp_rand > 18) ? WPN_BOW :           // 13%
                         (temp_rand >  5) ? WPN_HAND_CROSSBOW   // 13%
                         : WPN_LONGBOW);       //  6%

Insertion in crawl-ref/source/makeitem.cc at line 3833 [9.927]

[9.125221]

static bool make_item_for_monster(
    monsters *mons,
    object_class_type base,
    int subtype,
    int level,
    item_make_species_type race = MAKE_ITEM_NO_RACE,
    int allow_uniques = 0)
{
    const int bp = get_item_slot();
    if (bp == NON_ITEM)
        return (false);
    const int thing_created =
        items( allow_uniques, base, subtype, true, level, race );
    if (thing_created == NON_ITEM)
        return (false);
    give_monster_item(mons, thing_created);
    return (true);
}
void give_shield(monsters *mon, int level)
{
    switch (mon->type)
    {
    case MONS_DAEVA:
        make_item_for_monster(mon, OBJ_ARMOUR, ARM_LARGE_SHIELD,
                              level * 2 + 1, MAKE_ITEM_RANDOM_RACE, 1);
        break;
        
    case MONS_DEEP_ELF_SOLDIER:
    case MONS_DEEP_ELF_FIGHTER:
        if (one_chance_in(5))
            make_item_for_monster(mon, OBJ_ARMOUR, ARM_BUCKLER,
                                  level, MAKE_ITEM_ELVEN);
        break;
    case MONS_NAGA_WARRIOR:
    case MONS_VAULT_GUARD:
        if (one_chance_in(3))
            make_item_for_monster(mon, OBJ_ARMOUR,
                                  one_chance_in(3)? ARM_LARGE_SHIELD
                                  : ARM_SHIELD,
                                  level, MAKE_ITEM_NO_RACE);
        break;
    case MONS_DRACONIAN_KNIGHT:
        if (coinflip())
            make_item_for_monster(mon, OBJ_ARMOUR,
                                  coinflip()? ARM_LARGE_SHIELD : ARM_SHIELD,
                                  level, MAKE_ITEM_NO_RACE);
        break;
    case MONS_DEEP_ELF_KNIGHT:
        if (coinflip())
            make_item_for_monster(mon, OBJ_ARMOUR, ARM_BUCKLER,
                                  level, MAKE_ITEM_ELVEN);
        break;
    case MONS_NORRIS:
        make_item_for_monster(mon, OBJ_ARMOUR, ARM_BUCKLER,
                              level * 2 + 1, MAKE_ITEM_RANDOM_RACE, 1);
        break;
    case MONS_NORBERT:
    case MONS_LOUISE:
        make_item_for_monster(mon, OBJ_ARMOUR, ARM_LARGE_SHIELD,
                              level * 2 + 1, MAKE_ITEM_RANDOM_RACE, 1);
        break;
    case MONS_DONALD:
        make_item_for_monster(mon, OBJ_ARMOUR, ARM_SHIELD,
                              level * 2 + 1, MAKE_ITEM_RANDOM_RACE, 1);
        break;
    }
}

Insertion in crawl-ref/source/makeitem.cc at line 4146 [9.927]
[9.130832]
[9.130832]
```
    give_shield(mons, 1 + level_number / 2);
```
Insertion in crawl-ref/source/fight.cc at line 547 [5.3140790]
[11.53304]
[5.3148392]
```
        const bool shield_blocked = attack_shield_blocked(true);
```

Replacement in crawl-ref/source/fight.cc at line 550 [5.3140790]

B:BD[5.3148393] → [8.33674:33809]

        // This actually does more than calculate damage - it also sets up
        // messages, etc.
        player_calc_hit_damage();

[5.3148393]

[5.3148918]

        if (shield_blocked)
            damage_done = 0;
        else
        {
            // This actually does more than calculate damage - it also sets up
            // messages, etc.
            player_calc_hit_damage();
        }

Replacement in crawl-ref/source/fight.cc at line 574 [5.3140790]
B:BD[3.5312] → [3.5312:5347]
```
        else if (damage_done <= 0)
```
[3.5312]
[3.5347]
```
        else if (!shield_blocked && damage_done <= 0)
```

Insertion in crawl-ref/source/fight.cc at line 594 [5.3140790]

[12.301]

[8.34303]


        // At this point, pretend we didn't hit at all.
        if (shield_blocked)
            did_hit = false;

Insertion in crawl-ref/source/fight.cc at line 868 [5.3140790]

[5.3157287]

[8.40683]

            if (attack_shield_blocked(true))
                continue;

Replacement in crawl-ref/source/fight.cc at line 2881 [5.3140790]

B:BD[13.837] → [13.837:929]

    mprf(MSGCH_DIAGNOSTICS, "Pro-block: %d, Con-block: %d",
         pro_block, con_block);

[13.837]

[13.929]

    mprf(MSGCH_DIAGNOSTICS, "Defender: %s, Pro-block: %d, Con-block: %d",
         def_name(DESC_PLAIN).c_str(), pro_block, con_block);

Insertion in crawl-ref/source/enum.h at line 1828 [5.3287960]
[5.3343206]
[6.23552]
```
    MSLOT_SHIELD,
```
Replacement in crawl-ref/source/debug.cc at line 1451 [5.4016436]
∅:D[14.4370] → [15.23778:23840]
∅:D[16.13059] → [15.23778:23840]
B:BD[15.23778] → [15.23778:23840]
```
         menv[i].foe, 
         menv[i].foe_memory,          
```
[14.4370]
[15.23840]
```
         menv[i].foe,
         menv[i].foe_memory,
```
Deletion in crawl-ref/source/beam.cc at line 3132 [5.4128068]
B:BD[5.4225558] → [5.4225558:4225603]
```
                        you.shield_blocks++;
```
Replacement in crawl-ref/source/beam.cc at line 3133 [5.4128068]
∅:D[17.1243810] → [5.4225783:4225841]
B:BD[5.4225783] → [5.4225783:4225841]
```
                        exercise( SK_SHIELDS, exer + 1 );
```
[17.1243810]
[5.4225841]
```
                        you.shield_block_succeeded();
```

Replacement in crawl-ref/source/beam.cc at line 3138 [5.4128068]

B:BD[5.4225968] → [5.4225968:4226018]

                    exercise( SK_SHIELDS, exer );

[5.4225968]

[5.4226018]

                    if (coinflip())
                        exercise( SK_SHIELDS, exer );

Insertion in crawl-ref/source/beam.cc at line 3879 [5.4128068]

[5.4239901]

    }
    // The monster may block the beam.
    if (!engulfs && beam_is_blockable(beam))
    {
        const int shield_block = mon->shield_bonus();
        if (shield_block > 0)
        {
            const int hit = random2( beam.hit * 130 / 100
                                     + mon->shield_block_penalty() );
            if (hit < shield_block && mons_near(mon)
                && player_monster_visible(mon))
            {
                mprf("%s blocks the %s.",
                     mon->name(DESC_CAP_THE).c_str(),
                     beam.name.c_str());
                mon->shield_block_succeeded();
                return (BEAM_STOP);
            }
        }

Experimental support for monster shields, needs more work for rationalising shield class for monsters with player and beam to-hit.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 2768 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2773 [5.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 2781 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2850 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2855 [5.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 2862 [5.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3117 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3137 [5.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3143 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3145 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3150 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3154 [5.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 3325 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3341 [5.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 3481 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3485 [5.1699344]

Replacement in crawl-ref/source/makeitem.cc at line 3225 [9.927]

Insertion in crawl-ref/source/makeitem.cc at line 3833 [9.927]

Insertion in crawl-ref/source/makeitem.cc at line 4146 [9.927]

Insertion in crawl-ref/source/fight.cc at line 547 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 550 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 574 [5.3140790]

Insertion in crawl-ref/source/fight.cc at line 594 [5.3140790]

Insertion in crawl-ref/source/fight.cc at line 868 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 2881 [5.3140790]

Insertion in crawl-ref/source/enum.h at line 1828 [5.3287960]

Replacement in crawl-ref/source/debug.cc at line 1451 [5.4016436]

Deletion in crawl-ref/source/beam.cc at line 3132 [5.4128068]

Replacement in crawl-ref/source/beam.cc at line 3133 [5.4128068]

Replacement in crawl-ref/source/beam.cc at line 3138 [5.4128068]

Insertion in crawl-ref/source/beam.cc at line 3879 [5.4128068]