fiddlerwoaroof/crawl - Change WRPGGZRVGWWYCBWL5W5HMAM7CWLYICKZ6A36ZGQ3UEDW5O25FMOQC

FR 1919593: modified scoring system, as suggested by Lemuel

Clean-up of hiscores.cc.

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

Created by j-p-e-g on March 21, 2008

WRPGGZRVGWWYCBWL5W5HMAM7CWLYICKZ6A36ZGQ3UEDW5O25FMOQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/ouch.h at line 54 [9.1101726]
[8.58476]
[8.58476]
```
    // 26
```
Replacement in crawl-ref/source/ouch.h at line 58 [9.1101726]
B:BD[8.58561] → [8.58561:58601]
```
    KILLED_BY_CURARE,                  
```
[8.58561]
[8.58601]
```
    KILLED_BY_CURARE,                  // 30
```
Replacement in crawl-ref/source/ouch.h at line 61 [9.1101726]
B:BD[8.58648] → [8.58648:58677]
```
    KILLED_BY_BEOGH_SMITING,
```
[8.58648]
[9.1102273]
```
    KILLED_BY_BEOGH_SMITING,           // 33
```

Replacement in crawl-ref/source/hiscores.cc at line 81 [9.2987663]

B:BD[9.2989162] → [10.1054:1227]

∅:D[11.604] → [12.814023:814081]

∅:D[10.1227] → [12.814023:814081]

B:BD[9.2989256] → [12.814023:814081]

B:BD[12.814212] → [12.814212:814272]

B:BD[13.3126] → [13.3126:3175]

static FILE *hs_open(const char *mode, const std::string &filename);
static void hs_close(FILE *handle, const char *mode,
                     const std::string &filename);
static bool hs_read(FILE *scores, scorefile_entry &dest);
static void hs_write(FILE *scores, scorefile_entry &entry);
static time_t parse_time(const std::string &st);

[9.2989162]

[10.1228]

static FILE *_hs_open(const char *mode, const std::string &filename);
static void  _hs_close(FILE *handle, const char *mode,
                       const std::string &filename);
static bool  _hs_read(FILE *scores, scorefile_entry &dest);
static void  _hs_write(FILE *scores, scorefile_entry &entry);
static time_t _parse_time(const std::string &st);

Replacement in crawl-ref/source/hiscores.cc at line 113 [9.2987663]
B:BD[14.553] → [14.553:600]
```
    scores = hs_open("a+", score_file_name());
```
[14.553]
[14.600]
```
    scores = _hs_open("a+", score_file_name());
```

Replacement in crawl-ref/source/hiscores.cc at line 124 [9.2987663]

B:BD[14.834] → [14.834:885]

        if (hs_read(scores, *hs_list[i]) == false)

[14.834]

[9.2990717]

        if (_hs_read(scores, *hs_list[i]) == false)

Deletion in crawl-ref/source/hiscores.cc at line 139 [9.2987663]
B:BD[9.2991205] → [9.2991205:2991226]
B:BD[9.2991226] → [12.814814:814868]
B:BD[12.814868] → [14.1005:1039]
```
            } else {
                // copy new entry to current position
                *hs_list[i] = ne;
```

Insertion in crawl-ref/source/hiscores.cc at line 140 [9.2987663]

[9.2991331]

            else
                *hs_list[i] = ne; // copy new entry to current position

Replacement in crawl-ref/source/hiscores.cc at line 158 [9.2987663]
B:BD[9.2991788] → [14.1173:1224]
```
        hs_close(scores, "a+", score_file_name());
```
[9.2991788]
[9.2991865]
```
        _hs_close(scores, "a+", score_file_name());
```
Replacement in crawl-ref/source/hiscores.cc at line 176 [9.2987663]
B:BD[9.2991966] → [14.1594:1633]
```
        hs_write(scores, *hs_list[i]);
```
[9.2991966]
[14.1633]
```
        _hs_write(scores, *hs_list[i]);
```
Replacement in crawl-ref/source/hiscores.cc at line 181 [9.2987663]
B:BD[9.2992035] → [14.1666:1713]
```
    hs_close(scores, "a+", score_file_name());
```
[9.2992035]
[11.755]
```
    _hs_close(scores, "a+", score_file_name());
```
Replacement in crawl-ref/source/hiscores.cc at line 192 [9.2987663]
B:BD[11.918] → [10.1645:1690]
```
    logfile = hs_open("a", log_file_name());
```
[11.918]
[11.957]
```
    logfile = _hs_open("a", log_file_name());
```
Replacement in crawl-ref/source/hiscores.cc at line 199 [9.2987663]
B:BD[11.1087] → [11.1087:1114]
```
    hs_write(logfile, le);
```
[11.1087]
[11.1114]
```
    _hs_write(logfile, le);
```
Replacement in crawl-ref/source/hiscores.cc at line 202 [9.2987663]
B:BD[11.1137] → [10.1691:1736]
```
    hs_close(logfile, "a", log_file_name());
```
[11.1137]
[15.274]
```
    _hs_close(logfile, "a", log_file_name());
```

Replacement in crawl-ref/source/hiscores.cc at line 206 [9.2987663]

∅:D[2.172] → [15.277:426]

B:BD[15.277] → [15.277:426]

B:BD[15.426] → [2.173:219]

static void hiscores_print_entry(const scorefile_entry &se,
                                 int index,
                                 int format,
                                 t_printf pf)

[2.172]

[15.489]

static void _hiscores_print_entry(const scorefile_entry &se,
                                  int index, int format, t_printf pf)

