fiddlerwoaroof/crawl - Change 4HATGRJJE7Q6LXHJ3ZGYTNBLG542KAUEK6ERKARIYRKRWY6VTDKQC

Added some tweaks to Beogh:

now penance for attacking followers
permanent friendlies don't pick up stuff any more
different altar colour

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

Created by j-p-e-g on June 21, 2007

4HATGRJJE7Q6LXHJ3ZGYTNBLG542KAUEK6ERKARIYRKRWY6VTDKQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 3589 [4.16817]

B:BD[3.4681] → [3.4681:4724]

            Feature[i].colour = EC_UNHOLY;

[3.4681]

[3.4724]

            Feature[i].colour = EC_BEOGH;

Replacement in crawl-ref/source/view.cc at line 3593 [4.16817]

B:BD[3.4876] → [3.4876:4918]

            Feature[i].seen_colour = RED;

[3.4876]

[3.4918]

            Feature[i].seen_colour = EC_BEOGH;

Insertion in crawl-ref/source/stuff.cc at line 884 [4.224557]

[5.112910]

        break;
    case EC_BEOGH:
        ret = (tmp_rand < 60) ? LIGHTRED : BROWN;

Insertion in crawl-ref/source/religion.cc at line 963 [4.804403]

[5.182726]

        case GOD_BEOGH: // added penance to avoid killings for loot
                        // deliberately no extra punishment for killing

Deletion in crawl-ref/source/religion.cc at line 967 [4.804403]

B:BD[5.182794] → [5.182794:182837]

B:BD[5.182837] → [3.5669:5781]

            ret = true;
            break;
        case GOD_BEOGH:
            piety_change = -level;
            // no penance as Beogh is not a good god

Replacement in crawl-ref/source/religion.cc at line 1982 [4.804403]

B:BD[2.4829] → [2.4829:4875]

        default: // send orcs after you (5/8)

[2.4829]

[2.4875]

        case 4: // 25%, relatively harmless
        case 5: // in effect, only for penance
            if (followers_abandon_you()) 
               break;
            // else fall through
        default: // send orcs after you (3/8 to 5/8)

Insertion in crawl-ref/source/religion.cc at line 2156 [4.804403]
[3.15242]
[4.877146]
```
     int num_followers = 0;
```

Insertion in crawl-ref/source/religion.cc at line 2174 [4.804403]

[3.15802]

                     num_followers++;

Replacement in crawl-ref/source/religion.cc at line 2202 [4.804403]

B:BD[3.16719] → [3.16719:16881]

           snprintf(info, INFO_SIZE, "Your follower%s decide%s to abandon you.",
                (num_reconvert > 1) ? "s" : "", (num_reconvert > 1) ? "" : "s");

[3.16719]

[3.16881]

           std::string how_many;
           if (num_reconvert == 1 and num_followers > 1)
              how_many = "One of your";
           else if (num_reconvert == num_followers)
              how_many = "Your";
           else
              how_many = "Some of your";
              
           snprintf(info, INFO_SIZE, "%s follower%s decide%s to abandon you.",
                how_many.c_str(),
                (num_reconvert > 1) ? "s" : "",
                (num_reconvert > 1) ? "" : "s");

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

B:BD[5.433067] → [5.433067:433133]

            if (handle_pickup(monster))
                continue;

[5.433067]

[5.433133]

            // keep permanent friendlies from picking up stuff
            if (monster->attitude != ATT_FRIENDLY)
            {
                if (handle_pickup(monster))
                    continue;
            }

Deletion in crawl-ref/source/message.cc at line 167 [4.1993826]
B:BD[4.1995052] → [3.19883:19903]
```
    case GOD_BEOGH:
```
Insertion in crawl-ref/source/message.cc at line 168 [4.1993826]
[4.1995098]
[4.1995098]
```
    case GOD_BEOGH:
        return (coinflip() ? BROWN : LIGHTRED);
```
Insertion in crawl-ref/source/enum.h at line 1201 [4.3287960]
[5.914638]
[5.914638]
```
    EC_BEOGH,           // Beogh altar colours
```