fiddlerwoaroof/crawl - Change KHIL64HDOAMK3KGECPUPQFUOZ76G2J7M5BSQR2YUBYCHB4DZ6V3QC

Move a little more code out of newgame.cc.

Created by Robert Vollmert on October 28, 2009

KHIL64HDOAMK3KGECPUPQFUOZ76G2J7M5BSQR2YUBYCHB4DZ6V3QC

Dependencies

In channels

main

Change contents

File addition: ng-init.h (----------)

[8.24]

#ifndef NG_INIT_H
#define NG_INIT_H
void fix_up_jiyva_name();
void initialise_branch_depths();
void initialise_item_descriptions();
#endif

File addition: ng-init.cc (----------)

[8.24]

/*
 *  File:       ng-init.cc
 *  Summary:    Initializing non-player-related parts of a new game.
 *
 * TODO: 'you' shouldn't occur here.
 *       Some of these might fit better elsewhere.
 */
#include "AppHdr.h"
#include "branch.h"
#include "describe.h"
#include "itemname.h"
#include "player.h"
#include "stuff.h"
static unsigned char _random_potion_description()
{
    int desc, nature, colour;
    do
    {
        desc = random2( PDQ_NQUALS * PDC_NCOLOURS );
        if (coinflip())
            desc %= PDC_NCOLOURS;
        nature = PQUAL(desc);
        colour = PCOLOUR(desc);
        // nature and colour correspond to primary and secondary in
        // itemname.cc.  This check ensures clear potions don't get odd
        // qualifiers.
    }
    while (colour == PDC_CLEAR && nature > PDQ_VISCOUS
           || desc == PDESCS(PDC_CLEAR));
    return static_cast<unsigned char>(desc);
}
// Determine starting depths of branches.
void initialise_branch_depths()
{
    branches[BRANCH_ECUMENICAL_TEMPLE].startdepth = random_range(4, 7);
    branches[BRANCH_ORCISH_MINES].startdepth      = random_range(6, 11);
    branches[BRANCH_ELVEN_HALLS].startdepth       = random_range(3, 4);
    branches[BRANCH_LAIR].startdepth              = random_range(8, 13);
    branches[BRANCH_HIVE].startdepth              = random_range(11, 16);
    branches[BRANCH_SLIME_PITS].startdepth        = random_range(5, 8);
    if ( coinflip() )
    {
        branches[BRANCH_SWAMP].startdepth  = random_range(2, 5);
        branches[BRANCH_SHOALS].startdepth = -1;
    }
    else
    {
        branches[BRANCH_SWAMP].startdepth  = -1;
        branches[BRANCH_SHOALS].startdepth = random_range(2, 5);
    }
    branches[BRANCH_SNAKE_PIT].startdepth      = random_range(3, 6);
    branches[BRANCH_VAULTS].startdepth         = random_range(14, 19);
    branches[BRANCH_CRYPT].startdepth          = random_range(2, 4);
    branches[BRANCH_HALL_OF_BLADES].startdepth = random_range(4, 6);
    branches[BRANCH_TOMB].startdepth           = random_range(2, 3);
}
static int _get_random_porridge_desc()
{
    return PDESCQ(PDQ_GLUGGY, one_chance_in(3) ? PDC_BROWN
                                               : PDC_WHITE);
}
static int _get_random_coagulated_blood_desc()
{
    potion_description_qualifier_type qualifier = PDQ_NONE;
    while (true)
    {
        switch (random2(4))
        {
        case 0:
            qualifier = PDQ_GLUGGY;
            break;
        case 1:
            qualifier = PDQ_LUMPY;
            break;
        case 2:
            qualifier = PDQ_SEDIMENTED;
            break;
        case 3:
            qualifier = PDQ_VISCOUS;
            break;
        }
        potion_description_colour_type colour = (coinflip() ? PDC_RED
                                                            : PDC_BROWN);
        int desc = PDESCQ(qualifier, colour);
        if (you.item_description[IDESC_POTIONS][POT_BLOOD] != desc)
            return desc;
    }
}
static int _get_random_blood_desc()
{
    return PDESCQ(coinflip() ? PDQ_NONE :
                  coinflip() ? PDQ_VISCOUS
                             : PDQ_SEDIMENTED, PDC_RED);
}
void initialise_item_descriptions()
{
    // Must remember to check for already existing colours/combinations.
    you.item_description.init(255);
    you.item_description[IDESC_POTIONS][POT_WATER] = PDESCS(PDC_CLEAR);
    you.item_description[IDESC_POTIONS][POT_PORRIDGE]
        = _get_random_porridge_desc();
    you.item_description[IDESC_POTIONS][POT_BLOOD]
        = _get_random_blood_desc();
    you.item_description[IDESC_POTIONS][POT_BLOOD_COAGULATED]
        = _get_random_coagulated_blood_desc();
    // The order here must match that of IDESC in describe.h
    const int max_item_number[6] = { NUM_WANDS,
                                     NUM_POTIONS,
                                     NUM_SCROLLS,
                                     NUM_JEWELLERY,
                                     NUM_SCROLLS,
                                     NUM_STAVES };
    for (int i = 0; i < NUM_IDESC; i++)
    {
        // Only loop until NUM_WANDS etc.
        for (int j = 0; j < max_item_number[i]; j++)
        {
            // Don't override predefines
            if (you.item_description[i][j] != 255)
                continue;
            // Pick a new description until it's good.
            while (true)
            {
                // The numbers below are always secondary * primary,
                // except for scrolls. (See itemname.cc.)
                switch (i)
                {
                case IDESC_WANDS: // wands
                    you.item_description[i][j] = random2( 16 * 12 );
                    if (coinflip())
                        you.item_description[i][j] %= 12;
                    break;
                case IDESC_POTIONS: // potions
                    you.item_description[i][j] = _random_potion_description();
                    break;
                case IDESC_SCROLLS: // scrolls: random seed for the name
                case IDESC_SCROLLS_II:
                    you.item_description[i][j] = random2(151);
                    break;
                case IDESC_RINGS: // rings
                    you.item_description[i][j] = random2( 13 * 13 );
                    if (coinflip())
                        you.item_description[i][j] %= 13;
                    break;
                case IDESC_STAVES: // staves and rods
                    you.item_description[i][j] = random2( 10 * 4 );
                    break;
                }
                bool is_ok = true;
                // Test whether we've used this description before.
                // Don't have p < j because some are preassigned.
                for (int p = 0; p < max_item_number[i]; p++)
                {
                    if (p == j)
                        continue;
                    if (you.item_description[i][p] == you.item_description[i][j])
                    {
                        is_ok = false;
                        break;
                    }
                }
                if (is_ok)
                    break;
            }
        }
    }
}
void fix_up_jiyva_name()
{
    do
        you.second_god_name = make_name(random_int(), false, 8, 'J');
    while (strncmp(you.second_god_name.c_str(), "J", 1) != 0);
    you.second_god_name = replace_all(you.second_god_name, " ", "");
}

