fiddlerwoaroof/crawl - Change M2X33JKIB2O27DLCUPSH7LSHEFDN76TUCLGWFNU5LSSR767JSTUQC

Abolish item sacrifices for all gods except Nemelex, Zin and TSO. The

descriptions will have to be updated. If special cases are seen as invaluable part of that god's design, they should be reworked to not to ressemble grinding anymore and/or gain flavour. (Compare with Ely's weapon destruction or Trog's book burning.)

Disallow merfolk monsters in the Swamp and reduce their "rare" probability in the main dungeon to that of flying skulls.

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

Created by j-p-e-g on June 22, 2008

M2X33JKIB2O27DLCUPSH7LSHEFDN76TUCLGWFNU5LSSR767JSTUQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 3012 [3.804403]

B:BD[2.33351] → [2.33351:33454]

                && (!item_type_known(item)
                    || item.sub_type != BOOK_DESTRUCTION));

[2.33351]

[2.33454]

                && item.sub_type != BOOK_DESTRUCTION);

Replacement in crawl-ref/source/religion.cc at line 5042 [3.804403]

B:BD[4.230] → [5.3830:4014]

    case GOD_ZIN:      case GOD_SHINING_ONE:   case GOD_KIKUBAAQUDGHA:
    case GOD_OKAWARU:  case GOD_MAKHLEB:       case GOD_SIF_MUNA:
    case GOD_TROG:     case GOD_NEMELEX_XOBEH:

[4.230]

[6.19554]

    case GOD_ZIN:      case GOD_SHINING_ONE:   case GOD_NEMELEX_XOBEH:

Deletion in crawl-ref/source/religion.cc at line 5044 [3.804403]

∅:D[6.19577] → [5.4015:4147]

B:BD[4.444] → [5.4015:4147]

B:BD[5.4147] → [6.19578:19602]


    case GOD_YREDELEMNUL: case GOD_XOM:        case GOD_VEHUMET:
    case GOD_LUGONU:      case GOD_BEOGH:      case GOD_ELYVILON:
        return (false);

Insertion in crawl-ref/source/religion.cc at line 5047 [3.804403]
[7.2793]
[6.19603]
```
    default:
```
Deletion in crawl-ref/source/religion.cc at line 5050 [3.804403]
B:BD[4.748] → [6.19628:19648]
```
    return (false);
```
Replacement in crawl-ref/source/religion.cc at line 5055 [3.804403]
∅:D[8.11603] → [4.867:889]
∅:D[6.19680] → [4.867:889]
B:BD[4.867] → [4.867:889]
```
        return false;
```
[6.19680]
[4.889]
```
        return (false);
```
Deletion in crawl-ref/source/religion.cc at line 5059 [3.804403]
B:BD[4.1041] → [4.1041:1084]
B:BD[4.1084] → [9.2707:2780]
∅:D[9.2780] → [5.4148:4149]
B:BD[4.1130] → [5.4148:4149]
```
    case GOD_KIKUBAAQUDGHA: case GOD_TROG:
        return (item.base_type == OBJ_CORPSES || is_blood_potion(item));
```
Replacement in crawl-ref/source/religion.cc at line 5069 [3.804403]
B:BD[4.1144] → [4.1144:1165]
```
        return true;
```
[4.1144]
[4.1165]
```
        return (false);
```

Replacement in crawl-ref/source/religion.cc at line 5329 [3.804403]

B:BD[10.6572] → [11.971:1034]

    if ( num_sacced > 0 && you.religion == GOD_NEMELEX_XOBEH )

[10.6572]

[11.1034]

    if (num_sacced > 0 && you.religion == GOD_NEMELEX_XOBEH)

Replacement in crawl-ref/source/religion.cc at line 5332 [3.804403]
∅:D[8.12091] → [11.1099:1162]
B:BD[11.1099] → [11.1099:1162]
```
        if ( old_leading != new_leading || one_chance_in(50) )
```
[8.12091]
[8.12092]
```
        if (old_leading != new_leading || one_chance_in(50))
```

