fiddlerwoaroof/crawl - Change R5HVRGDKUX6A2H4DRHGWFBC2P625VAJHDZTERDMLFVXWSZLMHKRAC

Replace the conduct for killing a neutral monster with a conduct for

attacking a neutral monster.

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

Created by dolorous on April 7, 2008

R5HVRGDKUX6A2H4DRHGWFBC2P625VAJHDZTERDMLFVXWSZLMHKRAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells3.cc at line 219 [6.531613]

[2.270]

        else if (mons_neutral(monster))
            did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster);

Insertion in crawl-ref/source/spells3.cc at line 275 [6.531613]

[2.383]

            else if (mons_neutral(monster))
                did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster);

Replacement in crawl-ref/source/spells2.cc at line 1169 [6.569242]
B:BD[6.597439] → [6.597439:597486]
```
    int hurted = roll_dice( 1, 3 + pow / 3 ); 
```
[6.597439]
[6.597486]
```
    int hurted = roll_dice( 1, 3 + pow / 3 );
```

Replacement in crawl-ref/source/spells2.cc at line 1182 [6.569242]

∅:D[7.345] → [8.126:135]

B:BD[8.126] → [8.126:135]

[9.280]

[8.135]

        else if (mons_neutral( monster ))
            did_god_conduct( DID_ATTACK_NEUTRAL, 5, true, monster );

Insertion in crawl-ref/source/religion.cc at line 1730 [6.804403]

[10.182527]

        }
        break;
    case DID_ATTACK_NEUTRAL:
        switch (you.religion)
        {
        case GOD_ELYVILON:
            simple_god_message(" did not appreciate that!");
            ret = true;
            piety_change = -(level/2 + 1);
            penance = std::min(level, 5);
            break;
        default:
            break;

Deletion in crawl-ref/source/religion.cc at line 1796 [6.804403]
∅:D[10.183535] → [6.837311:837330]
B:BD[6.837311] → [6.837311:837330]
B:BD[6.837330] → [11.2522:2523]
∅:D[11.2523] → [12.615:651]
B:BD[12.615] → [12.615:651]
∅:D[12.651] → [6.837330:837356]
B:BD[6.837330] → [6.837330:837356]
B:BD[6.837356] → [13.5968:5995]
B:BD[13.5995] → [5.2523:2553]
∅:D[5.2553] → [13.6037:6047]
B:BD[13.6037] → [13.6037:6047]
B:BD[13.6047] → [5.2554:2751]
```
            break;
        default:
            break;
        }
        break;
    case DID_KILL_NEUTRAL:
        switch (you.religion)
        {
        case GOD_ELYVILON:
            simple_god_message(" did not appreciate that!");
            ret = true;
            piety_change = -(level/2 + 1);
            penance = std::min(level, 5);
```

Replacement in crawl-ref/source/religion.cc at line 2188 [6.804403]

B:BD[10.189728] → [10.189728:189856]

          "Necromancy", "Unholy", "Attack Holy", "Attack Friend",
          "Friend Died", "Stab", "Poison", "Field Sacrifice",

[10.189728]

[10.189856]

          "Necromancy", "Unholy", "Attack Holy", "Attack Neutral",
          "Attack Friend", "Friend Died", "Stab", "Poison", "Field Sacrifice",

Replacement in crawl-ref/source/religion.cc at line 2192 [6.804403]

B:BD[14.2571] → [15.2883:2950]

∅:D[15.2950] → [16.2495:2573]

∅:D[11.3110] → [16.2495:2573]

B:BD[17.3091] → [16.2495:2573]

B:BD[16.2573] → [15.2951:3011]

∅:D[9.1737] → [10.190175:190255]

∅:D[15.3011] → [10.190175:190255]

B:BD[10.190175] → [10.190175:190255]

B:BD[10.190255] → [9.1738:1813]

          "Kill Holy", "Kill Neutral", "Undead Slave Kill Living",
          "Servant Kill Living", "Servant Kill Undead", "Servant Kill Demon",
          "Servant Kill Natural Evil", "Servant Kill Holy",
          "Spell Memorise", "Spell Cast", "Spell Practise", "Spell Nonutility",
          "Cards", "Stimulants", "Drink Blood", "Cannibalism", "Eat Meat",

[14.2571]

[3.2510]

          "Kill Holy", "Undead Slave Kill Living", "Servant Kill Living",
          "Servant Kill Undead", "Servant Kill Demon",
          "Servant Kill Natural Evil", "Servant Kill Holy", "Spell Memorise",
          "Spell Cast", "Spell Practise", "Spell Nonutility", "Cards",
          "Stimulants", "Drink Blood", "Cannibalism", "Eat Meat",

Insertion in crawl-ref/source/player.cc at line 5850 [6.962854]

[9.4305]

[18.6886]

        else if (mons_neutral(mons))
            did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, mons);

Deletion in crawl-ref/source/monstuff.cc at line 910 [6.1396662]

∅:D[4.2731] → [19.3529:3530]

B:BD[20.4489] → [19.3529:3530]

B:BD[19.3530] → [13.6897:6930]

∅:D[13.6930] → [19.3568:3693]

B:BD[19.3568] → [19.3568:3693]


                if (was_neutral)
                    did_god_conduct(DID_KILL_NEUTRAL, monster->hit_dice,
                                    true, monster);

Insertion in crawl-ref/source/enum.h at line 631 [6.3287960]
[10.908294]
[10.908294]
```
    DID_ATTACK_NEUTRAL,
```
Deletion in crawl-ref/source/enum.h at line 646 [6.3287960]
B:BD[15.3435] → [13.7108:7130]
```
    DID_KILL_NEUTRAL,
```

Insertion in crawl-ref/source/beam.cc at line 3820 [6.4128068]

[9.6578]

[21.3343]

                else if (mons_neutral( mon ) && beam.flavour != BEAM_CHARM)
                    did_god_conduct( DID_ATTACK_NEUTRAL, 5, true, mon );

Insertion in crawl-ref/source/beam.cc at line 3993 [6.4128068]

[20.4950]

[10.1249580]

            else if (mons_neutral(mon))
                conduct.set( DID_ATTACK_NEUTRAL, 5, !okay, mon );