Replacement in crawl-ref/source/hiscores.cc at line 231 [9.2987663]
∅:D[16.1879] → [15.1186:1238]
B:BD[15.1186] → [15.1186:1238]
```
    FILE *scores = hs_open("r", score_file_name());
```
[16.1879]
[15.1238]
```
    FILE *scores = _hs_open("r", score_file_name());
```
Replacement in crawl-ref/source/hiscores.cc at line 242 [9.2987663]
B:BD[15.1479] → [15.1479:1513]
```
        if (!hs_read(scores, se))
```
[15.1479]
[15.1513]
```
        if (!_hs_read(scores, se))
```

Replacement in crawl-ref/source/hiscores.cc at line 248 [9.2987663]

B:BD[13.3268] → [13.3268:3329]

            hiscores_print_entry(se, entry, format, printf);

[13.3268]

[15.1590]

            _hiscores_print_entry(se, entry, format, printf);

Replacement in crawl-ref/source/hiscores.cc at line 251 [9.2987663]
B:BD[15.1597] → [15.1597:1645]
```
    hs_close( scores, "r", score_file_name() );
```
[15.1597]
[9.2992062]
```
    _hs_close( scores, "r", score_file_name() );
```
Replacement in crawl-ref/source/hiscores.cc at line 267 [9.2987663]
B:BD[9.2992328] → [10.1737:1783]
```
    scores = hs_open("r", score_file_name());
```
[9.2992328]
[9.2992355]
```
    scores = _hs_open("r", score_file_name());
```

Replacement in crawl-ref/source/hiscores.cc at line 275 [9.2987663]

B:BD[14.1761] → [14.1761:1814]

        if (hs_read( scores, *hs_list[i] ) == false)

[14.1761]

[9.2992619]

        if (_hs_read( scores, *hs_list[i] ) == false)

Replacement in crawl-ref/source/hiscores.cc at line 281 [9.2987663]
B:BD[9.2992685] → [10.1784:1832]
```
    hs_close( scores, "r", score_file_name() );
```
[9.2992685]
[9.2992714]
```
    _hs_close( scores, "r", score_file_name() );
```

Replacement in crawl-ref/source/hiscores.cc at line 285 [9.2987663]

B:BD[9.2992768] → [9.2992768:2992828]

    int start = (newest_entry > 10) ? newest_entry - 10: 0;

[9.2992768]

[9.2992828]

    int start = (newest_entry > 10) ? newest_entry - 10 : 0;

Replacement in crawl-ref/source/hiscores.cc at line 288 [9.2987663]
B:BD[9.2992876] → [9.2992876:2992922]
```
       start = total_entries - display_count;
```
[9.2992876]
[9.2992922]
```
        start = total_entries - display_count;
```
Replacement in crawl-ref/source/hiscores.cc at line 291 [9.2987663]
B:BD[9.2992942] → [9.2992942:2992960]
```
       start = 0;
```
[9.2992942]
[9.2992960]
```
        start = 0;
```

Replacement in crawl-ref/source/hiscores.cc at line 301 [9.2987663]

B:BD[9.2993782] → [14.1815:1878]

        hiscores_print_entry(*hs_list[i], i, format, cprintf);

[9.2993782]

[9.2993921]

        _hiscores_print_entry(*hs_list[i], i, format, cprintf);

Replacement in crawl-ref/source/hiscores.cc at line 309 [9.2987663]

B:BD[9.2994079] → [9.2994079:2994145]

static const char *const range_type_verb( const char *const aux )

[9.2994079]

[9.2994145]

static const char *const _range_type_verb( const char *const aux )

Replacement in crawl-ref/source/hiscores.cc at line 328 [9.2987663]
B:BD[9.3002847] → [9.3002847:3002900]
```
static bool hiscore_same_day( time_t t1, time_t t2 )
```
[9.3002847]
[9.3002900]
```
static bool _hiscore_same_day( time_t t1, time_t t2 )
```

Replacement in crawl-ref/source/hiscores.cc at line 340 [9.2987663]

B:BD[9.3003163] → [9.3003163:3003232]

static void hiscore_date_string( time_t time, char buff[INFO_SIZE] )

[9.3003163]

[9.3003232]

static void _hiscore_date_string( time_t time, char buff[INFO_SIZE] )

Replacement in crawl-ref/source/hiscores.cc at line 351 [9.2987663]
B:BD[9.3003546] → [12.815412:815456]
```
static std::string hiscore_newline_string()
```
[9.3003546]
[9.3003605]
```
static std::string _hiscore_newline_string()
```

Replacement in crawl-ref/source/hiscores.cc at line 359 [9.2987663]

B:BD[9.3003808] → [17.1036:1065]

∅:D[17.1065] → [12.815616:815743]

B:BD[12.815616] → [12.815616:815743]

B:BD[12.815743] → [17.1066:1067]

    return se.hiscore_line( 
                verbose? 
                    scorefile_entry::DDV_VERBOSE 
                  : scorefile_entry::DDV_NORMAL );

[9.3003808]

[9.3020746]

    return se.hiscore_line( verbose ? scorefile_entry::DDV_VERBOSE
                                    : scorefile_entry::DDV_NORMAL );

Replacement in crawl-ref/source/hiscores.cc at line 367 [9.2987663]
B:BD[9.3022411] → [10.1833:1894]
```
FILE *hs_open( const char *mode, const std::string &scores )
```
[9.3022409]
[9.3022445]
```
FILE *_hs_open( const char *mode, const std::string &scores )
```

Replacement in crawl-ref/source/hiscores.cc at line 376 [9.2987663]

B:BD[9.3022891] → [10.1895:1970]

void hs_close( FILE *handle, const char *mode, const std::string &scores )

[9.3022891]

[9.3022939]

void _hs_close( FILE *handle, const char *mode, const std::string &scores )

