fiddlerwoaroof/crawl - Change MCYQKFAWI3AVSPBOROUONZ5PE3AIAEMRBOXRMZJ6MCAUHMFQNALAC

Kiku now gifts the lesser Necromancy books in a quick succession. Also, took a switch statement out of the book gifting department.

Signed-off-by: evktalo <evktalo@users.sourceforge.net>

Created by evktalo on October 3, 2009

MCYQKFAWI3AVSPBOROUONZ5PE3AIAEMRBOXRMZJ6MCAUHMFQNALAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 2169 [5.804403]
B:BD[4.6840] → [4.6840:6863]
```
       case GOD_JIYVA:
```
[4.6840]
[4.6863]
```
        case GOD_JIYVA:
```
Insertion in crawl-ref/source/religion.cc at line 2214 [5.804403]
[5.816886]
[6.177681]
```
        case GOD_KIKUBAAQUDGHA:
```
Deletion in crawl-ref/source/religion.cc at line 2217 [5.804403]
B:BD[6.177734] → [6.177734:177795]
∅:D[6.177795] → [5.817049:817063]
B:BD[5.817049] → [5.817049:817063]
B:BD[5.817063] → [6.177796:177843]
```
            if (you.piety > 160 && random2(you.piety) > 100)
            {
                unsigned int gift = NUM_BOOKS;
```

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

B:BD[6.177844] → [6.177844:177882]

∅:D[6.177882] → [5.817178:817196]

B:BD[5.817178] → [5.817178:817196]

