fiddlerwoaroof/crawl - Change VZUTMVHQCC54ILC5YOB6V5IWKPYOCXDAQR5LIPSLBAA5ZXMWLXLQC

Consolidate gods' vengeance handling, and don't display a penance

lecture if there's vengeance (so that you don't get "You will pay…" followed by "Beogh whispers, "You will pay…" for destroying an orcish idol; the "You feel guilty." message is enough then).

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

Created by dolorous on November 3, 2008

VZUTMVHQCC54ILC5YOB6V5IWKPYOCXDAQR5LIPSLBAA5ZXMWLXLQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.h at line 66 [5.800304]
[3.194]
[4.330]
```
god_type do_god_vengeance(conduct_type thing_done, bool actual = true);
```

Replacement in crawl-ref/source/religion.cc at line 369 [5.804403]

B:BD[6.2641] → [6.2641:2695]

static void _dock_piety(int piety_loss, int penance);

[6.2641]

[6.2695]

static void _dock_piety(int piety_loss, int penance, bool lecture);

Insertion in crawl-ref/source/religion.cc at line 2239 [5.804403]

[7.2851]

}
god_type do_god_vengeance(conduct_type thing_done, bool actual)
{
    god_type god = GOD_NO_GOD;
    if (thing_done == DID_DESTROY_ORCISH_IDOL)
    {
        god = GOD_BEOGH;
        if (actual)
            beogh_idol_revenge();
    }
    else if (thing_done == DID_KILL_HOLY
        || thing_done == DID_HOLY_KILLED_BY_SERVANT)
    {
        god = GOD_SHINING_ONE;
        if (actual)
            tso_holy_revenge();
    }
    return (god);

Replacement in crawl-ref/source/religion.cc at line 2883 [5.804403]

B:BD[8.2593] → [6.6819:6864]

        _dock_piety(-piety_change, penance);

[8.2593]

[9.189321]

    {
        _dock_piety(-piety_change, penance,
                    do_god_vengeance(thing_done, false) != you.religion);
    }

Replacement in crawl-ref/source/religion.cc at line 2917 [5.804403]

B:BD[2.2432] → [2.2432:2643]

    if (thing_done == DID_DESTROY_ORCISH_IDOL)
        beogh_idol_revenge();
    else if (thing_done == DID_KILL_HOLY
        || thing_done == DID_HOLY_KILLED_BY_SERVANT)
    {
        tso_holy_revenge();
    }

[2.2432]

[10.2518]

    do_god_vengeance(thing_done);

Replacement in crawl-ref/source/religion.cc at line 2988 [5.804403]
∅:D[11.3856] → [6.6865:6918]
B:BD[3.1630] → [6.6865:6918]
```
static void _dock_piety(int piety_loss, int penance)
```
[11.3856]
[3.1682]
```
static void _dock_piety(int piety_loss, int penance, bool lecture)
```

Replacement in crawl-ref/source/religion.cc at line 3016 [5.804403]

B:BD[3.2384] → [3.2384:2435]

        if (last_penance_lecture != you.num_turns)

[3.2384]

[7.2854]

        if (last_penance_lecture != you.num_turns && lecture)