Deletion in crawl-ref/source/newgame.h at line 64 [9.1131725]
B:BD[9.1132220] → [10.2615:2652]
```
void initialise_item_descriptions();
```
Insertion in crawl-ref/source/newgame.cc at line 10 [9.1132300]
[9.1134961]
[7.12024]
```
#include "ng-init.h"
```
Deletion in crawl-ref/source/newgame.cc at line 75 [9.1132300]
B:BD[11.14446] → [12.18317:18353]
```
static void _fix_up_god_name(void);
```

Deletion in crawl-ref/source/newgame.cc at line 337 [9.1132300]

B:BD[13.382272] → [11.15756:15806]

∅:D[11.15806] → [13.382321:382354]

B:BD[13.382321] → [13.382321:382354]

B:BD[13.382354] → [14.74160:74173]

∅:D[14.74173] → [13.382363:382416]

B:BD[13.382363] → [13.382363:382416]

∅:D[13.382416] → [9.1140695:1140696]

B:BD[9.1140695] → [9.1140695:1140696]

B:BD[9.1140696] → [13.382417:382539]

B:BD[13.382539] → [2.2459:2622]

∅:D[2.2622] → [11.15807:15813]

B:BD[13.382701] → [11.15807:15813]

B:BD[11.15813] → [15.2738:2793]