Replacement in crawl-ref/source/religion.cc at line 5341 [3.804403]

B:BD[12.3966] → [12.3966:4179]

        if (you.religion == GOD_KIKUBAAQUDGHA || you.religion == GOD_TROG)
            simple_god_message(" only cares about primal sacrifices!", you.religion);
        else if (you.religion == GOD_NEMELEX_XOBEH)

[12.3966]

[12.4179]

        // Zin was handled above, and the other gods don't care about
        // sacrifices.
        if (you.religion == GOD_NEMELEX_XOBEH)

Deletion in crawl-ref/source/religion.cc at line 5348 [3.804403]
∅:D[5.4342] → [12.4276:4346]
B:BD[12.4276] → [12.4276:4346]
```
        // everyone else was handled above (Zin!) or likes everything
```
Deletion in crawl-ref/source/mon-pick.cc at line 2126 [3.1767507]
B:BD[13.3362] → [14.7655:7701]
```
    case MONS_MERFOLK:
    case MONS_MERMAID:
```
Deletion in crawl-ref/source/mon-pick.cc at line 2203 [3.1767507]
B:BD[3.1810828] → [14.7702:7725]
```
    case MONS_MERFOLK:
```
Deletion in crawl-ref/source/mon-pick.cc at line 2684 [3.1767507]
B:BD[3.1819704] → [14.7750:7796]
```
    case MONS_MERFOLK:
    case MONS_MERMAID:
```
Deletion in crawl-ref/source/mon-pick.cc at line 2704 [3.1767507]
B:BD[3.1820214] → [14.7797:7843]
```
    case MONS_MERFOLK:
    case MONS_MERMAID:
```
Insertion in crawl-ref/source/mon-pick.cc at line 2738 [3.1767507]
[3.1820990]
[3.1820990]
```
    case MONS_MERFOLK:
    case MONS_MERMAID:
```
Replacement in crawl-ref/settings/menu_colours.txt at line 59 [17.6002]
∅:D[15.2824] → [16.17119:17145]
∅:D[18.18625] → [16.17119:17145]
B:BD[19.11634] → [16.17119:17145]
```
menu = green:.*equipped.*
```
[18.18625]
[17.10705]
```
menu = lightgreen:.*equipped.*
```

Abolish item sacrifices for all gods except Nemelex, Zin and TSO. The

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 3012 [3.804403]

Replacement in crawl-ref/source/religion.cc at line 5042 [3.804403]

Deletion in crawl-ref/source/religion.cc at line 5044 [3.804403]

Insertion in crawl-ref/source/religion.cc at line 5047 [3.804403]

Deletion in crawl-ref/source/religion.cc at line 5050 [3.804403]

Replacement in crawl-ref/source/religion.cc at line 5055 [3.804403]

Deletion in crawl-ref/source/religion.cc at line 5059 [3.804403]

Replacement in crawl-ref/source/religion.cc at line 5069 [3.804403]

Replacement in crawl-ref/source/religion.cc at line 5329 [3.804403]

Replacement in crawl-ref/source/religion.cc at line 5332 [3.804403]

Replacement in crawl-ref/source/religion.cc at line 5341 [3.804403]

Deletion in crawl-ref/source/religion.cc at line 5348 [3.804403]

Deletion in crawl-ref/source/mon-pick.cc at line 2126 [3.1767507]

Deletion in crawl-ref/source/mon-pick.cc at line 2203 [3.1767507]

Deletion in crawl-ref/source/mon-pick.cc at line 2684 [3.1767507]

Deletion in crawl-ref/source/mon-pick.cc at line 2704 [3.1767507]

Insertion in crawl-ref/source/mon-pick.cc at line 2738 [3.1767507]

Replacement in crawl-ref/settings/menu_colours.txt at line 59 [17.6002]