fiddlerwoaroof/crawl - Change KN5WFFRSNGHIGI5IUYRBOA4R4K7XK3AEAAMN6ELDFTSYKPN7QX7AC

Fix 1892007: (oklob) plants being confusable

(There's probably some source of poison or other where I forgot to add the mons_class_is_confuseable check. Feel free to add as needed.)

Fix 1897271: potions of poison being treatened like poisoned ammo (There's actually a much bigger issue: now that randart names are configurable players could name half of their randarts "poisoned" and make them be poisoned. In short, the beam string comparison find("poison") needs to be replaced with something more sensible.)

Also some more comment clean-up.

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

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

KN5WFFRSNGHIGI5IUYRBOA4R4K7XK3AEAAMN6ELDFTSYKPN7QX7AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spells4.cc at line 1591 [4.436250]

B:BD[4.488005] → [4.488005:488140]

    // experimenting with allowing the potion to be thrown... we're
    // still making it have to be "in hands" at this point. -- bwr

Replacement in crawl-ref/source/mstuff2.cc at line 317 [4.1340842]

B:BD[4.1348577] → [4.1348577:1348731]

                              (temp_rand < 7) ? RED     // confuse - 4 in 16
                                              : BLACK); //    slow - 9 in 16

[4.1348577]

[4.1348731]

                           (temp_rand < 7) ? RED     // confuse - 4 in 16
                                           : BLACK); //    slow - 9 in 16

Replacement in crawl-ref/source/mstuff2.cc at line 323 [4.1340842]

B:BD[4.1348841] → [4.1348841:1349001]

                              (temp_rand < 7) ? MAGENTA //invis - 4 in 16 {dlb}
                                              : GREEN); // heal - 9 in 16 {dlb}

[4.1348841]

[4.1349001]

                           (temp_rand < 7) ? MAGENTA //invis - 4 in 16 {dlb}
                                           : GREEN); // heal - 9 in 16 {dlb}

Insertion in crawl-ref/source/monstuff.cc at line 5975 [4.1396662]
[5.351]
[5.351]

Replacement in crawl-ref/source/monstuff.cc at line 5979 [4.1396662]

B:BD[4.1549504] → [4.1549504:1549554]

        if (1 + random2(27) >= monster->hit_dice)

[4.1549504]

[4.1549554]

        if (mons_class_is_confusable(monster->type)
            && 1 + random2(27) >= monster->hit_dice)
        {

Insertion in crawl-ref/source/monstuff.cc at line 5983 [4.1396662]
[4.1549595]
[4.1549595]
```
        }
```

Replacement in crawl-ref/source/item_use.cc at line 1470 [4.2781507]

B:BD[6.3247] → [6.3247:3306]

    const int start = item == ENDOFPACK - 1? 0 : item + 1;

[6.3247]

[6.3306]

    const int start = (item == ENDOFPACK - 1)? 0 : item + 1;

Replacement in crawl-ref/source/item_use.cc at line 1483 [4.2781507]

B:BD[6.3546] → [6.3546:3605]

    const int start = item == 0? ENDOFPACK - 1 : item - 1;

[6.3546]

[6.3605]

    const int start = (item == 0)? ENDOFPACK - 1 : item - 1;

Replacement in crawl-ref/source/fight.cc at line 2137 [4.3140790]

B:BD[7.418] → [2.26238:26295]

        if (hdcheck >= defender->get_experience_level())

[7.418]

[8.499]

            
        if (mons_class_is_confusable(def->type) &&
            hdcheck >= defender->get_experience_level())

Replacement in crawl-ref/source/delay.cc at line 133 [4.3963459]

B:BD[3.3894] → [3.3894:4026]

          if (!mons->add_ench(mon_enchant(ENCH_CONFUSION, 0, KC_YOU,
                              (16 + random2avg(13, 2)) * 10)))

[3.3894]

[3.4026]

          if (!mons_class_is_confusable(mons->type)
              || !mons->add_ench(mon_enchant(ENCH_CONFUSION, 0, KC_YOU,
                                             (16 + random2avg(13, 2)) * 10)))
          {

Insertion in crawl-ref/source/delay.cc at line 138 [4.3963459]
[3.4052]
[3.4052]
```
          }
```
Insertion in crawl-ref/source/dat/database/speak.txt at line 1706 [9.307]
[9.35416]
[9.35416]
```
@The_monster@ honks.
VISUAL:@The_monster@ pantomimes your execution.
```

Insertion in crawl-ref/source/beam.cc at line 1922 [4.4128068]

[10.1182]

        if (wh_enchant == ENCH_CONFUSION &&
            !mons_class_is_confusable(monster->type))
        {
            return (true);
        }

Insertion in crawl-ref/source/beam.cc at line 2103 [4.4128068]

[4.4193595]

[11.3343]

        if (!mons_class_is_confusable(monster->type))
            return (MON_UNAFFECTED);

Replacement in crawl-ref/source/beam.cc at line 2109 [4.4128068]

B:BD[4.4193657] → [4.4193657:4193778]

            // put in an exception for fungi, plants and other things you won't
            // notice becoming confused.

[4.4193657]

[4.4193778]

            // put in an exception for things you won't notice becoming confused.

Deletion in crawl-ref/source/beam.cc at line 2116 [4.4128068]
B:BD[4.4194000] → [4.4194000:4194067]
```
        // Store the monster name before it becomes an "it" -- bwr
```
Insertion in crawl-ref/source/beam.cc at line 2117 [4.4128068]
[12.3048]
[13.5001]
```
        // Store the monster name before it becomes an "it" -- bwr
```

Replacement in crawl-ref/source/beam.cc at line 4065 [4.4128068]

B:BD[4.4241664] → [14.1250384:1250442]

        if (beam.name.find("poison") != std::string::npos

[4.4241664]

[4.4241717]

        if (beam.name.find("poisoned") != std::string::npos