Replacement in crawl-ref/source/hiscores.cc at line 381 [9.2987663]
B:BD[9.3025718] → [12.816100:816152]
```
bool hs_read( FILE *scores, scorefile_entry &dest )
```
[9.3025718]
[9.3025777]
```
bool _hs_read( FILE *scores, scorefile_entry &dest )
```
Replacement in crawl-ref/source/hiscores.cc at line 396 [9.2987663]
B:BD[9.3027212] → [9.3027212:3027246]
```
static int val_char( char digit )
```
[9.3026017]
[9.3027246]
```
static int _val_char( char digit )
```
Replacement in crawl-ref/source/hiscores.cc at line 401 [9.2987663]
B:BD[9.3028041] → [13.4017:4065]
```
static time_t parse_time(const std::string &st)
```
[9.3027401]
[9.3028111]
```
static time_t _parse_time(const std::string &st)
```

Replacement in crawl-ref/source/hiscores.cc at line 408 [9.2987663]

B:BD[9.3030483] → [13.4156:4299]

    date.tm_year = val_char( st[0] ) * 1000 + val_char( st[1] ) * 100
                    + val_char( st[2] ) * 10 + val_char( st[3] ) - 1900;

[9.3030483]

[9.3030520]

    date.tm_year  =   _val_char( st[0] ) * 1000 + _val_char( st[1] ) * 100
                    + _val_char( st[2] ) *   10 + _val_char( st[3] ) - 1900;

Replacement in crawl-ref/source/hiscores.cc at line 411 [9.2987663]

B:BD[9.3030521] → [13.4300:4624]

    date.tm_mon   = val_char( st[4] ) * 10 + val_char( st[5] );
    date.tm_mday  = val_char( st[6] ) * 10 + val_char( st[7] );
    date.tm_hour  = val_char( st[8] ) * 10 + val_char( st[9] );
    date.tm_min   = val_char( st[10] ) * 10 + val_char( st[11] );
    date.tm_sec   = val_char( st[12] ) * 10 + val_char( st[13] );

[9.3030521]

[13.4624]

    date.tm_mon   = _val_char( st[4] )  * 10 + _val_char( st[5] );
    date.tm_mday  = _val_char( st[6] )  * 10 + _val_char( st[7] );
    date.tm_hour  = _val_char( st[8] )  * 10 + _val_char( st[9] );
    date.tm_min   = _val_char( st[10] ) * 10 + _val_char( st[11] );
    date.tm_sec   = _val_char( st[12] ) * 10 + _val_char( st[13] );

Replacement in crawl-ref/source/hiscores.cc at line 421 [9.2987663]
B:BD[9.3030902] → [12.817116:817174]
```
static void hs_write( FILE *scores, scorefile_entry &se )
```
[9.3030902]
[9.3030967]
```
static void _hs_write( FILE *scores, scorefile_entry &se )
```

Replacement in crawl-ref/source/hiscores.cc at line 494 [9.2987663]

B:BD[13.6498] → [13.6498:6524]

B:BD[13.6550] → [13.6550:6876]

    version = se.version;
    points = se.points;
    name = se.name;
    uid = se.uid;
    race = se.race;
    cls = se.cls;
    race_class_name = se.race_class_name;
    lvl = se.lvl;
    best_skill = se.best_skill;
    best_skill_lvl = se.best_skill_lvl;
    death_type = se.death_type;
    death_source = se.death_source;
    mon_num = se.mon_num;

[13.6498]

[13.6876]

    version           = se.version;
    points            = se.points;
    name              = se.name;
    uid               = se.uid;
    race              = se.race;
    cls               = se.cls;
    race_class_name   = se.race_class_name;
    lvl               = se.lvl;
    best_skill        = se.best_skill;
    best_skill_lvl    = se.best_skill_lvl;
    death_type        = se.death_type;
    death_source      = se.death_source;
    mon_num           = se.mon_num;

Replacement in crawl-ref/source/hiscores.cc at line 508 [9.2987663]

B:BD[13.6922] → [13.6922:7510]

    auxkilldata = se.auxkilldata;
    dlvl = se.dlvl;
    level_type = se.level_type;
    branch = se.branch;
    final_hp = se.final_hp;
    final_max_hp = se.final_max_hp;
    final_max_max_hp = se.final_max_max_hp;
    damage = se.damage;
    str = se.str;
    intel = se.intel;
    dex = se.dex;
    god = se.god;
    piety = se.piety;
    penance = se.penance;
    wiz_mode = se.wiz_mode;
    birth_time = se.birth_time;
    death_time = se.death_time;
    real_time = se.real_time;
    num_turns = se.num_turns;
    num_diff_runes = se.num_diff_runes;
    num_runes = se.num_runes;

[13.6922]

[13.7510]

    auxkilldata       = se.auxkilldata;
    dlvl              = se.dlvl;
    level_type        = se.level_type;
    branch            = se.branch;
    final_hp          = se.final_hp;
    final_max_hp      = se.final_max_hp;
    final_max_max_hp  = se.final_max_max_hp;
    damage            = se.damage;
    str               = se.str;
    intel             = se.intel;
    dex               = se.dex;
    god               = se.god;
    piety             = se.piety;
    penance           = se.penance;
    wiz_mode          = se.wiz_mode;
    birth_time        = se.birth_time;
    death_time        = se.death_time;
    real_time         = se.real_time;
    num_turns         = se.num_turns;
    num_diff_runes    = se.num_diff_runes;
    num_runes         = se.num_runes;

Replacement in crawl-ref/source/hiscores.cc at line 575 [9.2987663]
B:BD[9.3038459] → [13.11991:12040]
```
static const char *short_branch_name(int branch)
```
[9.3035310]
[13.12040]
```
static const char* _short_branch_name(int branch)
```

Replacement in crawl-ref/source/hiscores.cc at line 594 [9.2987663]

B:BD[9.3039248] → [18.5116:5184]