B:BD[15.2793] → [4.2788:2830]

∅:D[4.2830] → [13.382857:382858]

∅:D[16.8297] → [13.382857:382858]

∅:D[11.15965] → [13.382857:382858]

B:BD[13.382857] → [13.382857:382858]

B:BD[13.382858] → [17.2746:2791]

∅:D[17.2791] → [18.3255:3258]

B:BD[13.382891] → [18.3255:3258]

B:BD[18.3258] → [19.3859:3901]

∅:D[19.3901] → [11.15966:16006]

B:BD[18.3299] → [11.15966:16006]

∅:D[11.16006] → [18.3338:3340]

B:BD[18.3338] → [18.3338:3340]

B:BD[18.3340] → [20.24287:24359]

B:BD[20.24359] → [16.8298:8590]

B:BD[16.8590] → [6.2905:2977]

∅:D[21.259] → [22.681:709]

∅:D[6.2977] → [22.681:709]

∅:D[16.8663] → [22.681:709]

B:BD[20.24679] → [22.681:709]

B:BD[22.709] → [6.2978:3043]

∅:D[6.3043] → [23.487:536]

∅:D[16.8729] → [23.487:536]

B:BD[22.773] → [23.487:536]

∅:D[23.536] → [22.823:844]

B:BD[22.823] → [22.823:844]

B:BD[22.844] → [16.8730:8779]

B:BD[16.8779] → [6.3044:3109]

∅:D[23.602] → [22.958:964]

∅:D[6.3109] → [22.958:964]

B:BD[22.958] → [22.958:964]

B:BD[22.964] → [6.3110:3179]

∅:D[6.3179] → [16.8849:8989]

B:BD[16.8849] → [16.8849:8989]

∅:D[16.8989] → [20.24926:24995]

B:BD[20.24926] → [20.24926:24995]

B:BD[20.24995] → [16.8990:9059]

B:BD[16.9059] → [24.3094:3258]

∅:D[24.3258] → [13.382891:382894]

∅:D[18.4054] → [13.382891:382894]

∅:D[16.9059] → [13.382891:382894]

∅:D[20.25054] → [13.382891:382894]

B:BD[13.382891] → [13.382891:382894]

B:BD[13.382894] → [25.7071:7180]

B:BD[25.7180] → [24.3259:3276]

∅:D[24.3276] → [25.7204:7210]

B:BD[25.7204] → [25.7204:7210]

B:BD[25.7210] → [24.3277:3898]

∅:D[24.3898] → [25.7450:7456]

B:BD[25.7450] → [25.7450:7456]

B:BD[25.7456] → [24.3899:3901]

∅:D[24.3901] → [26.8932:8933]

B:BD[25.7456] → [26.8932:8933]

B:BD[26.8933] → [24.3902:4082]

∅:D[24.4082] → [25.7584:7587]

B:BD[25.7584] → [25.7584:7587]

B:BD[25.7587] → [10.2654:2690]

∅:D[27.871] → [9.1140716:1140718]

∅:D[10.2690] → [9.1140716:1140718]

∅:D[11.16051] → [9.1140716:1140718]

B:BD[9.1140716] → [9.1140716:1140718]

B:BD[9.1140718] → [19.3902:3975]

∅:D[19.3975] → [27.944:980]

B:BD[27.944] → [27.944:980]

∅:D[27.980] → [9.1140774:1140775]

B:BD[9.1140774] → [9.1140774:1140775]

B:BD[9.1140775] → [24.4083:4155]

