fiddlerwoaroof/crawl - Change GUXTGUEMZYBRGV5QUAQSJHG3AOIQDWWCDIMOX4LASFJAZVGL2WQAC

Hmm... looks like my last commit didn't make it.

So now this one combines Beogh's conversion changed to include Invocations, and the Backspace key for the character selection.

For the latter Backspace doesn't seem to work on Linux terminals (or at least, via PuTTy), so I added Space as an alternative. Could still be improved, I guess.

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

Created by j-p-e-g on July 11, 2007

GUXTGUEMZYBRGV5QUAQSJHG3AOIQDWWCDIMOX4LASFJAZVGL2WQAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 629 [4.16817]

B:BD[2.702] → [2.702:768]

            random2(you.piety/9) > random2(hd) + hd + random2(5))

[2.702]

[2.768]

            random2(you.piety/18) + random2( you.skills[SK_INVOCATIONS]-4 )
              > random2(hd) + hd + random2(5))

Replacement in crawl-ref/source/religion.cc at line 1896 [4.804403]

B:BD[5.12857] → [5.12857:12895]

        if (followers_abandon_you())

[5.12857]

[5.12895]

        if (you.religion == GOD_BEOGH && followers_abandon_you())

Insertion in crawl-ref/source/religion.cc at line 2190 [4.804403]

[3.2687]

[6.15991]

                        const int hd = monster->hit_dice;
                        // during penance followers get a saving throw
                        if (random2((you.piety-you.penance[GOD_BEOGH])/18) +
                            random2(you.skills[SK_INVOCATIONS]-6)
                              > random2(hd) + hd + random2(5))
                        {
                           continue;
                        }

Insertion in crawl-ref/source/player.cc at line 4519 [4.962854]
[7.355487]
[7.355487]
```
    hp_max = 0;
```
Insertion in crawl-ref/source/player.cc at line 4522 [4.962854]
[7.355548]
[8.201501]
```
    max_magic_points = 0;
```
Replacement in crawl-ref/source/newgame.cc at line 102 [4.1132300]
∅:D[9.103] → [10.163:196]
∅:D[11.111] → [10.163:196]
B:BD[10.163] → [10.163:196]
```
static void choose_weapon(void);
```
[11.111]
[11.112]
```
static bool choose_weapon(void);
```
Replacement in crawl-ref/source/newgame.cc at line 122 [4.1132300]
B:BD[4.1136423] → [4.1136423:1136460]
```
static void give_items_skills(void);
```
[4.1136423]
[12.1326]
```
static bool give_items_skills(void);
```
Insertion in crawl-ref/source/newgame.cc at line 715 [4.1132300]
[4.1149083]
[13.8016]
```
game_start:
```

Replacement in crawl-ref/source/newgame.cc at line 781 [4.1132300]

B:BD[13.9921] → [13.9921:9946]

    give_items_skills();

[13.9921]

[13.9946]

    // returns false if Backspace on god/weapon/... selection
    if (!give_items_skills())
    {
        // now choose again, name stays same
        char *name = new char();
        strcpy(name, you.your_name);
        
        Options.prev_randpick = false;
        Options.prev_race   = ng_race;
        Options.prev_cls    = ng_cls;
        Options.prev_weapon = ng_weapon;
        // ck, dk, pr and book are asked last
        // --> don't need to be changed
        // reset stats
        init_player();
        Options.reset_startup_options();
        
        strncpy(you.your_name, name, kNameLen);
        you.your_name[kNameLen - 1] = 0;
        // choose new character
        goto game_start;
    }

Replacement in crawl-ref/source/newgame.cc at line 1480 [4.1132300]

B:BD[7.383792] → [7.383792:383863]

static void choose_book( item_def& book, int firstbook, int numbooks )

[7.383792]

[7.383863]

static bool choose_book( item_def& book, int firstbook, int numbooks )