static level_area_type str_to_level_area_type(const std::string &s)

[9.3039248]

[13.12702]

static level_area_type _str_to_level_area_type(const std::string &s)

Insertion in crawl-ref/source/hiscores.cc at line 599 [9.2987663]
[18.5239]
[13.12817]
```
            
```
Replacement in crawl-ref/source/hiscores.cc at line 606 [9.2987663]
∅:D[19.214] → [20.5945:6063]
B:BD[9.3039347] → [20.5945:6063]
∅:D[20.6063] → [9.3039368:3039369]
∅:D[13.13240] → [9.3039368:3039369]
B:BD[9.3039368] → [9.3039368:3039369]
B:BD[9.3039369] → [20.6064:6120]
B:BD[20.6120] → [6.4805:4871]
```
    points = fields->long_field("sc");
    name   = fields->str_field("name");
    uid    = fields->int_field("uid");
    race   = str_to_species(fields->str_field("race"));
    cls    = get_class_by_name(fields->str_field("cls").c_str());
```
[19.214]
[9.3039458]
```
    points  = fields->long_field("sc");
```

Replacement in crawl-ref/source/hiscores.cc at line 608 [9.2987663]

B:BD[9.3039459] → [20.6193:6231]

    lvl    = fields->int_field("xl");

[9.3039459]

[9.3039574]

    name    = fields->str_field("name");
    uid     = fields->int_field("uid");
    race    = str_to_species(fields->str_field("race"));
    cls     = get_class_by_name(fields->str_field("cls").c_str());
    lvl     = fields->int_field("xl");

Replacement in crawl-ref/source/hiscores.cc at line 614 [9.2987663]

B:BD[9.3039575] → [20.6232:6288]

    best_skill = str_to_skill(fields->str_field("sk"));

[9.3039575]

[20.6288]

    best_skill     = str_to_skill(fields->str_field("sk"));

Replacement in crawl-ref/source/hiscores.cc at line 616 [9.2987663]

B:BD[20.6337] → [20.6337:6401]

    death_type = str_to_kill_method(fields->str_field("ktyp"));

[20.6337]

[20.6401]


    death_type        = str_to_kill_method(fields->str_field("ktyp"));

Replacement in crawl-ref/source/hiscores.cc at line 619 [9.2987663]

B:BD[20.6454] → [20.6454:6499]

B:BD[20.6499] → [21.7153:7227]

∅:D[21.7227] → [20.6552:6659]

B:BD[20.6552] → [20.6552:6659]

    auxkilldata = fields->str_field("kaux");
    branch = str_to_branch(fields->str_field("br"), BRANCH_MAIN_DUNGEON);
    dlvl   = fields->int_field("lvl");
    level_type = str_to_level_area_type(fields->str_field("ltyp"));

[20.6454]

[9.3039876]

    auxkilldata       = fields->str_field("kaux");

Replacement in crawl-ref/source/hiscores.cc at line 621 [9.2987663]

B:BD[9.3039877] → [20.6660:6745]

    final_hp = fields->int_field("hp");
    final_max_hp = fields->int_field("mhp");

[9.3039877]

[20.6745]

    branch     = str_to_branch(fields->str_field("br"), BRANCH_MAIN_DUNGEON);
    dlvl       = fields->int_field("lvl");
    level_type = _str_to_level_area_type(fields->str_field("ltyp"));
    final_hp         = fields->int_field("hp");
    final_max_hp     = fields->int_field("mhp");

Insertion in crawl-ref/source/hiscores.cc at line 628 [9.2987663]
[20.6795]
[20.6795]
```
    
```

Replacement in crawl-ref/source/hiscores.cc at line 630 [9.2987663]

B:BD[20.6834] → [20.6834:6944]

    str = fields->int_field("str");
    intel = fields->int_field("int");
    dex = fields->int_field("dex");

[20.6834]

[13.13739]

    str    = fields->int_field("str");
    intel  = fields->int_field("int");
    dex    = fields->int_field("dex");

Replacement in crawl-ref/source/hiscores.cc at line 634 [9.2987663]

B:BD[13.13740] → [20.6945:7073]

    god = str_to_god(fields->str_field("god"));
    piety = fields->int_field("piety");
    penance = fields->int_field("pen");

[13.13740]

[20.7073]

    god      = str_to_god(fields->str_field("god"));
    piety    = fields->int_field("piety");
    penance  = fields->int_field("pen");

Replacement in crawl-ref/source/hiscores.cc at line 638 [9.2987663]

B:BD[20.7114] → [20.7114:7226]

    birth_time = parse_time(fields->str_field("start"));
    death_time = parse_time(fields->str_field("end"));

[20.7114]

[20.7226]

    
    birth_time = _parse_time(fields->str_field("start"));
    death_time = _parse_time(fields->str_field("end"));

Insertion in crawl-ref/source/hiscores.cc at line 643 [9.2987663]
[20.7315]
[20.7315]
```
    
```
Replacement in crawl-ref/source/hiscores.cc at line 645 [9.2987663]
B:BD[20.7364] → [20.7364:7408]
```
    num_runes = fields->int_field("nrune");
```
[20.7364]
[13.14352]
```
    num_runes      = fields->int_field("nrune");
```
Replacement in crawl-ref/source/hiscores.cc at line 656 [9.2987663]
B:BD[20.7621] → [20.7621:7662]
```
    fields->add_field("uid", "%d", uid);
```
[20.7621]
[22.4866]
```
    fields->add_field("uid",  "%d", uid);
```
Replacement in crawl-ref/source/hiscores.cc at line 660 [9.2987663]
∅:D[23.3011] → [20.7724:7781]
∅:D[22.5020] → [20.7724:7781]
B:BD[20.7724] → [20.7724:7781]
```
    fields->add_field("cls", "%s", get_class_name(cls));
```
[22.5020]
[3.150]
```
    fields->add_field("cls",  "%s", get_class_name(cls));
```