∅:D[24.4155] → [25.7588:7642]

B:BD[9.1140775] → [25.7588:7642]

B:BD[25.7642] → [24.4156:4282]

∅:D[24.4282] → [25.7684:7746]

B:BD[28.8454] → [25.7684:7746]

B:BD[25.7746] → [3.2629:2676]

∅:D[27.1149] → [9.1141003:1141004]

∅:D[3.2676] → [9.1141003:1141004]

∅:D[25.7794] → [9.1141003:1141004]

∅:D[28.8454] → [9.1141003:1141004]

B:BD[9.1141003] → [9.1141003:1141004]

B:BD[9.1141004] → [29.3545:3606]

B:BD[29.3606] → [24.4283:4431]

∅:D[24.4431] → [29.3817:3869]

B:BD[29.3817] → [29.3817:3869]

B:BD[29.3869] → [24.4432:4482]

∅:D[24.4482] → [29.3937:3988]

B:BD[29.3937] → [29.3937:3988]

B:BD[29.3988] → [26.8936:8937]

∅:D[29.4026] → [27.1150:1190]

∅:D[26.8937] → [27.1150:1190]

B:BD[9.1141004] → [27.1150:1190]

∅:D[27.1190] → [13.382968:382974]

B:BD[13.382968] → [13.382968:382974]

B:BD[13.382974] → [19.3976:4018]

∅:D[19.4018] → [29.4069:4122]

B:BD[29.4069] → [29.4069:4122]

∅:D[29.4122] → [27.1321:1449]

B:BD[27.1321] → [27.1321:1449]

∅:D[27.1449] → [9.1141082:1141083]

∅:D[13.383092] → [9.1141082:1141083]

B:BD[9.1141082] → [9.1141082:1141083]

B:BD[9.1141083] → [19.4019:4074]

∅:D[19.4074] → [27.1504:1543]

B:BD[27.1504] → [27.1504:1543]

B:BD[27.1543] → [24.4483:4610]

∅:D[19.4182] → [27.1544:1822]

∅:D[29.4205] → [27.1544:1822]

∅:D[24.4610] → [27.1544:1822]

B:BD[9.1141110] → [27.1544:1822]

∅:D[27.1822] → [9.1141447:1141448]

B:BD[9.1141447] → [9.1141447:1141448]

B:BD[9.1141448] → [27.1823:1870]

B:BD[27.1870] → [11.16052:16131]

∅:D[11.16131] → [27.1948:1976]

B:BD[27.1948] → [27.1948:1976]

B:BD[27.1976] → [24.4611:4684]

∅:D[24.4684] → [27.2023:2386]

B:BD[27.2023] → [27.2023:2386]

B:BD[27.2386] → [29.4206:4356]

∅:D[29.4356] → [27.2386:2440]

B:BD[27.2386] → [27.2386:2440]

∅:D[30.345] → [9.1141496:1141497]

∅:D[27.2440] → [9.1141496:1141497]

B:BD[9.1141496] → [9.1141496:1141497]

B:BD[9.1141497] → [19.4183:4317]

B:BD[19.4317] → [24.4685:4746]

∅:D[24.4746] → [27.2645:2663]

B:BD[27.2645] → [27.2645:2663]

B:BD[27.2663] → [19.4318:4350]

∅:D[19.4350] → [27.2697:2731]

B:BD[27.2697] → [27.2697:2731]

∅:D[27.2731] → [9.1141791:1141792]

B:BD[9.1141791] → [9.1141791:1141792]

B:BD[9.1141792] → [11.16132:16214]

∅:D[11.16214] → [27.2812:2944]

B:BD[27.2812] → [27.2812:2944]

B:BD[27.2944] → [19.4351:4378]

∅:D[19.4378] → [27.2973:3014]

B:BD[27.2973] → [27.2973:3014]

∅:D[27.3014] → [9.1141820:1141836]

B:BD[9.1141820] → [9.1141820:1141836]

B:BD[9.1141836] → [27.3015:3018]