Replacement in crawl-ref/source/newgame.cc at line 1495 [4.1132300]
B:BD[14.74260] → [14.74260:74276]
```
        return;
```
[14.74260]
[7.384284]
```
        return true;
```

Replacement in crawl-ref/source/newgame.cc at line 1514 [4.1132300]

B:BD[14.74707] → [15.1004:1040]

        cprintf(EOL "* - Random" );

[14.74707]

[14.74743]

        cprintf(EOL "* - Random choice; "
                    "Bksp - Back to species and class selection; "
                    "X - Quit" EOL);

Insertion in crawl-ref/source/newgame.cc at line 1535 [4.1132300]

[14.75236]

[15.1041]

 
            if (keyin == CK_BKSP || keyin == ' ')
                return false;
            if (keyin == 'X')
            {
                cprintf(EOL "Goodbye!");
                end(0);
            }

Insertion in crawl-ref/source/newgame.cc at line 1566 [4.1132300]
[7.385855]
[7.385855]
```
    return true;
```
Replacement in crawl-ref/source/newgame.cc at line 1573 [4.1132300]
B:BD[4.1168183] → [10.715:749]
```
static void choose_weapon( void )
```
[4.1168183]
[4.1168210]
```
static bool choose_weapon( void )
```
Replacement in crawl-ref/source/newgame.cc at line 1586 [4.1132300]
B:BD[4.1168650] → [4.1168650:1168666]
```
        return;
```
[4.1168650]
[4.1168666]
```
        return true;
```
Replacement in crawl-ref/source/newgame.cc at line 1597 [4.1132300]
∅:D[8.217081] → [4.1168955:1168971]
B:BD[4.1168955] → [4.1168955:1168971]
```
        return;
```
[8.217081]
[4.1168971]
```
        return true;
```

Replacement in crawl-ref/source/newgame.cc at line 1623 [4.1132300]

B:BD[8.217338] → [15.1230:1266]

        cprintf(EOL "* - Random" );

[8.217338]

[8.217374]

        cprintf(EOL "* - Random choice; "
                    "Bksp - Back to species and class selection; "
                    "X - Quit" EOL);

Insertion in crawl-ref/source/newgame.cc at line 1642 [4.1132300]

[4.1169717]


            if (keyin == CK_BKSP || keyin == ' ')
                return false;
            if (keyin == 'X')
            {
                cprintf(EOL "Goodbye!");
                end(0);
            }

Insertion in crawl-ref/source/newgame.cc at line 1695 [4.1132300]
[8.218559]
[4.1170349]
```
        
    return true;
```
Replacement in crawl-ref/source/newgame.cc at line 3357 [4.1132300]
B:BD[4.1214735] → [4.1214735:1214760]
```
void give_items_skills()
```
[4.1214735]
[4.1214760]
```
bool give_items_skills()
```

Replacement in crawl-ref/source/newgame.cc at line 3450 [4.1132300]

B:BD[4.1218416] → [4.1218416:1218445]

            choose_weapon();

[4.1218416]

[4.1218445]

            if (!choose_weapon())
                return false;

Replacement in crawl-ref/source/newgame.cc at line 3547 [4.1132300]

B:BD[4.1221403] → [14.76698:76756]

        choose_book( you.inv[2], BOOK_MINOR_MAGIC_I, 3 );

[4.1221403]

[4.1221648]

        if (!choose_book( you.inv[2], BOOK_MINOR_MAGIC_I, 3 ))
           return false;

Replacement in crawl-ref/source/newgame.cc at line 3630 [4.1132300]

B:BD[6.18663] → [6.18663:18713]

            cprintf(EOL "* - random choice" EOL);

[6.18663]

[6.18713]

            cprintf(EOL "* - Random choice; "
                        "Bksp - Back to species and class selection; "
                        "X - Quit" EOL);

Insertion in crawl-ref/source/newgame.cc at line 3662 [4.1132300]

[4.1223851]

[6.19011]

            case CK_BKSP:
            case ' ':
                return false;
            case 'X':
                cprintf(EOL "Goodbye!");
                end(0);
                break;