Replacement in crawl-ref/source/hiscores.cc at line 662 [9.2987663]

B:BD[3.188] → [3.188:282]

∅:D[3.282] → [20.7781:7880]

B:BD[20.7781] → [20.7781:7880]

                      get_species_abbrev(race),
                      get_class_abbrev(cls));
    fields->add_field("xl", "%d", lvl);
    fields->add_field("sk", "%s", skill_name(best_skill));

[3.188]

[20.7880]

                      get_species_abbrev(race), get_class_abbrev(cls));
    fields->add_field("xl",    "%d", lvl);
    fields->add_field("sk",    "%s", skill_name(best_skill));

Replacement in crawl-ref/source/hiscores.cc at line 667 [9.2987663]

B:BD[23.3049] → [23.3049:3113]

                      skill_title( best_skill, best_skill_lvl,

[23.3049]

[23.3113]

                      skill_title( best_skill, best_skill_lvl,

Replacement in crawl-ref/source/hiscores.cc at line 671 [9.2987663]

∅:D[20.8246] → [13.15195:15312]

B:BD[13.15195] → [13.15195:15312]

B:BD[13.15312] → [20.8247:8351]

              place_name(get_packed_place(branch, dlvl, level_type),
                         false, true).c_str());
    fields->add_field("br", "%s", short_branch_name(branch));
    fields->add_field("lvl", "%d", dlvl);

[20.8246]

[20.8351]

                      place_name(get_packed_place(branch, dlvl, level_type),
                                 false, true).c_str());
    fields->add_field("br",   "%s", _short_branch_name(branch));
    fields->add_field("lvl",  "%d", dlvl);

Replacement in crawl-ref/source/hiscores.cc at line 677 [9.2987663]

B:BD[13.15464] → [20.8423:8518]

    fields->add_field("hp", "%d", final_hp);
    fields->add_field("mhp", "%d", final_max_hp);

[13.15464]

[20.8518]

    fields->add_field("hp",   "%d", final_hp);
    fields->add_field("mhp",  "%d", final_max_hp);

Replacement in crawl-ref/source/hiscores.cc at line 693 [9.2987663]

B:BD[20.9124] → [20.9124:9221]

    fields->add_field("dur", "%ld", real_time);
    fields->add_field("turn", "%ld", num_turns);

[20.9050]

[13.16266]

    fields->add_field("dur",   "%ld", real_time);
    fields->add_field("turn",  "%ld", num_turns);

Replacement in crawl-ref/source/hiscores.cc at line 858 [9.2987663]

∅:D[19.455] → [12.823923:824160]

B:BD[12.823923] → [12.823923:824160]

    points = -1;
    name[0] = 0;
    uid = 0;
    race = 0; 
    cls = 0;
    lvl = 0;
    race_class_name[0] = 0;
    best_skill = 0;
    best_skill_lvl = 0;
    death_type = KILLED_BY_SOMETHING;
    death_source = 0;
    mon_num = 0;

[19.455]

[12.824160]

    points               = -1;
    name[0]              = 0;
    uid                  = 0;
    race                 = 0;
    cls                  = 0;
    lvl                  = 0;
    race_class_name[0]   = 0;
    best_skill           = 0;
    best_skill_lvl       = 0;
    death_type           = KILLED_BY_SOMETHING;
    death_source         = 0;
    mon_num              = 0;

Replacement in crawl-ref/source/hiscores.cc at line 871 [9.2987663]

B:BD[12.824190] → [12.824190:824228]

B:BD[12.824228] → [18.5413:5479]

∅:D[18.5479] → [12.824264:824394]

B:BD[12.824264] → [12.824264:824394]

B:BD[12.824394] → [24.52107:52129]

∅:D[24.52129] → [12.824408:824583]

B:BD[12.824408] → [12.824408:824583]

    auxkilldata[0] = 0;
    dlvl = 0;
    level_type = LEVEL_DUNGEON;
    branch = BRANCH_MAIN_DUNGEON;
    final_hp = -1;
    final_max_hp = -1;
    final_max_max_hp = -1;
    str = -1;
    intel = -1;
    dex = -1;
    damage = -1;
    god = GOD_NO_GOD;
    piety = -1;
    penance = -1;
    wiz_mode = 0;
    birth_time = 0;
    death_time = 0;
    real_time = -1;
    num_turns = -1;
    num_diff_runes = 0;
    num_runes = 0;

[12.824190]

