fiddlerwoaroof/crawl - Change BJPPSWEN35BG4KP3XTXPDMAJ2GAUMHXKHCNALAZ4B4OS6B3KDSUQC

Modified wand effects, so that

you cannot enslave already friendly monsters (1789757)
good gods don't mind inadvertent use of draining (first part of 1789189)

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

Created by j-p-e-g on September 10, 2007

BJPPSWEN35BG4KP3XTXPDMAJ2GAUMHXKHCNALAZ4B4OS6B3KDSUQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 1006 [7.804403]

[4.3767]

[6.181974]

    // If you make some god like these acts, modify did_god_conduct call 
    // in beam.cc with god_likes_necromancy check or something similar

Insertion in crawl-ref/source/item_use.cc at line 2793 [7.2781507]
[3.2254]
[8.49568]
```
    if (!alreadyknown)
        beam.effect_known = false;
```
Insertion in crawl-ref/source/item_use.cc at line 2848 [7.2781507]
[7.2843131]
[7.2843131]
```
        beam.effect_known = false;
```

Replacement in crawl-ref/source/externs.h at line 440 [7.3270163]

B:BD[7.3273704] → [6.894674:894749]

    bool        obvious_effect;         // did an 'obvious' effect happen?

[7.3273704]

[7.3273778]

    bool        obvious_effect;        // did an 'obvious' effect happen?
    bool        effect_known;          // did we _know_ this would happen?

Replacement in crawl-ref/source/externs.h at line 446 [7.3270163]
B:BD[7.3273994] → [6.894750:894803]
```
    bool        is_tracer;      // is this a tracer?
```
[7.3273994]
[6.894803]
```
    bool        is_tracer;       // is this a tracer?
```

Replacement in crawl-ref/source/externs.h at line 448 [7.3270163]

B:BD[6.894863] → [6.894863:894935]

    bool        msg_generated;  // an appropriate msg was already mpr'd

[6.894863]

[6.894935]

    bool        msg_generated;   // an appropriate msg was already mpr'd

Replacement in crawl-ref/source/externs.h at line 450 [7.3270163]

B:BD[6.895019] → [6.895019:895101]

    bool        smart_monster;  // tracer firer can guess at other mons. resists?

[6.895019]

[6.895101]

    bool        smart_monster;   // tracer firer can guess at other mons. resists?

Replacement in crawl-ref/source/externs.h at line 453 [7.3270163]

∅:D[5.349] → [6.895236:895311]

B:BD[6.895236] → [6.895236:895311]

B:BD[6.895311] → [9.2142:2266]

    int         foe_ratio;      // 100* foe ratio (see mons_should_fire())
    bool        chose_ray;      // do we want a specific ray?
    ray_def     ray;            // shoot on this specific ray

[5.349]

[6.895311]

    int         foe_ratio;       // 100* foe ratio (see mons_should_fire())
    bool        chose_ray;       // do we want a specific ray?
    ray_def     ray;             // shoot on this specific ray

Deletion in crawl-ref/source/beam.cc at line 797 [7.4128068]
B:BD[7.4154112] → [6.1224365:1224402]
```
        pbolt.obvious_effect = true;
```
Insertion in crawl-ref/source/beam.cc at line 1418 [7.4128068]
[7.4176728]
[7.4176728]
```
            {
```

Insertion in crawl-ref/source/beam.cc at line 1420 [7.4128068]

[7.4176773]

                pbolt.effect_known = false;
            }

Insertion in crawl-ref/source/beam.cc at line 1659 [7.4128068]
[7.4183378]
[7.4183378]
```
            pbolt.obvious_effect = true;
```

Replacement in crawl-ref/source/beam.cc at line 1662 [7.4128068]

B:BD[2.228] → [2.228:293]

                did_god_conduct(DID_NECROMANCY, 2 + random2(3));

[2.228]

[2.293]

            {
                // currently no gods who enjoy use of necromancy
                if (pbolt.effect_known)
                    did_god_conduct(DID_NECROMANCY, 2 + random2(3));
            }

Insertion in crawl-ref/source/beam.cc at line 3926 [7.4128068]

[7.4244633]


        if (mon->attitude == ATT_FRIENDLY)
            return (MON_UNAFFECTED);

Insertion in crawl-ref/source/beam.cc at line 3955 [7.4128068]

[7.4245303]

        // already friendly
        if (mon->attitude == ATT_FRIENDLY)
            return (MON_UNAFFECTED);

Replacement in crawl-ref/source/beam.cc at line 4613 [7.4128068]

B:BD[6.1254691] → [6.1254691:1254889]

               aux_source(), obvious_effect(false), fr_count(0), foe_count(0),
               fr_power(0), foe_power(0), is_tracer(false),
               aimed_at_feet(false), msg_generated(false),

[6.1254691]

[6.1254889]

               aux_source(), obvious_effect(false), effect_known(true), 
               fr_count(0), foe_count(0), fr_power(0), foe_power(0), 
               is_tracer(false), aimed_at_feet(false), msg_generated(false),