static unsigned char _random_potion_description()
{
    int desc, nature, colour;
    do
    {
        desc = random2( PDQ_NQUALS * PDC_NCOLOURS );
        if (coinflip())
            desc %= PDC_NCOLOURS;
        nature = PQUAL(desc);
        colour = PCOLOUR(desc);
        // nature and colour correspond to primary and secondary in
        // itemname.cc.  This check ensures clear potions don't get odd
        // qualifiers.
    }
    while (colour == PDC_CLEAR && nature > PDQ_VISCOUS
           || desc == PDESCS(PDC_CLEAR));
    return static_cast<unsigned char>(desc);
}
// Determine starting depths of branches.
static void _initialise_branch_depths()
{
    branches[BRANCH_ECUMENICAL_TEMPLE].startdepth = random_range(4, 7);
    branches[BRANCH_ORCISH_MINES].startdepth      = random_range(6, 11);
    branches[BRANCH_ELVEN_HALLS].startdepth       = random_range(3, 4);
    branches[BRANCH_LAIR].startdepth              = random_range(8, 13);
    branches[BRANCH_HIVE].startdepth              = random_range(11, 16);
    branches[BRANCH_SLIME_PITS].startdepth        = random_range(5, 8);
    if ( coinflip() )
    {
        branches[BRANCH_SWAMP].startdepth  = random_range(2, 5);
        branches[BRANCH_SHOALS].startdepth = -1;
    }
    else
    {
        branches[BRANCH_SWAMP].startdepth  = -1;
        branches[BRANCH_SHOALS].startdepth = random_range(2, 5);
    }
    branches[BRANCH_SNAKE_PIT].startdepth      = random_range(3, 6);
    branches[BRANCH_VAULTS].startdepth         = random_range(14, 19);
    branches[BRANCH_CRYPT].startdepth          = random_range(2, 4);
    branches[BRANCH_HALL_OF_BLADES].startdepth = random_range(4, 6);
    branches[BRANCH_TOMB].startdepth           = random_range(2, 3);
}
static int _get_random_porridge_desc()
{
    return PDESCQ(PDQ_GLUGGY, one_chance_in(3) ? PDC_BROWN
                                               : PDC_WHITE);
}
static int _get_random_coagulated_blood_desc()
{
    potion_description_qualifier_type qualifier = PDQ_NONE;
    while (true)
    {
        switch (random2(4))
        {
        case 0:
            qualifier = PDQ_GLUGGY;
            break;
        case 1:
            qualifier = PDQ_LUMPY;
            break;
        case 2:
            qualifier = PDQ_SEDIMENTED;
            break;
        case 3:
            qualifier = PDQ_VISCOUS;
            break;
        }
        potion_description_colour_type colour = (coinflip() ? PDC_RED
                                                            : PDC_BROWN);
        int desc = PDESCQ(qualifier, colour);
        if (you.item_description[IDESC_POTIONS][POT_BLOOD] != desc)
            return desc;
    }
}
static int _get_random_blood_desc()
{
    return PDESCQ(coinflip() ? PDQ_NONE :
                  coinflip() ? PDQ_VISCOUS
                             : PDQ_SEDIMENTED, PDC_RED);
}
void initialise_item_descriptions()
{
    // Must remember to check for already existing colours/combinations.
    you.item_description.init(255);
    you.item_description[IDESC_POTIONS][POT_WATER] = PDESCS(PDC_CLEAR);
    you.item_description[IDESC_POTIONS][POT_PORRIDGE]
        = _get_random_porridge_desc();
    you.item_description[IDESC_POTIONS][POT_BLOOD]
        = _get_random_blood_desc();
    you.item_description[IDESC_POTIONS][POT_BLOOD_COAGULATED]
        = _get_random_coagulated_blood_desc();
    // The order here must match that of IDESC in describe.h
    const int max_item_number[6] = { NUM_WANDS,
                                     NUM_POTIONS,
                                     NUM_SCROLLS,
                                     NUM_JEWELLERY,
                                     NUM_SCROLLS,
                                     NUM_STAVES };
    for (int i = 0; i < NUM_IDESC; i++)
    {
        // Only loop until NUM_WANDS etc.
        for (int j = 0; j < max_item_number[i]; j++)
        {
            // Don't override predefines
            if (you.item_description[i][j] != 255)
                continue;
            // Pick a new description until it's good.
            while (true)
            {
                // The numbers below are always secondary * primary,
                // except for scrolls. (See itemname.cc.)
                switch (i)
                {
                case IDESC_WANDS: // wands
                    you.item_description[i][j] = random2( 16 * 12 );
                    if (coinflip())
                        you.item_description[i][j] %= 12;
                    break;
                case IDESC_POTIONS: // potions
                    you.item_description[i][j] = _random_potion_description();
                    break;
                case IDESC_SCROLLS: // scrolls: random seed for the name
                case IDESC_SCROLLS_II:
                    you.item_description[i][j] = random2(151);
                    break;
                case IDESC_RINGS: // rings
                    you.item_description[i][j] = random2( 13 * 13 );
                    if (coinflip())
                        you.item_description[i][j] %= 13;
                    break;
                case IDESC_STAVES: // staves and rods
                    you.item_description[i][j] = random2( 10 * 4 );
                    break;
                }
                bool is_ok = true;
                // Test whether we've used this description before.
                // Don't have p < j because some are preassigned.
                for (int p = 0; p < max_item_number[i]; p++)
                {
                    if (p == j)
                        continue;
                    if (you.item_description[i][p] == you.item_description[i][j])
                    {
                        is_ok = false;
                        break;
                    }
                }
                if (is_ok)
                    break;
            }
        }
    }
}

