fiddlerwoaroof/crawl - Change DGFWFFHCEBQK2TSMHN7RYPRNRVGEAYXM7GYJ4L37Z2ZNSIIUWQ4QC

Implement [2142702]: Expand god descriptions to include which collateral

kills they accept.

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

Created by dolorous on October 3, 2008

DGFWFFHCEBQK2TSMHN7RYPRNRVGEAYXM7GYJ4L37Z2ZNSIIUWQ4QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 463 [11.804403]

B:BD[10.3601] → [10.3601:3669]

        likes.push_back("train your various spell casting skills");

[10.3601]

[10.3669]

        likes.push_back("you train your various spell casting skills");

Replacement in crawl-ref/source/religion.cc at line 467 [11.804403]

B:BD[10.3704] → [9.2472:2603]

        snprintf(info, INFO_SIZE, "destroy spellbooks (especially ones you've "
                                  "never read)%s",

[10.3704]

[12.2529]

        snprintf(info, INFO_SIZE, "you destroy spellbooks (especially ones "
                                  "you've never read)%s",

Replacement in crawl-ref/source/religion.cc at line 475 [11.804403]

B:BD[10.3971] → [13.2529:2605]

        snprintf(info, INFO_SIZE, "draw unmarked cards and use up decks%s",

[10.3971]

[13.2605]

        snprintf(info, INFO_SIZE, "you draw unmarked cards and use up decks%s",

Replacement in crawl-ref/source/religion.cc at line 483 [11.804403]

B:BD[10.4075] → [10.4075:4153]

        snprintf(info, INFO_SIZE, "destroy weapons (especially evil ones)%s",

[10.4075]

[13.2745]

        snprintf(info, INFO_SIZE, "you destroy weapons (especially evil ones)%s",

Replacement in crawl-ref/source/religion.cc at line 498 [11.804403]

B:BD[3.2560] → [3.2560:2620]

        snprintf(info, INFO_SIZE, "sacrifice evil items%s",

[3.2560]

[10.4518]

        snprintf(info, INFO_SIZE, "you sacrifice evil items%s",

Replacement in crawl-ref/source/religion.cc at line 505 [11.804403]

B:BD[10.4674] → [10.4674:4729]

        snprintf(info, INFO_SIZE, "sacrifice items%s",

[10.4674]

[4.2534]

        snprintf(info, INFO_SIZE, "you sacrifice items%s",

Replacement in crawl-ref/source/religion.cc at line 511 [11.804403]

B:BD[10.4868] → [5.2534:2586]

        snprintf(info, INFO_SIZE, "donate money%s",

[10.4868]

[10.4922]

        snprintf(info, INFO_SIZE, "you donate money%s",

Replacement in crawl-ref/source/religion.cc at line 523 [11.804403]

B:BD[13.2941] → [13.2941:3010]

        snprintf(info, INFO_SIZE, "butcher corpses while praying%s",

[13.2941]

[13.3010]

        snprintf(info, INFO_SIZE, "you butcher corpses while praying%s",

Replacement in crawl-ref/source/religion.cc at line 531 [11.804403]

B:BD[10.5194] → [10.5194:5419]

    case GOD_KIKUBAAQUDGHA: case GOD_YREDELEMNUL: case GOD_OKAWARU:
    case GOD_VEHUMET:       case GOD_MAKHLEB:     case GOD_TROG:
    case GOD_BEOGH:         case GOD_LUGONU:
        likes.push_back("kill living beings");

[10.5194]

[9.2604]

    case GOD_VEHUMET: case GOD_MAKHLEB: case GOD_LUGONU:
        likes.push_back("you or your allies kill living beings");
        break;
    case GOD_TROG:
        likes.push_back("you or your god-given allies kill living beings");
        break;
    case GOD_YREDELEMNUL:
        likes.push_back("you or your undead slaves kill living beings");
        break;
    case GOD_KIKUBAAQUDGHA:
        likes.push_back("you kill living beings");
        likes.push_back("your god-given allies kill living beings");
        likes.push_back("your undead slaves kill living beings");
        break;
    case GOD_BEOGH:
        likes.push_back("you or your allied orcs kill living beings");
        break;
    case GOD_OKAWARU:
        likes.push_back("you kill living beings");

Replacement in crawl-ref/source/religion.cc at line 564 [11.804403]

B:BD[9.2710] → [9.2710:2762]

        likes.push_back("kill living evil beings");

[9.2710]

[10.5419]

        likes.push_back("you or your allies kill living evil beings");

Replacement in crawl-ref/source/religion.cc at line 573 [11.804403]

B:BD[10.5499] → [10.5499:5648]

    case GOD_SHINING_ONE: case GOD_OKAWARU: case GOD_VEHUMET:
    case GOD_MAKHLEB:     case GOD_LUGONU:
        likes.push_back("kill the undead");

[10.5499]

[10.5648]

    case GOD_SHINING_ONE: case GOD_VEHUMET: case GOD_MAKHLEB:
    case GOD_LUGONU:
        likes.push_back("you or your allies kill the undead");
        break;
    case GOD_OKAWARU:
        likes.push_back("you kill the undead");

Replacement in crawl-ref/source/religion.cc at line 588 [11.804403]

B:BD[10.5728] → [10.5728:5830]

    case GOD_SHINING_ONE: case GOD_OKAWARU: case GOD_MAKHLEB:
        likes.push_back("kill demons");

[10.5728]

[8.2428]

    case GOD_SHINING_ONE: case GOD_MAKHLEB:
        likes.push_back("you or your allies kill demons");
        break;
    case GOD_OKAWARU:
        likes.push_back("you kill demons");

Replacement in crawl-ref/source/religion.cc at line 603 [11.804403]

B:BD[8.2571] → [8.2571:2616]

        likes.push_back("kill holy beings");

[8.2571]

[10.5830]

        likes.push_back("you or your allies kill holy beings");
        break;
    case GOD_YREDELEMNUL:
        likes.push_back("your allies kill holy beings");

Replacement in crawl-ref/source/religion.cc at line 618 [11.804403]

B:BD[10.5950] → [9.2801:2882]

        really_likes.push_back("kill monsters which cause mutation or rotting");

[10.5950]

[14.2428]

        really_likes.push_back("you kill monsters which cause mutation or rotting");

Replacement in crawl-ref/source/religion.cc at line 622 [11.804403]

B:BD[14.2470] → [9.2883:2935]

        really_likes.push_back("kill holy beings");

[14.2470]

[10.6118]

        really_likes.push_back("you kill holy beings");

Replacement in crawl-ref/source/religion.cc at line 626 [11.804403]

B:BD[10.6154] → [9.2936:3007]

        really_likes.push_back("kill the priests of other religions");

[10.6154]

[10.6218]

        really_likes.push_back("you kill the priests of other religions");

Replacement in crawl-ref/source/religion.cc at line 630 [11.804403]

B:BD[10.6253] → [9.3008:3081]

        really_likes.push_back("kill wizards and other users of magic");

[10.6253]

[10.6319]

        really_likes.push_back("you kill wizards and other users of magic");

Replacement in crawl-ref/source/religion.cc at line 641 [11.804403]
B:BD[10.6501] → [10.6501:6540]
```
        text += " likes it when you ";
```
[10.6501]
[10.6540]
```
        text += " likes it when ";
```

Replacement in crawl-ref/source/religion.cc at line 651 [11.804403]

B:BD[9.3253] → [9.3253:3307]

            text += " especially likes it when you ";

[9.3253]

[9.3307]

            text += " especially likes it when ";

Replacement in crawl-ref/source/religion.cc at line 670 [11.804403]

B:BD[10.7006] → [10.7006:7067]

        dislikes.push_back("butcher corpses while praying");

[10.7006]

[10.7067]

        dislikes.push_back("you butcher corpses while praying");

Replacement in crawl-ref/source/religion.cc at line 674 [11.804403]

B:BD[10.7106] → [10.7106:7353]

B:BD[10.7353] → [6.2428:2476]

∅:D[6.2476] → [10.7353:7406]

B:BD[10.7353] → [10.7353:7406]

        dislikes.push_back("drink blood");
        dislikes.push_back("perform cannibalism");
        dislikes.push_back("use necromancy");
        dislikes.push_back("use unholy magic or items");
        dislikes.push_back("attack holy beings");
        dislikes.push_back("kill holy beings");
        dislikes.push_back("attack neutral beings");

[10.7106]

[10.7406]

        dislikes.push_back("you drink blood");
        dislikes.push_back("you perform cannibalism");
        dislikes.push_back("you use necromancy");
        dislikes.push_back("you use unholy magic or items");
        dislikes.push_back("you attack holy beings");
        dislikes.push_back("you or your allies kill holy beings");
        dislikes.push_back("you attack neutral beings");

Replacement in crawl-ref/source/religion.cc at line 687 [11.804403]
B:BD[10.7528] → [10.7528:7573]
```
        dislikes.push_back("attack allies");
```
[10.7528]
[10.7573]
```
        dislikes.push_back("you attack allies");
```

Replacement in crawl-ref/source/religion.cc at line 691 [11.804403]

B:BD[10.7609] → [10.7609:7659]

        dislikes.push_back("attack allied orcs");

[10.7609]

[10.7659]

        dislikes.push_back("you attack allied orcs");

Replacement in crawl-ref/source/religion.cc at line 701 [11.804403]

B:BD[10.7794] → [10.7794:7846]

        dislikes.push_back("allow an ally to die");

[10.7794]

[10.7846]

        dislikes.push_back("you allow an ally to die");

Replacement in crawl-ref/source/religion.cc at line 711 [11.804403]

B:BD[10.7944] → [10.7944:8019]

        dislikes.push_back("cause yourself to mutate in a way that could "

[10.7944]

[10.8019]

        dislikes.push_back("you cause yourself to mutate in a way that could "

Replacement in crawl-ref/source/religion.cc at line 713 [11.804403]

B:BD[10.8068] → [15.2534:2584]

∅:D[15.2584] → [10.8068:8132]

B:BD[10.8068] → [10.8068:8132]

        dislikes.push_back("polymorph monsters");
        dislikes.push_back("eat the flesh of sentient beings");

[10.8068]

[10.8132]

        dislikes.push_back("you polymorph monsters");
        dislikes.push_back("you eat the flesh of sentient beings");

Replacement in crawl-ref/source/religion.cc at line 718 [11.804403]

B:BD[10.8174] → [10.8174:8285]

        dislikes.push_back("poison a monster");
        dislikes.push_back("attack in an unchivalric manner");

[10.8174]

[10.8285]

        dislikes.push_back("you poison a monster");
        dislikes.push_back("you attack in an unchivalric manner");

Replacement in crawl-ref/source/religion.cc at line 723 [11.804403]

B:BD[10.8324] → [10.8324:8389]

        dislikes.push_back("kill a living thing while praying");

[10.8324]

[7.2658]

        dislikes.push_back("you kill a living thing while praying");

Replacement in crawl-ref/source/religion.cc at line 727 [11.804403]

B:BD[7.2700] → [7.2700:2755]

        dislikes.push_back("use holy magic or items");

[7.2700]

[10.8389]

        dislikes.push_back("you use holy magic or items");

Replacement in crawl-ref/source/religion.cc at line 731 [11.804403]

B:BD[10.8424] → [2.2529:2576]

∅:D[2.2576] → [10.8471:8514]

B:BD[10.8471] → [10.8471:8514]

        dislikes.push_back("memorise spells");
        dislikes.push_back("cast spells");

[10.8424]

[10.8514]

        dislikes.push_back("you memorise spells");
        dislikes.push_back("you cast spells");

Replacement in crawl-ref/source/religion.cc at line 743 [11.804403]

B:BD[10.8655] → [10.8655:8705]

                text += " dislikes it when you ";

[10.8655]

[10.8705]

                text += " dislikes it when ";