fiddlerwoaroof/crawl - Change 5OFUF2JHXEX5AF5CDY4KATIAFKIHDKTV463PIJZN3IXEIJWDNVYAC

Make your_spells() only give the "Invalid spell!" message if the spell type

is truly invalid. If it's a valid but monster-only spell:

If the user is in wizard mode then temporarily place a dummy monster on the same square as the player and use it to cast the monster spell (this lets monster spells be cast via wizard commands for testing purposes).
If the user isn't in wizard mode then give the message "Spell '[spellname]' is not a player castable spell.", which provides more useful debugging info than just "Invalid spell!"

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

Created by zelgadis on July 2, 2008

5OFUF2JHXEX5AF5CDY4KATIAFKIHDKTV463PIJZN3IXEIJWDNVYAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 44 [3.293070]
[3.293869]
[3.293869]
```
#include "mstuff2.h"
```

Insertion in crawl-ref/source/spl-cast.cc at line 912 [3.293070]

[4.5417]


#ifdef WIZARD
static void _try_monster_cast(spell_type spell, int powc,
                              dist &spd, bolt &beam)
{
    if (mgrd(you.pos()) != NON_MONSTER)
    {
        mpr("Couldn't try casting monster spell because you're "
            "on top of a monster.");
        return;
    }
    int midx;
    for (midx = 0; midx < MAX_MONSTERS; midx++)
        if (menv[midx].type == -1)
            break;

Insertion in crawl-ref/source/spl-cast.cc at line 930 [3.293070]

[4.5418]

[2.161]

    if (midx == MAX_MONSTERS)
    {
        mpr("Couldn't try casting monster spell because there is "
            "no empty monster slot.");
        return;
    }
    mpr("Invalid player spell, attemtping to cast it as monster spell.");
    monsters* mon = &menv[midx];
    mon->mname      = "Dummy Monster";
    mon->type       = MONS_HUMAN;
    mon->behaviour  = BEH_SEEK;
    mon->attitude   = ATT_FRIENDLY;
    mon->flags      = (MF_CREATED_FRIENDLY | MF_JUST_SUMMONED | MF_SEEN
                       | MF_WAS_IN_VIEW | MF_HARD_RESET);
    mon->hit_points = you.hp;
    mon->hit_dice   = you.experience_level;
    mon->x          = you.x_pos;
    mon->y          = you.y_pos;
    mon->target_x   = spd.tx;
    mon->target_y   = spd.ty;
    if (!spd.isTarget)
        mon->foe = MHITNOT;
    else if (mgrd[spd.tx][spd.ty] == NON_MONSTER)
    {
        if (spd.isMe)
            mon->foe = MHITYOU;
        else
            mon->foe = MHITNOT;
    }
    else
        mon->foe = mgrd[spd.tx][spd.ty];
    mgrd(you.pos()) = midx;
    mons_cast(mon, beam, spell);
    mon->reset();
}
#endif // WIZARD

Replacement in crawl-ref/source/spl-cast.cc at line 2097 [3.293070]

B:BD[3.341559] → [3.341559:341590]

        mpr("Invalid spell!");

[3.341559]

[3.341590]

#ifdef WIZARD
        if (you.wizard && !allow_fail && is_valid_spell(spell))
        {
            _try_monster_cast(spell, powc, spd, beam);
            return (SPRET_SUCCESS);
        }
#endif
        if (is_valid_spell(spell))
            mprf(MSGCH_ERROR, "Spell '%s' is not a player castable spell.",
                 spell_title(spell));
        else
            mpr("Invalid spell!", MSGCH_ERROR);