fiddlerwoaroof/crawl - Change 6PAG7GHXHIYXJPPTEK4KZQZT4CL2SJDAGTVIUDB4KK66PVSTWUMAC

[1836426] Fixed penance message sequence for beams, clamped penance messages at one per turn. (Penance message sequence for melee combat not fixed yet.)

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

Created by dshaligram on November 28, 2007

6PAG7GHXHIYXJPPTEK4KZQZT4CL2SJDAGTVIUDB4KK66PVSTWUMAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spells2.cc at line 1147 [10.569242]
∅:D[8.197] → [9.324:334]
B:BD[9.324] → [9.324:334]
```
        {
```
Deletion in crawl-ref/source/spells2.cc at line 1148 [10.569242]
∅:D[8.260] → [9.335:345]
∅:D[11.280] → [9.335:345]
B:BD[12.126] → [9.335:345]
```
        }
```
Insertion in crawl-ref/source/religion.h at line 19 [10.800304]
[6.189]
[13.168]
```
#include "externs.h"
```
Insertion in crawl-ref/source/religion.h at line 32 [10.800304]
[14.28860]
[11.330]
Insertion in crawl-ref/source/religion.h at line 35 [10.800304]
[8.392]
[10.802230]
Insertion in crawl-ref/source/religion.h at line 62 [10.800304]
[15.398]
[3.171]
```
bool god_hates_attacking_friend(god_type god, const actor *fr);
```

Insertion in crawl-ref/source/religion.h at line 66 [10.800304]

[3.235]


// Calls did_god_conduct when the object goes out of scope.
struct god_conduct_trigger
{
    conduct_type conduct;
    int pgain;
    bool known;
    bool enabled;
    std::auto_ptr<monsters> victim;

Insertion in crawl-ref/source/religion.h at line 76 [10.800304]

[3.236]

[10.804359]

    god_conduct_trigger(conduct_type c = NUM_CONDUCTS,
                        int pg = 0,
                        bool kn = true,
                        const monsters *vict = NULL);
    void set(conduct_type c = NUM_CONDUCTS,
             int pg = 0,
             bool kn = true,
             const monsters *vict = NULL);
    ~god_conduct_trigger();
};

Insertion in crawl-ref/source/religion.cc at line 362 [10.804403]
[16.212]
[17.988]
```
static void dock_piety(int piety_loss, int penance);
```
Replacement in crawl-ref/source/religion.cc at line 1329 [10.804403]
B:BD[18.182581] → [18.182581:182611]
```
        switch (you.religion)
```
[18.182581]
[18.182611]
```
        if (god_hates_attacking_friend(you.religion, victim))
```

Replacement in crawl-ref/source/religion.cc at line 1331 [10.804403]

B:BD[18.182621] → [18.182621:182726]

B:BD[18.182726] → [19.341:481]

B:BD[19.481] → [8.475:641]

B:BD[8.641] → [5.333:401]

∅:D[5.401] → [8.678:720]

B:BD[8.678] → [8.678:720]

∅:D[8.720] → [20.1292:1311]

B:BD[21.5805] → [20.1292:1311]

∅:D[20.1311] → [22.528:564]

∅:D[21.5805] → [22.528:564]

B:BD[18.182837] → [22.528:564]

        case GOD_ZIN:
        case GOD_SHINING_ONE:
        case GOD_ELYVILON:
        case GOD_OKAWARU:
        case GOD_BEOGH: // added penance to avoid killings for loot
                        // deliberately no extra punishment for killing
            if (you.religion != GOD_BEOGH ||
                (victim && mons_species(victim->id()) == MONS_ORC))
            {
                piety_change = -level;
                if (known)
                    penance = level * 3;
                ret = true;
            }
            break;
        default:
            break;

[18.182621]

[18.182837]

            piety_change = -level;
            if (known)
                penance = level * 3;
            ret = true;

Insertion in crawl-ref/source/religion.cc at line 1403 [10.804403]

[23.346]

[10.837555]

            if (god_hates_attacking_friend(you.religion, victim))
                break;

Insertion in crawl-ref/source/religion.cc at line 1426 [10.804403]

[23.372]

[10.837925]

            if (god_hates_attacking_friend(you.religion, victim))
                break;

Insertion in crawl-ref/source/religion.cc at line 1449 [10.804403]

[2.223]

[18.184214]

            if (god_hates_attacking_friend(you.religion, victim))
                break;

Replacement in crawl-ref/source/religion.cc at line 1466 [10.804403]

∅:D[24.661] → [21.5892:5931]

