fiddlerwoaroof/crawl - Change G4TVXOLIF5X2MWV7I4UPT3MSQHRMGME6QRIIFAQ64C45JGYK7SIAC

Improved recite. It now directly compares power (calculated using Invocations

and piety) with monsters' magic resistance. If the latter exceeds the former or you get a bad roll, the bad effects (haste or berserk) will happen. Otherwise you get one of a number of good effects the choice of which depends on your power again. This is probably still too strict, but much better than the older system.

Unfortunately I had to cut the influene of the number of attempts as apply_area_visible currently only transfers power. So it's a clear 50% chance of "nothing happens" each turn, leaving us at 12.5% of nothing happening during 3 turns, plus a saving throw from bad effects.

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

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

G4TVXOLIF5X2MWV7I4UPT3MSQHRMGME6QRIIFAQ64C45JGYK7SIAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/delay.h at line 77 [5.3962990]
B:BD[3.1441] → [4.3040:3077]
```
bool check_recital_audience( void );
```
[3.1441]
[5.3963390]
```
int check_recital_audience( void );
```
Insertion in crawl-ref/source/delay.cc at line 56 [5.3963459]
[4.3126]
[4.3126]
```
// (all results of Recite, plus friendly)
```

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

B:BD[4.3181] → [4.3181:3214]

    return (mons_is_fleeing(mon)

[4.3181]

[4.3214]

    return (mons_intel(mon->type) < I_NORMAL
            || mons_is_fleeing(mon)

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

[4.3318]

            || mons_is_confused(mon)
            || mons_is_paralysed(mon)

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

B:BD[4.3366] → [4.3366:3429]

static int recite_to_monsters(int x, int y, int pow, int turn)

[4.3366]

[4.3429]

static int recite_to_monsters(int x, int y, int pow, int unused)

Insertion in crawl-ref/source/delay.cc at line 71 [5.3963459]
[4.3431]
[4.3431]
```
    UNUSED(unused);
    
```

Deletion in crawl-ref/source/delay.cc at line 79 [5.3963459]

B:BD[4.3546] → [4.3546:3645]

    // monster must be intelligent
    if (mons_intel(mons->type) < I_NORMAL)
        return (0);

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

B:BD[4.3701] → [4.3701:3963]

    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())

[4.3701]

[4.3963]

    if (coinflip()) // nothing happens

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

B:BD[4.3984] → [4.3984:4038]

    bool resist = check_mons_resist_magic(mons, pow);

[4.3984]

[4.4038]

    const int resist = mons_resist_magic(mons);
    pow -= resist;
    
    // much lower chances at influencing demons
    if (mons_class_holiness(mon) == MH_DEMONIC)
        pow -= 3 + random2(5);

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

B:BD[4.4039] → [4.4039:4094]

    if (bad_effect) // can still have positive effects

[4.4039]

[4.4094]

    if (pow > 0)
        pow = random2avg(pow,2);
        
    if (pow <= 0) // Uh oh...

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

B:BD[4.4100] → [4.4100:5121]

        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
        {

[4.4100]

[4.5121]

        if (one_chance_in(resist+1)) // nothing happens, whew!
            return (0);
        if (one_chance_in(4) && mons->can_go_berserk())

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

B:BD[4.5157] → [4.5157:5181]

            return (1);

[4.5157]

[4.5181]

        else if (mons->add_ench(mon_enchant(ENCH_HASTE, 0,
                                KC_YOU, (16 + random2avg(13, 2)) * 10)))
        {
            simple_monster_message(mons, " speeds up in annoyance!");

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

B:BD[4.5191] → [4.5191:5224]

        return (0); // no effect

[4.5191]

[4.5224]

        // bad effects stop the recital
        stop_delay(); 
        return (1);

Replacement in crawl-ref/source/delay.cc at line 112 [5.3963459]
B:BD[4.5231] → [4.5231:5247]
```
    if (resist)
```
[4.5231]
[4.5247]
```
    switch (pow)
```

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

B:BD[4.5253] → [4.5253:5418]

        simple_monster_message(mons, " resists!");
        return (0);
    }
    switch (random2(pow))
    {
      default: // nothing happens
         return (0);

[4.5253]

[4.5418]

      case 0:
          return (0); // handled above
      case 1:
      case 2:
      case 3:
      case 4:
          if (!mons->add_ench(mon_enchant(ENCH_CONFUSION, 0, KC_YOU,
                              (16 + random2avg(13, 2)) * 10)))
              return (0);
          simple_monster_message(mons, " looks confused.");
          break;
      case 5:

Deletion in crawl-ref/source/delay.cc at line 128 [5.3963459]

B:BD[4.5446] → [4.5446:5611]

         if (mons->add_ench(ENCH_FEAR))
         {
             simple_monster_message(mons, " turns to flee.");
             return (1);
         }
         break;

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

[4.5625]

          mons->put_to_sleep();
          simple_monster_message(mons, " falls asleep!");
          break;

Deletion in crawl-ref/source/delay.cc at line 133 [5.3963459]

B:BD[4.5639] → [4.5639:5748]

         mons->put_to_sleep();
         simple_monster_message(mons, " falls asleep!");
         return (1);

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

B:BD[4.5793] → [4.5793:6048]

         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;

[4.5793]

[4.6048]

          if (!mons->add_ench(ENCH_NEUTRAL))
              return (0);
          simple_monster_message(mons, " seems impressed!");
          break;

Deletion in crawl-ref/source/delay.cc at line 142 [5.3963459]

B:BD[4.6078] → [4.6078:6331]

         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;

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

[4.6346]

          if (!mons->add_ench(ENCH_FEAR))
              return (0);
          simple_monster_message(mons, " turns to flee.");
          break;

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

B:BD[4.6376] → [4.6376:6741]

      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);

[4.6376]

[4.6741]

          if (!mons->add_ench(mon_enchant(ENCH_PARALYSIS, 0, KC_YOU,
                              (16 + random2avg(13, 2)) * 10)))
              return (0);
          simple_monster_message(mons, " freezes in fright!");
          break;
      default:
          // permanently neutral, but same message as enchantment
          mons->attitude = ATT_NEUTRAL;
          simple_monster_message(mons, " seems impressed!");
          break;

Replacement in crawl-ref/source/delay.cc at line 161 [5.3963459]
B:BD[6.993770] → [4.6748:6764]
```
    return (0);
```
[6.993770]
[4.6764]
```
    return (1);
```

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

B:BD[4.6980] → [4.6980:7010]

bool check_recital_audience()

[4.6980]

[4.7010]

// return 0, if no monsters found
// return 1, if eligible audience found
// return -1, if entire audience already affected or too dumb to understand
int check_recital_audience()

Insertion in crawl-ref/source/delay.cc at line 420 [5.3963459]
[4.7045]
[4.7045]
```
    bool found_monsters = false;
```
Insertion in crawl-ref/source/delay.cc at line 433 [5.3963459]
[4.7375]
[4.7375]
```
	    if (!found_monsters)
	        found_monsters = true;
```
Replacement in crawl-ref/source/delay.cc at line 438 [5.3963459]
B:BD[4.7470] → [4.7470:7497]
```
                continue;;
```
[4.7470]
[4.7497]
```
                continue;
```
Replacement in crawl-ref/source/delay.cc at line 440 [5.3963459]
B:BD[4.7498] → [4.7498:7525]
```
            return (true);
```
[4.7498]
[4.7525]
```
            return (1);
```

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

B:BD[4.7559] → [2.2897:2947]

   mprf(MSGCH_DIAGNOSTICS, "No audience found!");

[4.7559]

[4.7608]

      if (!found_monsters) 
          mprf(MSGCH_DIAGNOSTICS, "No audience found!");
      else
          mprf(MSGCH_DIAGNOSTICS, "No sensible audience found!");

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

[4.7616]

   // no use preaching to the choir, nor to common animals
   if (found_monsters)
       return (-1);

Replacement in crawl-ref/source/delay.cc at line 455 [5.3963459]
B:BD[4.7648] → [4.7648:7667]
```
   return (false);
```
[4.7648]
[7.18956]
```
   return (0);
```

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

B:BD[4.7841] → [4.7841:7922]

            apply_area_visible(recite_to_monsters, delay.parm1, delay.duration);

[4.7841]

[4.7922]

            apply_area_visible(recite_to_monsters, delay.parm1);

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

B:BD[4.7998] → [4.7998:8077]

        if (!check_recital_audience()  // maybe no unaffected monsters in LOS?

[4.7998]

[4.8077]

        if (check_recital_audience() < 1 // maybe you've lost your audience

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

B:BD[4.8491] → [4.8491:8572]

            apply_area_visible(recite_to_monsters, delay.parm1, delay.duration);

[4.8491]

[4.8572]

            apply_area_visible(recite_to_monsters, delay.parm1);

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

B:BD[4.9216] → [4.9216:9255]

        if (!check_recital_audience())

[4.9216]

[4.9255]

        int result = check_recital_audience();
        if (result < 0)
        {
            mpr("That's no appreciative audience!");
            return (false);
        }
        else if (result < 1)

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

B:BD[4.9357] → [4.9357:9441]

        const int pow = (you.skills[SK_INVOCATIONS] + 12) * (50 + you.piety) / 600;

[4.9357]

[4.9441]

//        const int pow = (you.skills[SK_INVOCATIONS] + 12) * (50 + you.piety) / 600;
        // up to (60 + 33)/3 = 31
        const int pow = ( 2*skill_bump(SK_INVOCATIONS) + you.piety / 6 ) / 3;