fiddlerwoaroof/crawl - Change 23PFLB2E4QHL5SF3Q2YV5FXRH6MFHENEU2ACVC572ZCYDXCBZVQAC

Remove GLAMOUR, and introduce RECITE (new Zin invocation)

The latter is a work in progress and may have strange results. It is intended as a multiturn invocation that is interrupted by large hp losses. IMHO, reciting things is an action that needs to take several turns. Each turn an attempt at influencing intelligent monsters is made. They usually fall asleep, are confused or turn berserk. The delay gets cancelled when the player is heavily wounded or when there are no impressionable monsters around anymore.

I think the power formula will have to be tweaked.

Comments welcome!

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

Created by j-p-e-g on January 24, 2008

23PFLB2E4QHL5SF3Q2YV5FXRH6MFHENEU2ACVC572ZCYDXCBZVQAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spl-data.h at line 1981 [5.268152]
B:BD[5.289394] → [5.289394:289448]
B:BD[5.289448] → [6.123961:123979]
B:BD[6.123979] → [7.4083:4091]
B:BD[7.4091] → [8.2703:2713]
∅:D[8.2713] → [7.4091:4101]
B:BD[7.4091] → [7.4091:4101]
∅:D[7.4101] → [5.289455:289461]
B:BD[5.289455] → [5.289455:289461]
```
    SPELL_GLAMOUR, "Glamour",
     SPTYP_ENCHANTMENT,
     SPFLAG_NONE,
     5,
     200,
     NULL
},
{
```
Deletion in crawl-ref/source/spl-cast.cc at line 1830 [5.293070]
B:BD[5.340188] → [5.340188:340256]
```
        break;
    case SPELL_GLAMOUR:
        cast_glamour(powc);
```
Deletion in crawl-ref/source/spl-book.cc at line 1119 [5.397614]
B:BD[5.425693] → [5.425693:425721]
```
        case SPELL_GLAMOUR:
```
Deletion in crawl-ref/source/spells4.h at line 40 [5.434549]
∅:D[6.142585] → [5.435464:435492]
B:BD[5.435464] → [5.435464:435492]
```
void cast_glamour(int pow);
```

Deletion in crawl-ref/source/spells4.cc at line 1521 [5.436250]

B:BD[5.483746] → [5.483746:484245]

B:BD[5.484245] → [6.143483:143531]

∅:D[6.143531] → [5.484287:484430]

B:BD[5.484287] → [5.484287:484430]