Replacement in crawl-ref/source/newgame.cc at line 3748 [4.1132300]
B:BD[4.1225932] → [4.1225932:1225957]
```
        choose_weapon();
```
[4.1225932]
[4.1225957]
```
        if (!choose_weapon())
            return false;
```

Replacement in crawl-ref/source/newgame.cc at line 4176 [4.1132300]

B:BD[14.76803] → [14.76803:76866]

            choose_book( you.inv[2], BOOK_CONJURATIONS_I, 2 );

[14.76803]

[14.76866]

        {
            if (!choose_book( you.inv[2], BOOK_CONJURATIONS_I, 2 ))
                return false;
        }

Replacement in crawl-ref/source/newgame.cc at line 4468 [4.1132300]
B:BD[4.1249923] → [4.1249923:1249948]
```
        choose_weapon();
```
[4.1249884]
[4.1249948]
```
        if (!choose_weapon())
            return false;
```
Replacement in crawl-ref/source/newgame.cc at line 4502 [4.1132300]
B:BD[4.1251022] → [4.1251022:1251047]
```
        choose_weapon();
```
[4.1250983]
[4.1251047]
```
        if (!choose_weapon())
            return false;
```

Replacement in crawl-ref/source/newgame.cc at line 4548 [4.1132300]

B:BD[6.19435] → [6.19435:19485]

            cprintf(EOL "* - random choice" EOL);

[6.19435]

[6.19485]

            cprintf(EOL "* - Random choice; "
                        "Bksp - Back to species and class selection; "
                        "X - Quit" EOL);

Insertion in crawl-ref/source/newgame.cc at line 4574 [4.1132300]

[4.1252427]

[6.19551]

            case CK_BKSP:
            case ' ':      
                return false;
            case 'X':
                cprintf(EOL "Goodbye!");
                end(0);
                break;

Replacement in crawl-ref/source/newgame.cc at line 4637 [4.1132300]
B:BD[4.1254005] → [4.1254005:1254030]
```
        choose_weapon();
```
[4.1253966]
[4.1254030]
```
        if (!choose_weapon())
            return false;
```

Replacement in crawl-ref/source/newgame.cc at line 4678 [4.1132300]

B:BD[6.19661] → [6.19661:19711]

            cprintf(EOL "* - random choice" EOL);

[6.19661]

[8.233384]

            cprintf(EOL "* - Random choice; "
                        "Bksp - Back to species and class selection; "
                        "X - Quit" EOL);

Insertion in crawl-ref/source/newgame.cc at line 4706 [4.1132300]

[4.1255250]

[6.19770]

            case CK_BKSP:
            case ' ':
                return false;
            case 'X':
                cprintf(EOL "Goodbye!");
                end(0);
                break;

Replacement in crawl-ref/source/newgame.cc at line 4793 [4.1132300]
B:BD[4.1257136] → [4.1257136:1257161]
```
        choose_weapon();
```
[4.1257097]
[4.1257161]
```
        if (!choose_weapon())
            return false;
```
Insertion in crawl-ref/source/newgame.cc at line 4899 [4.1132300]
[4.1260376]
[4.1260376]
```
    return true;
```

Hmm... looks like my last commit didn't make it.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 629 [4.16817]

Replacement in crawl-ref/source/religion.cc at line 1896 [4.804403]

Insertion in crawl-ref/source/religion.cc at line 2190 [4.804403]

Insertion in crawl-ref/source/player.cc at line 4519 [4.962854]

Insertion in crawl-ref/source/player.cc at line 4522 [4.962854]

Replacement in crawl-ref/source/newgame.cc at line 102 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 122 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 715 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 781 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1480 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1495 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1514 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1535 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1566 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1573 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1586 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1597 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 1623 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1642 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1695 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3357 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3450 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3547 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3630 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 3662 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3748 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4176 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4468 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4502 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4548 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 4574 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4637 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4678 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 4706 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4793 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 4899 [4.1132300]