B:BD[21.5892] → [21.5892:5931]

        if (you.religion == GOD_BEOGH)

[24.661]

[21.5931]

        if (you.religion == GOD_BEOGH
            && !god_hates_attacking_friend(you.religion, victim))

Replacement in crawl-ref/source/religion.cc at line 1478 [10.804403]
∅:D[24.688] → [10.838573:838612]
∅:D[18.184405] → [10.838573:838612]
B:BD[10.838573] → [10.838573:838612]
```
        if (you.religion == GOD_TROG) 
```
[24.688]
[10.838612]
```
        if (you.religion == GOD_TROG
            && !god_hates_attacking_friend(you.religion, victim))
```

Replacement in crawl-ref/source/religion.cc at line 1686 [10.804403]

B:BD[18.188902] → [18.188902:189321]

    {
        const int piety_loss = -piety_change;
        if (piety_loss)
        {
            // output guilt message:
            mprf( "You feel%sguilty.",
                    (piety_loss == 1) ? " a little " :
                    (piety_loss <  5) ? " " :
                    (piety_loss < 10) ? " very "
                                      : " extremely " );
            lose_piety( piety_loss );
        }

[18.188902]

[18.189321]

        dock_piety(-piety_change, penance);

Deletion in crawl-ref/source/religion.cc at line 1688 [10.804403]

B:BD[18.189322] → [18.189322:189622]

        if (you.piety < 1)
            excommunication();
        else if (penance)       // only if still in religion
        {
            god_speaks( you.religion, 
                        "\"You will pay for your transgression, mortal!\"" );
            inc_penance( penance );
        }
    }

Insertion in crawl-ref/source/religion.cc at line 1715 [10.804403]

[18.190570]

}
static void dock_piety(int piety_loss, int penance)
{
    static long last_piety_lecture = -1L;
    static long last_penance_lecture = -1L;
    
    if (piety_loss <= 0 && penance <= 0)
        return;
    if (piety_loss)
    {
        if (last_piety_lecture != you.num_turns)
        {
            // output guilt message:
            mprf( "You feel%sguilty.",
                  (piety_loss == 1) ? " a little " :
                  (piety_loss <  5) ? " " :
                  (piety_loss < 10) ? " very "
                  : " extremely " );
        }
        last_piety_lecture = you.num_turns;
        lose_piety( piety_loss );
    }
    if (you.piety < 1)
        excommunication();
    else if (penance)       // only if still in religion
    {
        if (last_penance_lecture != you.num_turns)
            god_speaks( you.religion, 
                        "\"You will pay for your transgression, mortal!\"" );
        last_penance_lecture = you.num_turns;
        inc_penance( penance );
    }

Insertion in crawl-ref/source/religion.cc at line 3142 [10.804403]

[25.346]

[26.162]


bool god_hates_attacking_friend(god_type god, const actor *fr)
{
    if (!fr || fr->kill_alignment() != KC_FRIENDLY)
        return (false);
    
    switch (god)
    {
    case GOD_ZIN:
    case GOD_SHINING_ONE:
    case GOD_ELYVILON:
    case GOD_OKAWARU:
        return (true);
        
    case GOD_BEOGH: // added penance to avoid killings for loot
        return (fr && mons_species(fr->id()) == MONS_ORC);
    default:
        return (false);
    }
}

Insertion in crawl-ref/source/religion.cc at line 3743 [10.804403]

[27.488]

}
/////////////////////////////////////////////////////////////////////
// god_conduct_trigger
god_conduct_trigger::god_conduct_trigger(
    conduct_type c, int pg, bool kn, const monsters *vict)
  : conduct(c), pgain(pg), known(kn), enabled(true), victim(NULL)
{
    if (vict)
    {
        victim.reset(new monsters);
        *(victim.get()) = *vict;
    }

Insertion in crawl-ref/source/religion.cc at line 3758 [10.804403]

[27.490]


void god_conduct_trigger::set(conduct_type c, int pg, bool kn,
                              const monsters *vict)
{
    conduct = c;
    pgain = pg;
    known = kn;
    victim.reset(NULL);
    if (vict)
    {
        victim.reset(new monsters);
        *victim.get() = *vict;
    }
}
god_conduct_trigger::~god_conduct_trigger()
{
    if (enabled && conduct != NUM_CONDUCTS)
        did_god_conduct(conduct, pgain, known, victim.get());
}

Replacement in crawl-ref/source/monstuff.cc at line 643 [10.1396662]

B:BD[24.5814] → [24.5814:5870]

                                    monster->hit_dice);

