fiddlerwoaroof/crawl - Change G6WNKWA4GNUGNOH63AKXJQMQS2V4FGJ55CB4P2Z3MPSX3UPMVF6AC

Made Tome of Destruction more consistent for those with high Evoc.

Made manuals visibly different from spellbooks. Also, you can't cancel reading a manual; so you risk wasting it if you read all unIDed books.

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

Created by haranp on November 13, 2007

G6WNKWA4GNUGNOH63AKXJQMQS2V4FGJ55CB4P2Z3MPSX3UPMVF6AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.h at line 28 [3.3]

B:BD[3.590] → [3.590:658]

void xom_is_stimulated(int maxinterestingness, std::string message,

[3.590]

[3.658]

void xom_is_stimulated(int maxinterestingness, const std::string& message,

Replacement in crawl-ref/source/xom.cc at line 198 [4.3]

B:BD[3.2978] → [3.2978:3046]

void xom_is_stimulated(int maxinterestingness, std::string message,

[3.2978]

[3.3046]

void xom_is_stimulated(int maxinterestingness, const std::string& message,

Replacement in crawl-ref/source/itemname.cc at line 1444 [6.2667494]

B:BD[5.33875] → [5.33875:33903]

                 << "book";

[5.33875]

[6.2734447]

                 << (item_typ == BOOK_MANUAL ? "manual" : "book");

Replacement in crawl-ref/source/item_use.cc at line 3675 [6.2781507]
B:BD[6.2857341] → [7.50128:50156]
```
    int spell, spell_index;
```
[6.2857341]
[6.2857377]
```
    item_def& book(you.inv[item_slot]);
```
Replacement in crawl-ref/source/item_use.cc at line 3677 [6.2781507]
B:BD[6.2857378] → [6.2857378:2857435]
```
    if (you.inv[item_slot].sub_type == BOOK_DESTRUCTION)
```
[6.2857378]
[6.2857435]
```
    if (book.sub_type == BOOK_DESTRUCTION)
```
Deletion in crawl-ref/source/item_use.cc at line 3680 [6.2781507]
B:BD[6.2857485] → [6.2857485:2857495]
```
        {
```

Replacement in crawl-ref/source/item_use.cc at line 3681 [6.2781507]

B:BD[6.2857568] → [6.2857568:2857633]

            return;
        }
        tome_of_power(item_slot);

[6.2857568]

[6.2857633]

        else
            tome_of_power(item_slot);

Replacement in crawl-ref/source/item_use.cc at line 3685 [6.2781507]
B:BD[6.2857655] → [6.2857655:2857712]
```
    else if (you.inv[item_slot].sub_type == BOOK_MANUAL)
```
[6.2857655]
[6.2857712]
```
    else if (book.sub_type == BOOK_MANUAL)
```

Replacement in crawl-ref/source/item_use.cc at line 3694 [6.2781507]

B:BD[6.2857809] → [6.2857809:2857876]

        spell = read_book( you.inv[item_slot], RBOOK_READ_SPELL );

[6.2857809]

[2.279]

        const int ltr = read_book( book, RBOOK_READ_SPELL );

Replacement in crawl-ref/source/item_use.cc at line 3696 [6.2781507]

B:BD[2.280] → [2.280:348]

        if (spell < 'a' || spell > 'h')     //jmf: was 'g', but 8=h

[2.280]

[2.348]

        if (ltr < 'a' || ltr > 'h')     //jmf: was 'g', but 8=h

Replacement in crawl-ref/source/item_use.cc at line 3702 [6.2781507]

B:BD[6.2857883] → [2.417:465]

∅:D[2.465] → [6.2857999:2858000]

B:BD[6.2857999] → [6.2857999:2858000]

B:BD[6.2858000] → [2.466:613]

        spell_index = letter_to_index( spell );
        const spell_type nthing =
            which_spell_in_book(you.inv[item_slot].sub_type, spell_index);
        if (nthing == SPELL_NO_SPELL)

[6.2857883]

[2.613]

        const spell_type spell = which_spell_in_book(book.sub_type,
                                                     letter_to_index(ltr));
        if (spell == SPELL_NO_SPELL)

Replacement in crawl-ref/source/item_use.cc at line 3710 [6.2781507]
B:BD[6.2858045] → [2.682:716]
```
        describe_spell( nthing );
```
[6.2858045]
[6.2858201]
```
        describe_spell( spell );
```
Replacement in crawl-ref/source/it_use3.h at line 20 [6.2869150]
B:BD[6.2869649] → [6.2869649:2869684]
```
void skill_manual(char sc_read_2);
```
[6.2869649]
[6.2869684]
```
void skill_manual(int slot);
```
Replacement in crawl-ref/source/it_use3.h at line 27 [6.2869150]
B:BD[6.2869907] → [6.2869907:2869943]
```
void tome_of_power(char sc_read_2);
```
[6.2869907]
[6.2869943]
```
void tome_of_power(int slot);
```
Replacement in crawl-ref/source/it_use3.h at line 34 [6.2869150]
B:BD[6.2870150] → [6.2870150:2870176]
```
bool evoke_wielded(void);
```
[6.2870150]
[6.2870176]
```
bool evoke_wielded();
```
Replacement in crawl-ref/source/it_use3.h at line 41 [6.2869150]
B:BD[6.2870383] → [6.2870383:2870411]
```
void special_wielded(void);
```
[6.2870383]
[6.2870411]
```
void special_wielded();
```
Replacement in crawl-ref/source/it_use3.cc at line 799 [6.2870456]
B:BD[6.2895063] → [6.2895063:2895098]
```
void tome_of_power(char sc_read_2)
```
[6.2895063]
[6.2895098]
```
void tome_of_power(int slot)
```
Deletion in crawl-ref/source/it_use3.cc at line 801 [6.2870456]
B:BD[6.2895100] → [6.2895100:2895168]
```
    int temp_rand = 0;          // probability determination {dlb}
```
Deletion in crawl-ref/source/it_use3.cc at line 804 [6.2870456]
B:BD[6.2895278] → [7.50369:50415]
∅:D[7.50415] → [6.2895304:2895327]
B:BD[6.2895304] → [6.2895304:2895327]
```
    spell_type spell_casted = SPELL_NO_SPELL;
    struct bolt beam;
```
Replacement in crawl-ref/source/it_use3.cc at line 812 [6.2870456]
B:BD[6.2895567] → [6.2895567:2895629]
```
    set_ident_flags( you.inv[sc_read_2], ISFLAG_IDENT_MASK );
```
[6.2895567]
[6.2895629]
```
    set_ident_flags( you.inv[slot], ISFLAG_KNOW_TYPE );
```

Replacement in crawl-ref/source/it_use3.cc at line 824 [6.2870456]

B:BD[6.2895910] → [6.2895910:2896009]

    temp_rand = random2(50) + random2( you.skills[SK_EVOCATIONS] / 3 ); 
    switch (random2(50))

[6.2895910]

[6.2896009]

    if ( random2(50) < 7 )

Deletion in crawl-ref/source/it_use3.cc at line 826 [6.2870456]

B:BD[6.2896015] → [6.2896015:2896099]

    case 0:
    case 3:
    case 4:
    case 6:
    case 7:
    case 8:
    case 9:

Replacement in crawl-ref/source/it_use3.cc at line 830 [6.2870456]
∅:D[8.7561] → [6.2896320:2896361]
∅:D[4.51395] → [6.2896320:2896361]
B:BD[6.2896320] → [6.2896320:2896361]
```
        return;
    case 1:
    case 14:
```
[4.51395]
[6.2896361]
```
    }
    else if ( random2(43) < 2 )
    {
```
Replacement in crawl-ref/source/it_use3.cc at line 837 [6.2870456]
∅:D[8.7663] → [6.2896506:2896548]
∅:D[4.51427] → [6.2896506:2896548]
B:BD[6.2896506] → [6.2896506:2896548]
```
        return;
    case 2:
    case 13:
```
[4.51427]
[6.2896548]
```
    }
    else if ( random2(41) < 2 )
    {
```
Replacement in crawl-ref/source/it_use3.cc at line 843 [6.2870456]
∅:D[8.7745] → [6.2896690:2896745]
∅:D[4.51459] → [6.2896690:2896745]
B:BD[6.2896690] → [6.2896690:2896745]
```
        return;
    case 5:
    case 11:
    case 12:
```
[4.51459]
[6.2896745]
```
    }
    else if ( random2(39) < 3 )
    {
```
Replacement in crawl-ref/source/it_use3.cc at line 849 [6.2870456]
B:BD[6.2896848] → [6.2896848:2896899]
```
            dec_inv_item_quantity( sc_read_2, 1 );
```
[6.2896848]
[6.2896899]
```
            dec_inv_item_quantity( slot, 1 );
```
Insertion in crawl-ref/source/it_use3.cc at line 852 [6.2870456]
[6.2896910]
[6.2896910]
```
        bolt beam;
```

Replacement in crawl-ref/source/it_use3.cc at line 864 [6.2870456]

B:BD[6.2897362] → [6.2897362:2897418]

        beam.aux_source = "an exploding Tome of Power";

[6.2897362]

[6.2897418]

        beam.aux_source = "an exploding tome of Destruction";

Replacement in crawl-ref/source/it_use3.cc at line 871 [6.2870456]
∅:D[4.51492] → [6.2897501:2897517]
B:BD[6.2897501] → [6.2897501:2897517]
B:BD[6.2897518] → [6.2897518:2897532]
```
        return;
    case 10:
```
[4.51492]
[9.29883]
```
    }
    else if (one_chance_in(36))
    {
```
Deletion in crawl-ref/source/it_use3.cc at line 881 [6.2870456]
∅:D[4.51525] → [6.2897798:2897814]
B:BD[6.2897798] → [6.2897798:2897814]
```
        return;
```
Insertion in crawl-ref/source/it_use3.cc at line 882 [6.2870456]
[6.2897820]
[6.2897820]
```
    else
    {
        viewwindow(1, false);
```

Replacement in crawl-ref/source/it_use3.cc at line 886 [6.2870456]

B:BD[6.2897821] → [6.2897821:2897847]

    viewwindow(1, false);

[6.2897821]

[6.2897847]

        int temp_rand = random2(23) + random2(you.skills[SK_EVOCATIONS] / 3);
        
        if (temp_rand > 25)
            temp_rand = 25;

Replacement in crawl-ref/source/it_use3.cc at line 891 [6.2870456]

B:BD[6.2897848] → [6.2897848:2897920]

    temp_rand = random2(23) + random2( you.skills[SK_EVOCATIONS] / 3 );

[6.2897848]

[6.2897920]

        const spell_type spell_casted =
            ((temp_rand > 24) ? SPELL_LEHUDIBS_CRYSTAL_SPEAR :
             (temp_rand > 21) ? SPELL_BOLT_OF_FIRE :
             (temp_rand > 18) ? SPELL_BOLT_OF_COLD :
             (temp_rand > 16) ? SPELL_LIGHTNING_BOLT :
             (temp_rand > 10) ? SPELL_FIREBALL :
             (temp_rand >  9) ? SPELL_VENOM_BOLT :
             (temp_rand >  8) ? SPELL_BOLT_OF_DRAINING :
             (temp_rand >  7) ? SPELL_BOLT_OF_INACCURACY :
             (temp_rand >  6) ? SPELL_STICKY_FLAME :
             (temp_rand >  5) ? SPELL_TELEPORT_SELF :
             (temp_rand >  4) ? SPELL_CIGOTUVIS_DEGENERATION :
             (temp_rand >  3) ? SPELL_POLYMORPH_OTHER :
             (temp_rand >  2) ? SPELL_MEPHITIC_CLOUD :
             (temp_rand >  1) ? SPELL_THROW_FLAME :
             (temp_rand >  0) ? SPELL_THROW_FROST
                              : SPELL_MAGIC_DART);

Replacement in crawl-ref/source/it_use3.cc at line 909 [6.2870456]
B:BD[6.2897921] → [6.2897921:2897969]
```
    if (temp_rand > 25)
        temp_rand = 25;
```
[6.2897921]
[6.2897969]
```
        your_spells( spell_casted, powc, false );
    }
}
```

Replacement in crawl-ref/source/it_use3.cc at line 913 [6.2870456]

B:BD[6.2897970] → [6.2897970:2899093]

    spell_casted = ((temp_rand > 19) ? SPELL_FIREBALL :
                    (temp_rand > 16) ? SPELL_BOLT_OF_FIRE :
                    (temp_rand > 13) ? SPELL_BOLT_OF_COLD :
                    (temp_rand > 11) ? SPELL_LIGHTNING_BOLT :
                    (temp_rand > 10) ? SPELL_LEHUDIBS_CRYSTAL_SPEAR :
                    (temp_rand >  9) ? SPELL_VENOM_BOLT :
                    (temp_rand >  8) ? SPELL_BOLT_OF_DRAINING :
                    (temp_rand >  7) ? SPELL_BOLT_OF_INACCURACY :
                    (temp_rand >  6) ? SPELL_STICKY_FLAME :
                    (temp_rand >  5) ? SPELL_TELEPORT_SELF :
                    (temp_rand >  4) ? SPELL_CIGOTUVIS_DEGENERATION :
                    (temp_rand >  3) ? SPELL_POLYMORPH_OTHER :
                    (temp_rand >  2) ? SPELL_MEPHITIC_CLOUD :
                    (temp_rand >  1) ? SPELL_THROW_FLAME :
                    (temp_rand >  0) ? SPELL_THROW_FROST
                                     : SPELL_MAGIC_DART);
    your_spells( spell_casted, powc, false );
}                               // end tome_of_power()
void skill_manual(char sc_read_2)

[6.2897970]

[6.2899093]

void skill_manual(int slot)

Replacement in crawl-ref/source/it_use3.cc at line 915 [6.2870456]
B:BD[6.2899117] → [6.2899117:2899180]
B:BD[6.2899180] → [10.18081:18128]
∅:D[10.18128] → [6.2899237:2899238]
B:BD[6.2899237] → [6.2899237:2899238]
B:BD[6.2899238] → [10.18129:18218]
∅:D[10.18218] → [6.2899344:2899345]
B:BD[6.2899344] → [6.2899344:2899345]
```
    set_ident_flags( you.inv[sc_read_2], ISFLAG_IDENT_MASK );
    const int skill = you.inv[sc_read_2].plus;
    const char* skname = skill_name(skill);
    mprf("This is a manual of %s!", skname);
```
[6.2899095]
[11.766007]
```
    // Removed confirmation request because you know it's
    // a manual in advance.
```

Replacement in crawl-ref/source/it_use3.cc at line 918 [6.2870456]

∅:D[11.766036] → [6.2899371:2899416]

B:BD[6.2899371] → [6.2899371:2899416]


    if (!yesno("Read it?"))
        return;

[11.766036]

[6.2899416]

    item_def& manual(you.inv[slot]);
    set_ident_flags( manual, ISFLAG_KNOW_TYPE );
    const int skill = manual.plus;

Replacement in crawl-ref/source/it_use3.cc at line 922 [6.2870456]
B:BD[6.2899417] → [10.18219:18259]
```
    mprf("You read about %s.", skname);
```
[6.2899417]
[6.2899526]
```
    mprf("You read about %s.", skill_name(skill));
```

Replacement in crawl-ref/source/it_use3.cc at line 928 [6.2870456]

B:BD[6.2899607] → [6.2899607:2899699]

        mpr("The book crumbles into dust.");
        dec_inv_item_quantity( sc_read_2, 1 );

[6.2899607]

[6.2899699]

        mpr("The manual crumbles into dust.");
        dec_inv_item_quantity( slot, 1 );

Replacement in crawl-ref/source/it_use3.cc at line 933 [6.2870456]
B:BD[6.2899720] → [6.2899720:2899771]
```
        mpr("The book looks somewhat more worn.");
```
[6.2899720]
[6.2899771]
```
        mpr("The manual looks somewhat more worn.");
```
Replacement in crawl-ref/source/it_use3.cc at line 936 [6.2870456]
∅:D[4.51553] → [6.2899777:2899831]
B:BD[6.2899777] → [6.2899777:2899831]
```
}                               // end skill_manual()
```
[4.51553]
[6.2899831]
```
}
```

Made Tome of Destruction more consistent for those with high Evoc.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.h at line 28 [3.3]

Replacement in crawl-ref/source/xom.cc at line 198 [4.3]

Replacement in crawl-ref/source/itemname.cc at line 1444 [6.2667494]

Replacement in crawl-ref/source/item_use.cc at line 3675 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3677 [6.2781507]

Deletion in crawl-ref/source/item_use.cc at line 3680 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3681 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3685 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3694 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3696 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3702 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3710 [6.2781507]

Replacement in crawl-ref/source/it_use3.h at line 20 [6.2869150]

Replacement in crawl-ref/source/it_use3.h at line 27 [6.2869150]

Replacement in crawl-ref/source/it_use3.h at line 34 [6.2869150]

Replacement in crawl-ref/source/it_use3.h at line 41 [6.2869150]

Replacement in crawl-ref/source/it_use3.cc at line 799 [6.2870456]

Deletion in crawl-ref/source/it_use3.cc at line 801 [6.2870456]

Deletion in crawl-ref/source/it_use3.cc at line 804 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 812 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 824 [6.2870456]

Deletion in crawl-ref/source/it_use3.cc at line 826 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 830 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 837 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 843 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 849 [6.2870456]

Insertion in crawl-ref/source/it_use3.cc at line 852 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 864 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 871 [6.2870456]

Deletion in crawl-ref/source/it_use3.cc at line 881 [6.2870456]

Insertion in crawl-ref/source/it_use3.cc at line 882 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 886 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 891 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 909 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 913 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 915 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 918 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 922 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 928 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 933 [6.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 936 [6.2870456]