[12.824583]

    auxkilldata[0]       = 0;
    dlvl                 = 0;
    level_type           = LEVEL_DUNGEON;
    branch               = BRANCH_MAIN_DUNGEON;
    final_hp             = -1;
    final_max_hp         = -1;
    final_max_max_hp     = -1;
    str                  = -1;
    intel                = -1;
    dex                  = -1;
    damage               = -1;
    god                  = GOD_NO_GOD;
    piety                = -1;
    penance              = -1;
    wiz_mode             = 0;
    birth_time           = 0;
    death_time           = 0;
    real_time            = -1;
    num_turns            = -1;
    num_diff_runes       = 0;
    num_runes            = 0;
}
static int _award_modified_experience()
{
    int xp = you.experience;
    int result = 0;
    
    if (xp <= 250000)
        return ((xp * 7) / 10);
        
    result += (250000 * 7) / 10;
    xp -= 250000;
    
    if (xp <= 750000)
    {
        result += (xp * 4) / 10;
        return (result);
    }
    
    result += (750000 * 4) / 10;
    xp -= 750000;
        
    if (xp <= 2000000)
    {
        result += (xp * 2) / 10;
        return (result);
    }
    result += (2000000 * 2) / 10;
    xp -= 2000000;
    
    result += (xp / 10);
    
    return (result);

Insertion in crawl-ref/source/hiscores.cc at line 945 [9.2987663]

[12.824981]

    /*
     *  old scoring system:
     *
     *    Gold
     *    + 0.7 * Experience
     *    + (distinct Runes +2)^2 * 1000, winners with distinct runes >= 3 only
     *    + value of Inventory, for winners only
     *
     *
     *  new scoring system, as suggested by Lemuel:
     *
     *    Gold
     *    + 0.7 * Experience up to 250,000
     *    + 0.4 * Experience between 250,000 and 1,000,000
     *    + 0.2 * Experience between 1,000,000 and 3,000,000
     *    + 0.1 * Experience above 3,000,000
     *    + (distinct Runes +2)^2 * 1000, winners with distinct runes >= 3 only
     *    + value of Inventory, for winners only
     *    + (250,000 * distinct Runes) * (25,000/(turns/rune)), for winners only
     *
     */

Replacement in crawl-ref/source/hiscores.cc at line 969 [9.2987663]
B:BD[12.825028] → [12.825028:825069]
```
    points += (you.experience * 7) / 10;
```
[12.825028]
[12.825069]
```
    points += _award_modified_experience();
```

Replacement in crawl-ref/source/hiscores.cc at line 971 [9.2987663]

B:BD[12.825070] → [12.825070:825272]

    //if (death_type == KILLED_BY_WINNING) points += points / 2;
    //if (death_type == KILLED_BY_LEAVING) points += points / 10;
    // these now handled by giving player the value of their inventory

[12.825070]

[12.825297]

    num_runes      = 0;
    num_diff_runes = 0;

Deletion in crawl-ref/source/hiscores.cc at line 975 [9.2987663]
B:BD[12.825463] → [12.825463:825508]
```
    num_runes = 0;
    num_diff_runes = 0;
```
Replacement in crawl-ref/source/hiscores.cc at line 976 [9.2987663]
B:BD[12.825553] → [12.825553:825580]
```
        rune_array[i] = 0;
```
[12.825553]
[12.825580]
```
         rune_array[i] = 0;
```

Replacement in crawl-ref/source/hiscores.cc at line 978 [9.2987663]

B:BD[12.825581] → [5.286:353]

    const bool calc_item_values = death_type == KILLED_BY_WINNING;

[12.825581]

[25.6012]

    // inventory value is only calculated for winners
    const bool calc_item_values = (death_type == KILLED_BY_WINNING);

Insertion in crawl-ref/source/hiscores.cc at line 1018 [9.2987663]

[25.6774]

[12.826622]


    if (calc_item_values) // winners only
    {
        points += (250000 * num_diff_runes)
                   * ( 25000 / (you.num_turns/num_diff_runes) );
    }

Replacement in crawl-ref/source/hiscores.cc at line 1030 [9.2987663]
B:BD[12.826774] → [12.826774:826800]
```
    cls = you.char_class;
```
[12.826774]
[12.826800]
```
    cls  = you.char_class;
```

Replacement in crawl-ref/source/hiscores.cc at line 1034 [9.2987663]

B:BD[12.826830] → [12.826830:826928]

    lvl = you.experience_level;
    best_skill = ::best_skill( SK_FIGHTING, NUM_SKILLS - 1, 99 );

[12.826830]

[12.826928]

    lvl            = you.experience_level;
    best_skill     = ::best_skill( SK_FIGHTING, NUM_SKILLS - 1, 99 );

Replacement in crawl-ref/source/hiscores.cc at line 1038 [9.2987663]

B:BD[12.826976] → [12.826976:827030]

    final_hp = you.hp;
    final_max_hp = you.hp_max;

[12.826976]

[12.827030]

    final_hp         = you.hp;
    final_max_hp     = you.hp_max;

Replacement in crawl-ref/source/hiscores.cc at line 1041 [9.2987663]

B:BD[12.827083] → [4.473:541]

    str = std::max(you.strength - stat_modifier(STAT_STRENGTH), 1);

[12.827083]

[4.541]

    
    str   = std::max(you.strength - stat_modifier(STAT_STRENGTH), 1);

Replacement in crawl-ref/source/hiscores.cc at line 1044 [9.2987663]

B:BD[4.612] → [4.612:676]

    dex = std::max(you.dex - stat_modifier(STAT_DEXTERITY), 1);

[4.612]

[12.827149]

    dex   = std::max(you.dex - stat_modifier(STAT_DEXTERITY), 1);

Replacement in crawl-ref/source/hiscores.cc at line 1049 [9.2987663]
B:BD[12.827216] → [12.827216:827243]
```
        piety = you.piety;
```
[12.827216]
[12.827243]
```
        piety   = you.piety;
```

Replacement in crawl-ref/source/hiscores.cc at line 1054 [9.2987663]

B:BD[12.827338] → [26.10760:10794]

∅:D[26.10794] → [12.828179:828245]

B:BD[12.828179] → [12.828179:828245]

    dlvl = player_branch_depth();
    branch = you.where_are_you;      // no adjustments necessary.

[12.827338]

[12.828245]

    dlvl       = player_branch_depth();
    branch     = you.where_are_you;  // no adjustments necessary.

Replacement in crawl-ref/source/hiscores.cc at line 1059 [9.2987663]
B:BD[12.828379] → [12.828379:828438]
```
    death_time = time( NULL );         // end time of game
```
[12.828379]
[12.828438]
```
    death_time = time( NULL );       // end time of game
```
Replacement in crawl-ref/source/hiscores.cc at line 1113 [9.2987663]
B:BD[12.829786] → [12.829786:829832]
```
            line += hiscore_newline_string();
```
[12.829786]
[12.829832]
```
            line += _hiscore_newline_string();
```
Replacement in crawl-ref/source/hiscores.cc at line 1144 [9.2987663]
B:BD[12.830662] → [12.830662:830699]
```
            terse? "" : " damage" );
```
[12.830662]
[12.830699]
```
                       terse? "" : " damage" );
```

Replacement in crawl-ref/source/hiscores.cc at line 1238 [9.2987663]

B:BD[12.832862] → [13.21839:21998]

        char_desc =
            make_stringf("%s%s", 
                         get_species_abbrev( race ),
                         get_class_abbrev( cls ) );

[12.832862]

[12.832988]

        char_desc = make_stringf("%s%s", get_species_abbrev( race ),
                                         get_class_abbrev( cls ) );

Deletion in crawl-ref/source/hiscores.cc at line 1242 [9.2987663]
B:BD[12.833003] → [12.833003:833009]
```
    {
```
Deletion in crawl-ref/source/hiscores.cc at line 1243 [9.2987663]
∅:D[13.22036] → [12.833114:833120]
B:BD[12.833114] → [12.833114:833120]
```
    }
```

Replacement in crawl-ref/source/hiscores.cc at line 1248 [9.2987663]

B:BD[12.833222] → [13.22037:22062]

∅:D[13.22062] → [12.833254:833315]

B:BD[12.833254] → [12.833254:833315]

B:BD[12.833315] → [13.22063:22130]

    return make_stringf(
             "%8ld %-10s %s-%02d%s", points, scname.c_str(),
             char_desc.c_str(), lvl, (wiz_mode == 1) ? "W" : "" );

[12.833222]

[12.833391]

    return make_stringf( "%8ld %-10s %s-%02d%s", points, scname.c_str(),
                         char_desc.c_str(), lvl, (wiz_mode == 1) ? "W" : "" );

Replacement in crawl-ref/source/hiscores.cc at line 1261 [9.2987663]
B:BD[12.833650] → [12.833650:833680]
B:BD[12.833680] → [17.1068:1099]
```
    char  scratch[INFO_SIZE];
    char  buf[HIGHSCORE_SIZE];
```
[12.833650]
[12.833706]
```
    char scratch[INFO_SIZE];
    char buf[HIGHSCORE_SIZE];
```

Replacement in crawl-ref/source/hiscores.cc at line 1271 [9.2987663]

B:BD[23.3282] → [23.3282:3369]

                               race, str, dex, god ).c_str(),
                  lvl );