// intended as a high-level Elven (a)bility
static int glamour_monsters(int x, int y, int pow, int garbage)
{
    UNUSED( garbage );
    int mon = mgrd[x][y];
    // Power in this function is already limited by a function of
    // experience level (10 + level / 2) since it's only an ability,
    // never an actual spell. -- bwr
    if (mon == NON_MONSTER)
        return (0);
    if (one_chance_in(5))
        return (0);
    if (mons_intel(menv[mon].type) < I_NORMAL)
        return (0);
    if (mons_class_holiness(mon) != MH_NATURAL)
        return (0);
    if (!mons_is_humanoid( menv[mon].type ))
        return (0);
    const char show_char = mons_char( menv[mon].type );

Deletion in crawl-ref/source/spells4.cc at line 1522 [5.436250]

B:BD[5.484431] → [5.484431:484991]

B:BD[5.484991] → [9.3088:3127]

∅:D[9.3127] → [5.485037:485076]

B:BD[5.485037] → [5.485037:485076]

B:BD[5.485076] → [10.213:281]

∅:D[10.281] → [5.485127:485166]

∅:D[9.3172] → [5.485127:485166]

B:BD[5.485127] → [5.485127:485166]

B:BD[5.485166] → [9.3173:3213]

∅:D[9.3213] → [5.485213:485403]

B:BD[5.485213] → [5.485213:485403]

B:BD[5.485403] → [11.434:490]

∅:D[11.490] → [5.485465:485520]

∅:D[12.519] → [5.485465:485520]

∅:D[13.15103] → [5.485465:485520]

B:BD[5.485465] → [5.485465:485520]

B:BD[5.485520] → [13.15104:15140]

∅:D[13.15140] → [5.485563:485598]

B:BD[5.485563] → [5.485563:485598]

B:BD[5.485598] → [13.15141:15186]

∅:D[13.15186] → [5.485650:485685]

B:BD[5.485650] → [5.485650:485685]

B:BD[5.485685] → [13.15187:15223]

B:BD[13.15223] → [14.148:249]

∅:D[14.249] → [13.15224:15276]

B:BD[5.485776] → [13.15224:15276]

∅:D[13.15276] → [5.485842:485861]

B:BD[5.485842] → [5.485842:485861]

B:BD[5.485861] → [2.148:164]

∅:D[2.164] → [13.15277:15316]

B:BD[5.485877] → [13.15277:15316]

∅:D[13.15316] → [5.485923:485953]

B:BD[5.485923] → [5.485923:485953]

B:BD[5.485953] → [13.15317:15343]

∅:D[13.15343] → [5.485972:486185]

B:BD[5.485972] → [5.485972:486185]

    // gargoyles are immune.
    if (menv[mon].type == MONS_GARGOYLE
        || menv[mon].type == MONS_METAL_GARGOYLE
        || menv[mon].type == MONS_MOLTEN_GARGOYLE)
    {
        return (0);
    }
    // orcs resist thru hatred of elves
    // elves resist cause they're elves
    // boggarts are malevolent highly magical wee-folk
    if (show_char == 'o' || show_char == 'e' || menv[mon].type == MONS_BOGGART)
        pow = (pow / 2) + 1;
    if (check_mons_resist_magic(&menv[mon], pow))
        return (0);
    switch (random2(6))
    {
    case 0:
        menv[mon].add_ench(ENCH_FEAR);
        break;
    case 1:
    case 4:
        menv[mon].add_ench(mon_enchant(ENCH_CONFUSION, 0, KC_YOU));
        break;
    case 2:
    case 5:
        menv[mon].add_ench(ENCH_CHARM);
        break;
    case 3:
        menv[mon].behaviour = BEH_SLEEP;
        break;
    }
    // why no, there's no message as to which effect happened >:^)
    if (!one_chance_in(4))
    {
        std::string msg = menv[mon].name(DESC_CAP_THE);
        switch (random2(4))
        {
        case 0:
            msg += " looks dazed.";
            break;
        case 1:
            msg += " blinks several times.";
            break;
        case 2:
            msg += " rubs its eye";
            if (menv[mon].type != MONS_CYCLOPS &&
                menv[mon].type != MONS_POLYPHEMUS)
                msg += "s";
            msg += ".";
            break;
        case 3:
            msg += " tilts its head.";
            break;
        }
        mpr(msg.c_str());
    }
    return (1);
}                               // end glamour_monsters()
void cast_glamour(int pow)
{
    apply_area_visible(glamour_monsters, pow);
}                               // end cast_glamour()

Replacement in crawl-ref/source/religion.cc at line 192 [5.804403]
B:BD[15.408] → [16.5544:5554]
```
    { "",
```
[15.408]
[16.5554]
```
    { "recite Zin's Axioms of Law",
```
Replacement in crawl-ref/source/religion.cc at line 277 [5.804403]
B:BD[15.2597] → [16.5679:5689]
```
    { "",
```
[15.2597]
[16.5689]
```
    { "recite Zin's Axioms of Law",
```
Replacement in crawl-ref/source/mon-util.cc at line 1791 [5.1699344]
B:BD[17.8019] → [17.8019:8060]
```
    return (m->attitude == ATT_NEUTRAL);
```
[17.8019]
[5.1733724]
```
    return (m->attitude == ATT_NEUTRAL || m->has_ench(ENCH_NEUTRAL));
```
Replacement in crawl-ref/source/mon-util.cc at line 4341 [5.1699344]
B:BD[18.506] → [19.3422:3455]
```
        case ENCH_BATTLE_FRENZY:
```
[18.506]
[20.2817]
```
        case ENCH_BATTLE_FRENZY: case ENCH_NEUTRAL:
```
Insertion in crawl-ref/source/initfile.cc at line 482 [5.2957258]
[6.788845]
[6.788845]
```
        "interrupt_recite = teleport",
```
Deletion in crawl-ref/source/enum.h at line 39 [5.3287960]
B:BD[5.3289440] → [5.3289440:3289458]
```
    ABIL_GLAMOUR,
```

Replacement in crawl-ref/source/enum.h at line 77 [5.3287960]

B:BD[21.2372] → [16.16950:16997]

    ABIL_ZIN_SMITING = 110,            //  110

[21.2372]

[16.16997]

    ABIL_ZIN_RECITE = 110,             //  110
    ABIL_ZIN_SMITING,