[24.5814]

[10.1410215]

                                    monster->hit_dice, true, monster);

Replacement in crawl-ref/source/monstuff.cc at line 647 [10.1396662]

B:BD[24.5981] → [24.5981:6037]

                                    monster->hit_dice);

[24.5981]

[10.1410499]

                                    monster->hit_dice, true, monster);

Replacement in crawl-ref/source/monstuff.cc at line 651 [10.1396662]

B:BD[24.6148] → [7.204:260]

                                    monster->hit_dice);

[24.6148]

[7.260]

                                    monster->hit_dice, true, monster);

Replacement in crawl-ref/source/monstuff.cc at line 655 [10.1396662]

∅:D[7.380] → [24.6148:6204]

B:BD[24.6148] → [24.6148:6204]

                                    monster->hit_dice);

[7.380]

[10.1410641]

                                    monster->hit_dice, true, monster);

Replacement in crawl-ref/source/monstuff.cc at line 660 [10.1396662]

B:BD[24.6349] → [24.6349:6405]

                                    monster->hit_dice);

[24.6349]

[10.1410829]

                                    monster->hit_dice, true, monster);

Replacement in crawl-ref/source/monstuff.cc at line 665 [10.1396662]

B:BD[24.6559] → [24.6559:6615]

                                    monster->hit_dice);

[24.6559]

[18.413568]

                                    monster->hit_dice, true, monster);

Replacement in crawl-ref/source/monstuff.cc at line 668 [10.1396662]

B:BD[18.413624] → [18.413624:413696]

                    did_god_conduct(DID_KILL_ANGEL, monster->hit_dice);

[18.413624]

[10.1411211]

                    did_god_conduct(DID_KILL_ANGEL, monster->hit_dice,
                                    true, monster);

Replacement in crawl-ref/source/mon-util.cc at line 4735 [10.1699344]

B:BD[28.27439] → [28.27439:27502]

    return (attitude == ATT_FRIENDLY? KC_FRIENDLY : KC_OTHER);

[28.27439]

[29.895]

    return (mons_friendly(this)? KC_FRIENDLY : KC_OTHER);

Insertion in crawl-ref/source/beam.cc at line 3877 [10.4128068]
[10.4238797]
[10.4238797]
```
    god_conduct_trigger conduct;
    conduct.enabled = false;
    
```

Replacement in crawl-ref/source/beam.cc at line 3884 [10.4128068]

B:BD[10.4238975] → [5.765:847]

            const bool okay = beam.aux_source == "reading a scroll of immolation"

[10.4238975]

[5.847]

            const bool okay =
                beam.aux_source == "reading a scroll of immolation"

Replacement in crawl-ref/source/beam.cc at line 3887 [10.4128068]
B:BD[5.900] → [5.900:913]
```
            
```
[5.900]
[18.1249487]

Replacement in crawl-ref/source/beam.cc at line 3889 [10.4128068]

B:BD[18.1249523] → [5.914:983]

                did_god_conduct( DID_ATTACK_FRIEND, 5, !okay, mon );

[18.1249523]

[18.1249580]

                conduct.set( DID_ATTACK_FRIEND, 5, !okay, mon );

Replacement in crawl-ref/source/beam.cc at line 3892 [10.4128068]

B:BD[18.1249630] → [5.984:1063]

                did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice, !okay, mon );

[18.1249630]

[10.4239223]

                conduct.set( DID_ATTACK_HOLY, mon->hit_dice, !okay, mon );

Insertion in crawl-ref/source/beam.cc at line 3952 [10.4128068]
[30.27004]
[10.4239908]
```
    conduct.enabled = true;
    
```
Replacement in crawl-ref/source/acr.cc at line 2750 [10.4397395]
∅:D[31.967] → [18.1270178:1270203]
B:BD[18.1270178] → [18.1270178:1270203]
```
        you.num_turns++;
```
[31.967]
[4.374]
```
        if (you.num_turns < LONG_MAX)
            you.num_turns++;
```

[1836426] Fixed penance message sequence for beams, clamped penance messages at one per turn. (Penance message sequence for melee combat not fixed yet.)

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spells2.cc at line 1147 [10.569242]

Deletion in crawl-ref/source/spells2.cc at line 1148 [10.569242]

Insertion in crawl-ref/source/religion.h at line 19 [10.800304]

Insertion in crawl-ref/source/religion.h at line 32 [10.800304]

Insertion in crawl-ref/source/religion.h at line 35 [10.800304]

Insertion in crawl-ref/source/religion.h at line 62 [10.800304]