[23.3282]

[12.834103]

                               race, str, dex, god ).c_str(), lvl );

Replacement in crawl-ref/source/hiscores.cc at line 1298 [9.2987663]
B:BD[12.834756] → [12.834756:834794]
```
    desc += hiscore_newline_string();
```
[12.834756]
[12.834794]
```
    desc += _hiscore_newline_string();
```

Replacement in crawl-ref/source/hiscores.cc at line 1312 [9.2987663]

B:BD[12.835109] → [12.835109:835165]

            hiscore_date_string( birth_time, scratch );

[12.835109]

[12.835165]

            _hiscore_date_string( birth_time, scratch );

Replacement in crawl-ref/source/hiscores.cc at line 1317 [9.2987663]
B:BD[12.835226] → [12.835226:835268]
```
        desc += hiscore_newline_string();
```
[12.835226]
[12.835268]
```
        desc += _hiscore_newline_string();
```

Replacement in crawl-ref/source/hiscores.cc at line 1324 [9.2987663]

B:BD[12.835445] → [12.835445:835506]

                          (lvl >= 20) ? "Favourite " : "" );

[12.835445]

[12.835506]

                                   (lvl >= 20) ? "Favourite " : "" );

Replacement in crawl-ref/source/hiscores.cc at line 1327 [9.2987663]

B:BD[12.835540] → [12.835540:835590]

                desc += hiscore_newline_string();

[12.835540]

[12.835590]

                desc += _hiscore_newline_string();

Replacement in crawl-ref/source/hiscores.cc at line 1334 [9.2987663]

B:BD[12.835847] → [12.835847:836195]

                          (piety >  160) ? "the Champion" :
                          (piety >= 120) ? "a High Priest" :
                          (piety >= 100) ? "an Elder" :
                          (piety >=  75) ? "a Priest" :
                          (piety >=  50) ? "a Believer" :
                          (piety >=  30) ? "a Follower"

[12.835847]

[12.836195]

                             (piety >  160) ? "the Champion" :
                             (piety >= 120) ? "a High Priest" :
                             (piety >= 100) ? "an Elder" :
                             (piety >=  75) ? "a Priest" :
                             (piety >=  50) ? "a Believer" :
                             (piety >=  30) ? "a Follower"

Replacement in crawl-ref/source/hiscores.cc at line 1342 [9.2987663]

∅:D[27.3345] → [12.836300:836366]

B:BD[12.836300] → [12.836300:836366]

                          (penance > 0) ? " (penitent)." : "." );

[27.3345]

[12.836366]

                             (penance > 0) ? " (penitent)." : "." );

Replacement in crawl-ref/source/hiscores.cc at line 1345 [9.2987663]

B:BD[12.836400] → [12.836400:836450]

                desc += hiscore_newline_string();

[12.836400]

[12.836450]

                desc += _hiscore_newline_string();

Replacement in crawl-ref/source/hiscores.cc at line 1376 [9.2987663]

B:BD[12.837190] → [12.837190:837285]

        place_name(get_packed_place(branch, dlvl, level_type),
                   true, true);

[12.837190]

[12.837285]

        place_name(get_packed_place(branch, dlvl, level_type), true, true);

Replacement in crawl-ref/source/hiscores.cc at line 1387 [9.2987663]