Insertion in crawl-ref/source/enum.h at line 707 [5.3287960]
[5.3306256]
[6.909673]
```
    DELAY_RECITE,  // Zin's Recite invocation
```
Deletion in crawl-ref/source/enum.h at line 1079 [5.3287960]
B:BD[5.3311918] → [22.4522:4539]
```
    DUR_GLAMOUR,
```
Insertion in crawl-ref/source/enum.h at line 1125 [5.3287960]
[19.4719]
[23.2558]
```
    ENCH_NEUTRAL,
```
Deletion in crawl-ref/source/enum.h at line 2516 [5.3287960]
B:BD[5.3367478] → [5.3367478:3367556]
```
    SPELL_GLAMOUR,      // charm/confuse/sleep but only "smart" creatures 190
```
Insertion in crawl-ref/source/delay.h at line 77 [5.3962990]
[24.1441]
[5.3963390]
```
bool check_recital_audience( void );
```

Insertion in crawl-ref/source/delay.cc at line 54 [5.3963459]

[25.2927]

[6.993769]


// monster cannot be affected in these states
static bool recite_mons_useless(const monsters *mon)
{
    return (mons_is_fleeing(mon)
            || mons_is_sleeping(mon)
            || mons_friendly(mon)
            || mons_neutral(mon)
            || mon->has_ench(ENCH_BERSERK));
}
static int recite_to_monsters(int x, int y, int pow, int turn)
{
    const int mon = mgrd[x][y];
    if (mon == NON_MONSTER)
        return (0);
    monsters *mons = &menv[mon];
    // monster must be intelligent
    if (mons_intel(mons->type) < I_NORMAL)
        return (0);
    if (recite_mons_useless(mons))
        return (0);
    int attempt = 3 - turn;
    bool bad_effect =
        (mons_class_holiness(mon) == MH_DEMONIC? !one_chance_in(8)
                                               : pow < random2(attempt*5));
    // 50% chance nothing happens
    if (bad_effect && coinflip())
        return (0);
    bool resist = check_mons_resist_magic(mons, pow);
    if (bad_effect) // can still have positive effects
    {
        if (!resist)
        {
            if (one_chance_in(3) && mons->add_ench(mon_enchant(ENCH_CONFUSION,
                                     0, KC_YOU, (16 + random2avg(13, 2)) * 10)))
            {
                simple_monster_message(mons, " looks confused.");
                return (1);
            }
            if (one_chance_in(4) && mons->add_ench(ENCH_FEAR))
            {
                simple_monster_message(mons, " turns to flee.");
                return (1);
            }
            if (one_chance_in(4))
            {
                mons->put_to_sleep();
                simple_monster_message(mons, " falls asleep!");
                return (1);
            }
        }
        if (one_chance_in(3) && mons->add_ench(mon_enchant(ENCH_HASTE, 0,
                                  KC_YOU, (16 + random2avg(13, 2)) * 10)))
        {
            simple_monster_message(mons, " is annoyed!");
            return (1);
        }
        if (mons->can_go_berserk()) // seriously annoyed now
        {
            mons->go_berserk(true);
            return (1);
        }
        return (0); // no effect
    }
    if (resist)
    {
        simple_monster_message(mons, " resists!");
        return (0);
    }
    switch (random2(pow))
    {
      default: // nothing happens
         return (0);
      case 6:
      case 7:
         if (mons->add_ench(ENCH_FEAR))
         {
             simple_monster_message(mons, " turns to flee.");
             return (1);
         }
         break;
      case 8:
      case 9:
         mons->put_to_sleep();
         simple_monster_message(mons, " falls asleep!");
         return (1);
      case 10:
      case 11:
      case 12:
         if (mons->add_ench(mon_enchant(ENCH_CONFUSION, 0, KC_YOU,
                             (16 + random2avg(13, 2)) * 10)))
         {
             simple_monster_message(mons, " looks confused.");
             return (1);
         }
         break;
      case 13:
      case 14:
         if (mons->add_ench(mon_enchant(ENCH_PARALYSIS, 0, KC_YOU,
                             (16 + random2avg(13, 2)) * 10)))
         {
             simple_monster_message(mons, " is paralyzed!");
             return (1);
         }
         break;
      case 15:
      case 16:
      case 17:
      case 18:
         if (mons->add_ench(ENCH_NEUTRAL))
         {
             simple_monster_message(mons, " seems impressed!");
             return (1);
         }
         break;
      case 19:
      case 20:
         mons->attitude = ATT_NEUTRAL; // but same message as above
         simple_monster_message(mons, " seems impressed!"); 
         return (1);
    }

Insertion in crawl-ref/source/delay.cc at line 186 [5.3963459]
[6.993770]
[6.993770]
```
    return (0);
}       // end recite_to_monsters()
```

Insertion in crawl-ref/source/delay.cc at line 333 [5.3963459]

[5.3965809]

        
    case DELAY_RECITE:
        mpr( "You stop reciting.");
        pop_delay();
        break;

Insertion in crawl-ref/source/delay.cc at line 435 [5.3963459]

[26.684]

[27.18956]

}
// check whether there are monsters who might be influenced by Recite
bool check_recital_audience()
{
    int mid;
    monsters *mons;
    for (int x = you.x_pos - 8; x <= you.x_pos + 8; x++)
       for (int y = you.y_pos - 8; y <= you.y_pos + 8; y++)
       {
            if (!in_bounds(x,y) || !see_grid(x, y))
                continue;
            mid = mgrd[x][y];
            if (mid == NON_MONSTER)
                continue;
            mons = &menv[mid];
            // can not be affected in these states
            if (recite_mons_useless(mons))
                continue;;
            return (true);
      }
#ifdef DEBUG_DIAGNOSTICS
   mpr(MSGCH_DIAGNOSTICS, "No audience found!");
#endif
   // Sorry, no audience found!
   return (false);

Insertion in crawl-ref/source/delay.cc at line 508 [5.3963459]

[3.1089]

        case DELAY_RECITE:
            mprf(MSGCH_MULTITURN_ACTION,
                 "You begin to recite %s's Axioms of Law.",
                 god_name(GOD_ZIN).c_str());
            apply_area_visible(recite_to_monsters, delay.parm1, delay.duration);
            break;

Insertion in crawl-ref/source/delay.cc at line 610 [5.3963459]

[6.999307]

    if ( delay.type == DELAY_RECITE) 
    {
           
        if (!check_recital_audience()  // maybe no unaffected monsters in LOS?
            || Options.hp_warning && you.hp*Options.hp_warning <= you.hp_max
               && delay.parm2*Options.hp_warning > you.hp_max
            || you.hp*2 < delay.parm2) // or significant health drop
        {
            stop_delay();
            return;
        }
    }

Insertion in crawl-ref/source/delay.cc at line 658 [5.3963459]

[6.1000523]

        case DELAY_RECITE:
            mpr("You continue reciting the Axioms of Law.",
                MSGCH_MULTITURN_ACTION);
            apply_area_visible(recite_to_monsters, delay.parm1, delay.duration);
            break;

Insertion in crawl-ref/source/delay.cc at line 762 [5.3963459]

[25.5770]

[5.3969977]

        
    case DELAY_RECITE:
        mpr( "You finish reciting the Axioms of Law." );
        break;

Replacement in crawl-ref/source/delay.cc at line 1492 [5.3963459]

∅:D[28.819] → [6.1017832:1017977]

B:BD[6.1017832] → [6.1017832:1017977]

    "drop_item", "multidrop", "ascending_stairs", "descending_stairs", "run",
    "rest", "travel", "macro", "interruptible", "uninterruptible",

[28.819]

[6.1017977]

    "drop_item", "multidrop", "ascending_stairs", "descending_stairs", "recite",
    "run", "rest", "travel", "macro", "interruptible", "uninterruptible",

Deletion in crawl-ref/source/acr.cc at line 2560 [5.4397395]
∅:D[29.4008] → [5.4448597:4448598]
B:BD[5.4448597] → [5.4448597:4448598]
B:BD[5.4448598] → [29.4009:4048]
```
    decrement_a_duration(DUR_GLAMOUR);
```
Insertion in crawl-ref/source/abl-show.cc at line 42 [5.4494389]
[30.6009]
[5.4495210]
```
#include "delay.h"
```

Replacement in crawl-ref/source/abl-show.cc at line 82 [5.4494389]

B:BD[31.108826] → [31.108826:108906]

    ABFLAG_DELAY        = 0x00000002, // ability has its own delay (ie glamour)

[31.108826]

[31.108906]

    ABFLAG_DELAY        = 0x00000002, // ability has its own delay (ie recite)

Replacement in crawl-ref/source/abl-show.cc at line 114 [5.4494389]

B:BD[15.8967] → [16.19634:19701]

    { ABIL_NON_ABILITY, ABIL_ZIN_SMITING, ABIL_ZIN_REVITALISATION,

[15.8967]

[16.19701]

    { ABIL_ZIN_RECITE, ABIL_ZIN_SMITING, ABIL_ZIN_REVITALISATION,

Deletion in crawl-ref/source/abl-show.cc at line 177 [5.4494389]
B:BD[5.4496740] → [5.4496740:4496800]
```
    { ABIL_GLAMOUR, "Glamour", 5, 0, 40, 0, ABFLAG_DELAY },
```
Insertion in crawl-ref/source/abl-show.cc at line 235 [5.4494389]
[5.4500147]
[16.19748]
```
    { ABIL_ZIN_RECITE, "Recite", 3, 0, 150, 0, ABFLAG_DELAY },
```

Deletion in crawl-ref/source/abl-show.cc at line 487 [5.4494389]

B:BD[32.5954] → [32.5954:6044]

    case ABIL_GLAMOUR:
        failure = 50 - (you.experience_level * 2);
        break;

Insertion in crawl-ref/source/abl-show.cc at line 635 [5.4494389]
[32.10093]
[32.10125]
```
    case ABIL_ZIN_RECITE:
```

Deletion in crawl-ref/source/abl-show.cc at line 993 [5.4494389]

B:BD[5.4509847] → [5.4509847:4509862]

∅:D[7.11340] → [5.4509862:4510240]

B:BD[5.4509862] → [5.4509862:4510240]

        break;
    case ABIL_GLAMOUR:
        if (you.duration[DUR_GLAMOUR])
        {
            canned_msg(MSG_CANNOT_DO_YET);
            return (false);
        }
        mpr("You use your Elvish wiles.");
        cast_glamour( 10 + random2(you.experience_level) 
                         + random2(you.experience_level) );
        you.duration[DUR_GLAMOUR] = 20 + random2avg(13, 3);

Insertion in crawl-ref/source/abl-show.cc at line 1304 [5.4494389]

[5.4519189]

[4.5706]


    case ABIL_ZIN_RECITE:
    {
        if (!check_recital_audience())
        {
            mpr("There's no-one here to preach to!");
            return (false);
        }
        const int pow = (you.skills[SK_INVOCATIONS] + 12) * (50 + you.piety) / 600;
        start_delay(DELAY_RECITE, 3, pow, you.hp);
        break;
    }

Deletion in crawl-ref/source/abl-show.cc at line 1944 [5.4494389]

B:BD[5.4536118] → [33.3007:3219]

∅:D[33.3219] → [5.4536400:4536406]

B:BD[5.4536400] → [5.4536400:4536406]

B:BD[5.4536406] → [32.18948:19007]

∅:D[34.1446] → [5.4536446:4536453]

∅:D[32.19007] → [5.4536446:4536453]

B:BD[5.4536446] → [5.4536446:4536453]

    if ( ((you.species == SP_GREY_ELF && you.experience_level >= 5) ||
          (you.species == SP_HIGH_ELF && you.experience_level >= 15)) &&
         you.attribute[ATTR_TRANSFORMATION] == TRAN_NONE )         
    {
        add_talent(talents, ABIL_GLAMOUR, check_confused);
    }

Remove GLAMOUR, and introduce RECITE (new Zin invocation)

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spl-data.h at line 1981 [5.268152]

Deletion in crawl-ref/source/spl-cast.cc at line 1830 [5.293070]

Deletion in crawl-ref/source/spl-book.cc at line 1119 [5.397614]

Deletion in crawl-ref/source/spells4.h at line 40 [5.434549]

Deletion in crawl-ref/source/spells4.cc at line 1521 [5.436250]

Deletion in crawl-ref/source/spells4.cc at line 1522 [5.436250]

Replacement in crawl-ref/source/religion.cc at line 192 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 277 [5.804403]

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

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

Insertion in crawl-ref/source/initfile.cc at line 482 [5.2957258]

Deletion in crawl-ref/source/enum.h at line 39 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 77 [5.3287960]

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

Deletion in crawl-ref/source/enum.h at line 1079 [5.3287960]

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

Deletion in crawl-ref/source/enum.h at line 2516 [5.3287960]

Insertion in crawl-ref/source/delay.h at line 77 [5.3962990]