fiddlerwoaroof/crawl - Change AAHHHRIYK53GIYQOZIGCBFI6ZM3SKN7OBRNLHQ5WVKV73MPK2H5QC

The arena tag "real_summons" causes summoned monsters to be turned real as

soon as they're placed, allowing them to drop items and corpses and protecting them from abjuration and timing out. (Still doesn't let summoned monster be created with throwing nets, though)

The arena tag "no_chain_summons" strips summoning spells from summoned monsters (even in conjunction with "real_summons"), while not stripping such spells from the original arena monsters. (Though for some reason it doesn't prevent summoned Lom Lobon from summoning ball lightning)

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

Created by zelgadis on January 5, 2009

AAHHHRIYK53GIYQOZIGCBFI6ZM3SKN7OBRNLHQ5WVKV73MPK2H5QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/arena.cc at line 57 [4.10815]

∅:D[2.2929] → [3.4181:4281]

B:BD[4.11725] → [3.4181:4281]

B:BD[3.4281] → [2.2930:2998]

    bool allow_summons   = true;
    bool allow_zero_xp   = false;
    bool allow_immobile  = true;
    bool name_monsters   = false;
    bool random_uniques  = false;

[2.2929]

[2.2998]

    bool allow_summons       = true;
    bool allow_chain_summons = true;
    bool allow_zero_xp       = false;
    bool allow_immobile      = true;
    bool name_monsters       = false;
    bool random_uniques      = false;
    bool real_summons        = false;

Insertion in crawl-ref/source/arena.cc at line 79 [4.10815]

[4.11816]

    void zap_summons(monsters* mons)
    {
        monster_spells &spells(mons->spells);
        for (int i = 0; i < NUM_MONSTER_SPELL_SLOTS; ++i)
        {
            spell_type sp = spells[i];
            if (spell_typematch(sp, SPTYP_SUMMONING))
                spells[i] = SPELL_NO_SPELL;
        }
    }

Replacement in crawl-ref/source/arena.cc at line 99 [4.10815]

B:BD[4.12060] → [4.12060:12378]


                monster_spells &spells(mons->spells);
                for (int i = 0; i < NUM_MONSTER_SPELL_SLOTS; ++i)
                {
                    spell_type sp = spells[i];
                    if (spell_typematch(sp, SPTYP_SUMMONING))
                        spells[i] = SPELL_NO_SPELL;
                }

[4.12060]

[4.12378]

                zap_summons(mons);

Insertion in crawl-ref/source/arena.cc at line 258 [4.10815]

[5.4361]


        allow_chain_summons = !strip_tag(spec, "no_chain_summons");

Replacement in crawl-ref/source/arena.cc at line 261 [4.10815]

B:BD[5.4362] → [3.4385:4560]

        allow_summons  = !strip_tag(spec, "no_summons");
        allow_immobile = !strip_tag(spec, "no_immobile");
        allow_zero_xp  =  strip_tag(spec, "allow_zero_xp");

[5.4362]

[3.4560]

        allow_summons    = !strip_tag(spec, "no_summons");
        allow_immobile   = !strip_tag(spec, "no_immobile");
        allow_zero_xp    =  strip_tag(spec, "allow_zero_xp");
        real_summons     =  strip_tag(spec, "real_summons");

Insertion in crawl-ref/source/arena.cc at line 761 [4.10815]

[2.4425]

[3.6885]


    if (monster->is_summoned())
    {
        // Real summons drop corpses and items.
        if (arena::real_summons)
        {
            monster->del_ench(ENCH_ABJ, true, false);
            for (int i = 0; i < NUM_MONSTER_SLOTS; i++)
            {
                short it = monster->inv[i];
                if (it != NON_ITEM)
                    mitm[it].flags &= ~ISFLAG_SUMMONED;
            }
        }
        if (!arena::allow_chain_summons)
            arena::zap_summons(monster);
    }