B:BD[12.837470] → [12.837470:837526]

        && !hiscore_same_day( birth_time, death_time ))

[12.837470]

[12.837526]

        && !_hiscore_same_day( birth_time, death_time ))

Replacement in crawl-ref/source/hiscores.cc at line 1390 [9.2987663]
B:BD[12.837557] → [12.837557:837609]
```
        hiscore_date_string( death_time, scratch );
```
[12.837557]
[12.837609]
```
        _hiscore_date_string( death_time, scratch );
```
Replacement in crawl-ref/source/hiscores.cc at line 1395 [9.2987663]
B:BD[12.837660] → [12.837660:837699]
```
    place += hiscore_newline_string();
```
[12.837660]
[12.837699]
```
    place += _hiscore_newline_string();
```
Replacement in crawl-ref/source/hiscores.cc at line 1400 [9.2987663]
B:BD[7.2679] → [7.2679:2717]
```
static bool species_is_undead(int sp)
```
[7.2679]
[7.2717]
```
static bool _species_is_undead(int sp)
```

Replacement in crawl-ref/source/hiscores.cc at line 1405 [9.2987663]

B:BD[12.837723] → [12.837723:837809]

std::string 
scorefile_entry::death_description(death_desc_verbosity verbosity) const

[12.837723]

[12.837809]

std::string scorefile_entry::death_description(death_desc_verbosity verbosity)
            const

Replacement in crawl-ref/source/hiscores.cc at line 1465 [9.2987663]

B:BD[12.839397] → [13.22563:22627]

                      range_type_verb( auxkilldata.c_str() ) );

[12.839397]

[12.839455]

                      _range_type_verb( auxkilldata.c_str() ) );

Replacement in crawl-ref/source/hiscores.cc at line 1542 [9.2987663]
B:BD[7.3072] → [7.3072:3114]
```
        else if (species_is_undead(race))
```
[7.3072]
[7.3114]
```
        else if (_species_is_undead(race))
```
Replacement in crawl-ref/source/hiscores.cc at line 1576 [9.2987663]
B:BD[12.842051] → [7.3208:3254]
```
            else if (species_is_undead(race))
```
[12.842051]
[7.3254]
```
            else if (_species_is_undead(race))
```

Replacement in crawl-ref/source/hiscores.cc at line 1767 [9.2987663]

B:BD[7.3450] → [7.3450:3500]

                desc += hiscore_newline_string();

[7.3450]

[7.3500]

                desc += _hiscore_newline_string();

Replacement in crawl-ref/source/hiscores.cc at line 1783 [9.2987663]

B:BD[7.4061] → [7.4061:4129]

                    && !hiscore_same_day( birth_time, death_time ))

[7.4061]

[7.4129]

                    && !_hiscore_same_day( birth_time, death_time ))

Replacement in crawl-ref/source/hiscores.cc at line 1786 [9.2987663]

B:BD[7.4183] → [7.4183:4247]

                    hiscore_date_string( death_time, scratch );

[7.4183]

[7.4247]

                    _hiscore_date_string( death_time, scratch );

Replacement in crawl-ref/source/hiscores.cc at line 1791 [9.2987663]

B:BD[7.4332] → [7.4332:4382]

                desc += hiscore_newline_string();

[7.4332]

[12.847014]

                desc += _hiscore_newline_string();

Replacement in crawl-ref/source/hiscores.cc at line 1798 [9.2987663]
B:BD[12.847171] → [12.847171:847217]
```
            desc += hiscore_newline_string();
```
[12.847171]
[12.847217]
```
            desc += _hiscore_newline_string();
```

Replacement in crawl-ref/source/hiscores.cc at line 1836 [9.2987663]

B:BD[13.24673] → [13.24673:24727]

                    desc += hiscore_newline_string();

[13.24673]

[13.24727]

                    desc += _hiscore_newline_string();

Replacement in crawl-ref/source/hiscores.cc at line 1854 [9.2987663]
B:BD[12.848561] → [12.848561:848607]
```
            desc += hiscore_newline_string();
```
[12.848561]
[12.848607]
```
            desc += _hiscore_newline_string();
```

Replacement in crawl-ref/source/hiscores.cc at line 1890 [9.2987663]

B:BD[20.10023] → [20.10023:10102]

std::vector<std::string>
xlog_fields::split_fields(const std::string &s) const

[20.10023]

[20.10102]

std::vector<std::string> xlog_fields::split_fields(const std::string &s) const

Replacement in crawl-ref/source/hiscores.cc at line 1948 [9.2987663]

B:BD[20.11516] → [20.11516:11597]

    fields.push_back(
        std::pair<std::string, std::string>( key, buf ) );

[20.11516]

[20.11597]

    fields.push_back( std::pair<std::string, std::string>( key, buf ) );

FR 1919593: modified scoring system, as suggested by Lemuel

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/ouch.h at line 54 [9.1101726]

Replacement in crawl-ref/source/ouch.h at line 58 [9.1101726]

Replacement in crawl-ref/source/ouch.h at line 61 [9.1101726]

Replacement in crawl-ref/source/hiscores.cc at line 81 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 113 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 124 [9.2987663]

Deletion in crawl-ref/source/hiscores.cc at line 139 [9.2987663]

Insertion in crawl-ref/source/hiscores.cc at line 140 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 158 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 176 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 181 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 192 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 199 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 202 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 206 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 231 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 242 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 248 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 251 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 267 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 275 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 281 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 285 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 288 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 291 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 301 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 309 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 328 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 340 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 351 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 359 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 367 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 376 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 381 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 396 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 401 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 408 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 411 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 421 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 494 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 508 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 575 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 594 [9.2987663]

Insertion in crawl-ref/source/hiscores.cc at line 599 [9.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 606 [9.2987663]