Replacement in crawl-ref/source/newgame.cc at line 894 [9.1132300]
∅:D[31.2827] → [11.17830:17863]
B:BD[11.17830] → [11.17830:17863]
```
    _initialise_branch_depths();
```
[26.9156]
[32.2530]
```
    initialise_branch_depths();
```
Replacement in crawl-ref/source/newgame.cc at line 898 [9.1132300]
∅:D[5.2710] → [12.18394:18418]
B:BD[12.18394] → [12.18394:18418]
```
    _fix_up_god_name();
```
[5.2710]
[12.18418]
```
    fix_up_jiyva_name();
```

Deletion in crawl-ref/source/newgame.cc at line 3292 [9.1132300]

B:BD[33.3420] → [33.3420:3422]

B:BD[33.3422] → [34.2935:2936]

B:BD[34.2936] → [12.18571:18814]

}
static void _fix_up_god_name()
{
    do
        you.second_god_name = make_name(random_int(), false, 8, 'J');
    while (strncmp(you.second_god_name.c_str(), "J", 1) != 0);
    you.second_god_name = replace_all(you.second_god_name, " ", "");

Insertion in crawl-ref/source/makefile.obj at line 95 [35.79]
[35.549]
[7.12485]
```
ng-init.o \
```
Insertion in crawl-ref/source/acr.cc at line 90 [9.4397395]
[9.4400524]
[13.1255331]
```
#include "ng-init.h"
```

Move a little more code out of newgame.cc.

Dependencies

In channels

Change contents

File addition: ng-init.h (----------)

File addition: ng-init.cc (----------)

Deletion in crawl-ref/source/newgame.h at line 64 [9.1131725]

Insertion in crawl-ref/source/newgame.cc at line 10 [9.1132300]

Deletion in crawl-ref/source/newgame.cc at line 75 [9.1132300]

Deletion in crawl-ref/source/newgame.cc at line 337 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 894 [9.1132300]

Replacement in crawl-ref/source/newgame.cc at line 898 [9.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3292 [9.1132300]

Insertion in crawl-ref/source/makefile.obj at line 95 [35.79]

Insertion in crawl-ref/source/acr.cc at line 90 [9.4397395]