B:BD[5.817361] → [6.178393:178523]

                switch (you.religion)
                {
                case GOD_SIF_MUNA:
                    gift = OBJ_RANDOM;      // Sif Muna - gives any
                    break;

[6.177844]

[5.817440]

            unsigned int gift = NUM_BOOKS;

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

B:BD[5.817441] → [6.178524:178631]

                // Vehumet - gives conj/summ. books (higher skill first)
                case GOD_VEHUMET:

[5.817441]

[6.178631]

            // Kikubaaqudgha gives the lesser Necromancy books in a quick
            // succession.
            if (you.religion == GOD_KIKUBAAQUDGHA)
            {
                if (you.piety >= piety_breakpoint(0)
                    && !you.had_book[BOOK_NECROMANCY])
                    gift = BOOK_NECROMANCY;
                else if (you.piety >= piety_breakpoint(2)
                    && !you.had_book[BOOK_DEATH])
                    gift = BOOK_DEATH;
                else if (you.piety >= piety_breakpoint(3)
                    && !you.had_book[BOOK_UNLIFE])
                    gift = BOOK_UNLIFE;
            }
            else if (you.piety > 160 && random2(you.piety) > 100)
            {
                if (you.religion == GOD_SIF_MUNA)
                    gift = OBJ_RANDOM;
                else if (you.religion == GOD_VEHUMET)
                {

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

B:BD[6.178916] → [6.178916:178982]

                        gift = BOOK_ANNIHILATIONS;  // conj books

[6.178916]

[6.178982]

                        gift = BOOK_ANNIHILATIONS;  // Conjuration books.

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

B:BD[6.179437] → [6.179437:179506]

                            gift = BOOK_DEMONOLOGY; // summoning bks

[6.179437]

[7.196158]

                            gift = BOOK_DEMONOLOGY; // Summoning books.

Deletion in crawl-ref/source/religion.cc at line 2257 [5.804403]
B:BD[7.196180] → [8.438:490]
∅:D[8.490] → [6.179507:179534]
B:BD[7.196180] → [6.179507:179534]
```
                    break;
                default:
                    break;
```
Insertion in crawl-ref/source/religion.cc at line 2258 [5.804403]
[5.817550]
[5.817550]
```
            }
```

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

B:BD[5.817551] → [6.179535:179573]

B:BD[6.179573] → [9.3212:3273]

                if (gift != NUM_BOOKS
                    && !grid_destroys_items(grd(you.pos())))

[5.817551]

[5.817580]

            if (gift != NUM_BOOKS
                && !grid_destroys_items(grd(you.pos())))
            {
                if (gift == OBJ_RANDOM)
                {
                    // Sif Muna special: Keep quiet if acquirement fails
                    // because the player already has seen all spells.
                    success = acquirement(OBJ_BOOKS, you.religion, true);
                }
                else

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

B:BD[5.817598] → [6.179648:179692]

                    if (gift == OBJ_RANDOM)

[5.817598]

[10.4859]

                    int thing_created = items(1, OBJ_BOOKS, gift, true, 1,
                                              MAKE_ITEM_RANDOM_RACE,
                                              0, 0, you.religion);
                    if (thing_created == NON_ITEM)
                        return;
                    move_item_to_grid( &thing_created, you.pos() );
                    if (thing_created != NON_ITEM)

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

B:BD[10.4881] → [10.4881:5111]

                        // Sif Muna special: Keep quiet if acquirement fails
                        // because the player already has seen all spells.
                        success = acquirement(OBJ_BOOKS, you.religion, true);

[10.4881]

[10.5111]

                        success = true;
                        mitm[thing_created].inscription = "god gift";

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

∅:D[10.5133] → [6.179764:179811]

B:BD[6.179764] → [6.179764:179811]

B:BD[6.179811] → [11.29596:29675]

B:BD[11.29675] → [12.2751:2895]

∅:D[12.2895] → [6.179896:179987]

∅:D[11.29749] → [6.179896:179987]

B:BD[6.179896] → [6.179896:179987]

                    else
                    {
                        int thing_created = items(1, OBJ_BOOKS, gift, true, 1,
                                                  MAKE_ITEM_RANDOM_RACE,
                                                  0, 0, you.religion);
                        if (thing_created == NON_ITEM)
                            return;

[10.5133]

[5.817694]

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

B:BD[5.817695] → [13.16844:16916]

                        move_item_to_grid( &thing_created, you.pos() );

[5.817695]

[5.817775]

                if (success)
                {
                    simple_god_message(" grants you a gift!");
                    more();

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

B:BD[5.817776] → [6.180072:180197]

B:BD[6.180197] → [14.2708:2782]

B:BD[6.180277] → [6.180277:180325]

∅:D[6.180325] → [5.817776:817777]

B:BD[5.817776] → [5.817776:817777]

B:BD[5.817777] → [6.180326:180359]

                        if (thing_created != NON_ITEM)
                        {
                            success = true;
                            mitm[thing_created].inscription = "god gift";
                        }
                    }
                    if (success)

[5.817776]

[6.180359]

                    // HACK: you.num_gifts keeps track of Necronomicon
                    // and weapon blessing for Kiku, so don't increase
                    // it. Also, timeouts are meaningles for Kiku. evk
                    if (you.religion != GOD_KIKUBAAQUDGHA)

Deletion in crawl-ref/source/religion.cc at line 2296 [5.804403]
B:BD[6.180381] → [2.2556:2623]
∅:D[2.2623] → [6.180453:180486]
B:BD[6.180453] → [6.180453:180486]
```
                        simple_god_message(" grants you a gift!");
                        more();
```
Deletion in crawl-ref/source/religion.cc at line 2298 [5.804403]
∅:D[3.2777] → [15.2116:2186]
B:BD[6.180609] → [15.2116:2186]
```
                        take_note(Note(NOTE_GOD_GIFT, you.religion));
```

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

[6.180680]

                    take_note(Note(NOTE_GOD_GIFT, you.religion));
                }

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

B:BD[6.180681] → [6.180681:180801]

B:BD[6.180801] → [16.6379:6440]

∅:D[16.6440] → [6.180861:180975]

B:BD[6.180861] → [6.180861:180975]

B:BD[6.180975] → [17.3762:3781]

B:BD[6.180994] → [18.2509:2519]

∅:D[18.2519] → [5.818051:818105]

∅:D[6.181005] → [5.818051:818105]

B:BD[5.818051] → [5.818051:818105]

                    // Vehumet gives books less readily
                    if (you.religion == GOD_VEHUMET && success)
                        _inc_gift_timeout(10 + random2(10));
                }                   // end of giving book
            }                       // end of book gods
            break;
        }
    }                           // end of gift giving

[6.180681]

[19.3701]

                // Vehumet gives books less readily
                if (you.religion == GOD_VEHUMET && success)
                    _inc_gift_timeout(10 + random2(10));
            }                   // End of giving books.
            break;              // End of book gods.
        }                       // switch (you.religion)
    }                           // End of gift giving.

Kiku now gifts the lesser Necromancy books in a quick succession. Also, took a switch statement out of the book gifting department.

Dependencies

In channels

Change contents

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

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

Deletion in crawl-ref/source/religion.cc at line 2217 [5.804403]