fiddlerwoaroof/crawl - Change 2P3IJKK547AOEFWKXEAL73QFKW423GGAZEZHW6OZ6QB7YUSDNC3AC

Modify database lookup to allow for lookup of the nth entry for a

given keyword. Used for more varied recite speech, so that the same prechosen synonym can be used for all of start/continue/stop/finish reciting. The number of the entry is calculated in an embarassingly hacky way: (recite power + hp at beginning of recite + x_pos + y_pos) modulo total weight of the keyword.

This makes sure that different synonyms get used, though always the same one (plus its shorter variant) during one round of recite, but it's not as random as I'd like. It works well enough for now, though, and adds some much needed flavour to Zin.

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

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

2P3IJKK547AOEFWKXEAL73QFKW423GGAZEZHW6OZ6QB7YUSDNC3AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 266 [4.1699344]
B:BD[3.620] → [3.620:657]
```
            md.glyph = me->showchar;
```
[3.620]
[3.657]
```
            md.glyph  = me->showchar;
```
Replacement in crawl-ref/source/mon-util.cc at line 331 [4.1699344]
B:BD[5.469520] → [5.469520:469577]
```
}                               // end mons_class_flag()
```
[5.469520]
[5.469577]
```
}
```
Replacement in crawl-ref/source/mon-util.cc at line 593 [4.1699344]
B:BD[4.1705759] → [4.1705759:1705812]
```
}                               // end mons_shouts()
```
[4.1705759]
[4.1705812]
```
}
```
Insertion in crawl-ref/source/delay.cc at line 20 [4.3963459]
[5.993477]
[4.3963729]
```
#include "database.h"
```

Insertion in crawl-ref/source/delay.cc at line 195 [4.3963459]

[6.6800]


static const char* _get_recite_speech(const std::string key, int weight)
{
    const std::string str
              = getWeightedSpeechString("zin_recite_speech_", key,
                                        weight + you.x_pos + you.y_pos);
    
    if (!str.empty())
        return (str.c_str());

Insertion in crawl-ref/source/delay.cc at line 205 [4.3963459]
[6.6801]
[5.993770]
```
    return ("reciting the Axioms of Law");
}
```

Replacement in crawl-ref/source/delay.cc at line 354 [4.3963459]

B:BD[6.6834] → [6.6834:6870]

        mpr( "You stop reciting.");

[6.6834]

[6.6870]

        mprf(MSGCH_PLAIN, "You stop %s.",
             _get_recite_speech("stop", delay.parm1 + delay.parm2));

Replacement in crawl-ref/source/delay.cc at line 553 [4.3963459]

B:BD[6.7695] → [6.7695:7841]

            mprf(MSGCH_MULTITURN_ACTION,
                 "You begin to recite %s's Axioms of Law.",
                 god_name(GOD_ZIN).c_str());

[6.7695]

[7.5610]

            mprf(MSGCH_PLAIN, "You begin %s.",
                 _get_recite_speech("start", delay.parm1 + delay.parm2));

Replacement in crawl-ref/source/delay.cc at line 703 [4.3963459]

B:BD[6.8390] → [6.8390:8491]

            mpr("You continue reciting the Axioms of Law.",
                MSGCH_MULTITURN_ACTION);

[6.8390]

[7.5753]

            mprf(MSGCH_MULTITURN_ACTION, "You continue %s.",
                 _get_recite_speech("continue", delay.parm1 + delay.parm2));

Replacement in crawl-ref/source/delay.cc at line 810 [4.3963459]

B:BD[6.8624] → [6.8624:8681]

        mpr( "You finish reciting the Axioms of Law." );

[6.8624]

[6.8681]

        mprf(MSGCH_PLAIN, "You finish %s.",
             _get_recite_speech("finish", delay.parm1 + delay.parm2));

Insertion in crawl-ref/source/database.h at line 48 [9.13319]
[8.1753]
[9.13836]

Insertion in crawl-ref/source/database.h at line 50 [9.13319]

[9.13837]

[10.732]

std::string getWeightedSpeechString(const std::string &key,
                                    const std::string &suffix,
                                    const int weight = -1);

Replacement in crawl-ref/source/database.cc at line 56 [9.13932]

B:BD[11.3494] → [11.3494:3568]

static void store_text_db(const std::string &in, const std::string &out);

[11.3494]

[12.39721]

static void _store_text_db(const std::string &in, const std::string &out);

Replacement in crawl-ref/source/database.cc at line 173 [9.13932]
B:BD[11.6523] → [11.6523:6572]
```
        store_text_db(full_input_path, db_path);
```
[11.6523]
[11.6572]
```
        _store_text_db(full_input_path, db_path);
```
Replacement in crawl-ref/source/database.cc at line 273 [9.13932]
B:BD[12.40899] → [13.550:601]
```
static void execute_embedded_lua(std::string &str)
```
[12.40899]
[13.601]
```
static void _execute_embedded_lua(std::string &str)
```
Replacement in crawl-ref/source/database.cc at line 307 [9.13932]
B:BD[14.4508] → [14.4508:4558]
```
static void trim_leading_newlines(std::string &s)
```
[13.1653]
[14.4558]
```
static void _trim_leading_newlines(std::string &s)
```

Replacement in crawl-ref/source/database.cc at line 312 [9.13932]

B:BD[14.4606] → [14.4606:4675]

static void add_entry(DBM *db, const std::string &k, std::string &v)

[14.4606]

[14.4675]

static void _add_entry(DBM *db, const std::string &k, std::string &v)

Replacement in crawl-ref/source/database.cc at line 314 [9.13932]
B:BD[14.4677] → [14.4677:4707]
```
    trim_leading_newlines(v);
```
[14.4677]
[14.4707]
```
    _trim_leading_newlines(v);
```
Replacement in crawl-ref/source/database.cc at line 326 [9.13932]
B:BD[14.4965] → [12.40900:40955]
```
static void parse_text_db(std::ifstream &inf, DBM *db)
```
[14.4965]
[14.5025]
```
static void _parse_text_db(std::ifstream &inf, DBM *db)
```

Replacement in crawl-ref/source/database.cc at line 344 [9.13932]

B:BD[14.5314] → [14.5314:5357]

                add_entry(db, key, value);

[14.5314]

[14.5357]

                _add_entry(db, key, value);

Replacement in crawl-ref/source/database.cc at line 369 [9.13932]
B:BD[14.5805] → [14.5805:5840]
```
        add_entry(db, key, value);
```
[14.5805]
[14.5840]
```
        _add_entry(db, key, value);
```

Replacement in crawl-ref/source/database.cc at line 372 [9.13932]

B:BD[14.5843] → [12.40956:41029]

static void store_text_db(const std::string &in, const std::string &out)

[14.5843]

[14.5921]

static void _store_text_db(const std::string &in, const std::string &out)

Replacement in crawl-ref/source/database.cc at line 380 [9.13932]
B:BD[14.6111] → [12.41030:41062]
```
        parse_text_db(inf, db);
```
[14.6111]
[14.6148]
```
        _parse_text_db(inf, db);
```

Replacement in crawl-ref/source/database.cc at line 389 [9.13932]

B:BD[12.41064] → [12.41064:41120]

static std::string chooseStrByWeight(std::string entry)

[12.41064]

[12.41120]

static std::string _chooseStrByWeight(std::string entry, int fixed_weight = -1)

Insertion in crawl-ref/source/database.cc at line 403 [9.13932]
[12.41515]
[12.41515]
```
            
```

Replacement in crawl-ref/source/database.cc at line 435 [9.13932]

B:BD[12.42157] → [12.42157:42224]

    int choice = random2(total_weight);
    std::string str = "";

[12.42157]

[12.42224]

    int choice = 0;
    if (fixed_weight != -1)
        choice = fixed_weight % total_weight;
    else
        choice = random2(total_weight);

Replacement in crawl-ref/source/database.cc at line 451 [9.13932]

B:BD[12.42448] → [12.42448:42706]

static std::string getRandomizedStr(DBM *database, const std::string &key,
                                    const std::string &suffix,
                                    int &num_replacements,
                                    int recursion_depth = 0)

[12.42448]

[12.42706]

static std::string _getWeightedString(DBM *database, const std::string &key,
                                      const std::string &suffix,
                                      int fixed_weight = -1)

Deletion in crawl-ref/source/database.cc at line 455 [9.13932]

B:BD[12.42708] → [12.42708:42903]

    recursion_depth++;
    if (recursion_depth > MAX_RECURSION_DEPTH)
    {
        mpr("Too many nested replacements, bailing.", MSGCH_DIAGNOSTICS);
        return "TOO MUCH RECURSION";
    }

Replacement in crawl-ref/source/database.cc at line 479 [9.13932]

B:BD[12.43587] → [12.43587:43621]

    str = chooseStrByWeight(str);

[12.43587]

[12.43621]

    return _chooseStrByWeight(str, fixed_weight);
}
static void _call_recursive_replacement(std::string &str, DBM *database,
                                        const std::string &suffix,
                                        int &num_replacements,
                                        int recursion_depth = 0);
                                        
std::string getWeightedSpeechString(const std::string &key,
                                    const std::string &suffix,
                                    const int weight)
{
    if (!SpeakDB)
        return ("");
    std::string result = _getWeightedString(SpeakDB, key, suffix, weight);
    if (result.empty())
        return "";
        
    int num_replacements = 0;
    _call_recursive_replacement(result, SpeakDB, suffix, num_replacements);
    return (result);
}
static std::string _getRandomizedStr(DBM *database, const std::string &key,
                                     const std::string &suffix,
                                     int &num_replacements,
                                     int recursion_depth = 0)
{
    recursion_depth++;
    if (recursion_depth > MAX_RECURSION_DEPTH)
    {
        mpr("Too many nested replacements, bailing.", MSGCH_DIAGNOSTICS);
        return "TOO MUCH RECURSION";
    }

Replacement in crawl-ref/source/database.cc at line 516 [9.13932]

B:BD[12.43622] → [12.43622:43777]

    // Replace any "@foo@" markers that can be found in this database;
    // those that can't be found are left alone for the caller to deal
    // with.

[12.43622]

[12.43777]

    std::string str = _getWeightedString(database, key, suffix);
    
    _call_recursive_replacement(str, database, suffix, num_replacements,
                                recursion_depth);
    
    return str;
}
// Replace any "@foo@" markers that can be found in this database.
// Those that can't be found are left alone for the caller to deal with
static void _call_recursive_replacement(std::string &str, DBM *database,
                                        const std::string &suffix,
                                        int &num_replacements,
                                        int recursion_depth)
{

Replacement in crawl-ref/source/database.cc at line 538 [9.13932]
B:BD[12.44033] → [12.44033:44078]
```
            return "TOO MANY REPLACEMENTS";
```
[12.44033]
[12.44078]
```
            return;
```

Replacement in crawl-ref/source/database.cc at line 552 [9.13932]

B:BD[12.44461] → [12.44461:44581]

            getRandomizedStr(database, marker, suffix, num_replacements,
                             recursion_depth);

[12.44461]

[12.44581]

            _getRandomizedStr(database, marker, suffix, num_replacements,
                              recursion_depth);

Deletion in crawl-ref/source/database.cc at line 568 [9.13932]
B:BD[12.45072] → [12.45072:45089]
```
    return str;
```

Replacement in crawl-ref/source/database.cc at line 570 [9.13932]

B:BD[12.45092] → [15.3886:4017]

static std::string query_database(DBM *db, std::string key,
                                  bool canonicalise_key, bool run_lua)

[12.45092]

[15.4017]

static std::string _query_database(DBM *db, std::string key,
                                   bool canonicalise_key, bool run_lua)

Replacement in crawl-ref/source/database.cc at line 586 [9.13932]
B:BD[15.4345] → [15.4345:4380]
```
        execute_embedded_lua(str);
```
[15.4345]
[15.4380]
```
        _execute_embedded_lua(str);
```

Replacement in crawl-ref/source/database.cc at line 599 [9.13932]

B:BD[13.1717] → [11.7016:7081]

    return query_database(DescriptionDB.get(), key, true, true);

[13.1717]

[10.1453]

    return _query_database(DescriptionDB.get(), key, true, true);

Replacement in crawl-ref/source/database.cc at line 633 [9.13932]

B:BD[12.47265] → [11.7294:7353]

∅:D[11.7353] → [16.14142:14189]

B:BD[17.2189] → [16.14142:14189]

    return getRandomizedStr(ShoutDB.get(), monst, suffix, 
                            num_replacements);

[12.47265]

[12.47668]

    return _getRandomizedStr(ShoutDB.get(), monst, suffix,
                             num_replacements);

Replacement in crawl-ref/source/database.cc at line 649 [9.13932]

B:BD[18.12037] → [19.3556:3623]

    return getRandomizedStr(SpeakDB, monst, "", num_replacements);

[18.12037]

[16.14190]

    return _getRandomizedStr(SpeakDB, monst, "", num_replacements);

Replacement in crawl-ref/source/database.cc at line 662 [9.13932]

B:BD[16.14505] → [19.3645:3702]

∅:D[19.3702] → [16.14562:14609]

B:BD[16.14562] → [16.14562:14609]

    return getRandomizedStr(RandartDB, itemtype, suffix,
                            num_replacements);

[16.14505]

[12.47935]

    return _getRandomizedStr(RandartDB, itemtype, suffix,
                             num_replacements);

Replacement in crawl-ref/source/database.cc at line 671 [9.13932]

B:BD[15.4632] → [11.7354:7415]

    return query_database(HelpDB.get(), topic, false, true);

[15.4632]

[15.4697]

    return _query_database(HelpDB.get(), topic, false, true);

Insertion in crawl-ref/source/dat/database/godspeak.txt at line 367 [20.5538]
[2.8358]
[2.8358]
Insertion in crawl-ref/source/dat/database/godspeak.txt at line 405 [20.5538]
[2.8363]
[2.8363]
```
subject
```
Insertion in crawl-ref/source/dat/database/godspeak.txt at line 407 [20.5538]
[2.8364]
```
Zin's Axioms of Law
the Axioms of Law
the importance of the Law
%%%%
```

Modify database lookup to allow for lookup of the nth entry for a

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 266 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 331 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 593 [4.1699344]

Insertion in crawl-ref/source/delay.cc at line 20 [4.3963459]

Insertion in crawl-ref/source/delay.cc at line 195 [4.3963459]

Insertion in crawl-ref/source/delay.cc at line 205 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 354 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 553 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 703 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 810 [4.3963459]

Insertion in crawl-ref/source/database.h at line 48 [9.13319]

Insertion in crawl-ref/source/database.h at line 50 [9.13319]

Replacement in crawl-ref/source/database.cc at line 56 [9.13932]

Replacement in crawl-ref/source/database.cc at line 173 [9.13932]

Replacement in crawl-ref/source/database.cc at line 273 [9.13932]

Replacement in crawl-ref/source/database.cc at line 307 [9.13932]

Replacement in crawl-ref/source/database.cc at line 312 [9.13932]

Replacement in crawl-ref/source/database.cc at line 314 [9.13932]

Replacement in crawl-ref/source/database.cc at line 326 [9.13932]

Replacement in crawl-ref/source/database.cc at line 344 [9.13932]

Replacement in crawl-ref/source/database.cc at line 369 [9.13932]

Replacement in crawl-ref/source/database.cc at line 372 [9.13932]

Replacement in crawl-ref/source/database.cc at line 380 [9.13932]

Replacement in crawl-ref/source/database.cc at line 389 [9.13932]

Insertion in crawl-ref/source/database.cc at line 403 [9.13932]

Replacement in crawl-ref/source/database.cc at line 435 [9.13932]

Replacement in crawl-ref/source/database.cc at line 451 [9.13932]

Deletion in crawl-ref/source/database.cc at line 455 [9.13932]

Replacement in crawl-ref/source/database.cc at line 479 [9.13932]

Replacement in crawl-ref/source/database.cc at line 516 [9.13932]

Replacement in crawl-ref/source/database.cc at line 538 [9.13932]

Replacement in crawl-ref/source/database.cc at line 552 [9.13932]

Deletion in crawl-ref/source/database.cc at line 568 [9.13932]

Replacement in crawl-ref/source/database.cc at line 570 [9.13932]

Replacement in crawl-ref/source/database.cc at line 586 [9.13932]

Replacement in crawl-ref/source/database.cc at line 599 [9.13932]

Replacement in crawl-ref/source/database.cc at line 633 [9.13932]

Replacement in crawl-ref/source/database.cc at line 649 [9.13932]

Replacement in crawl-ref/source/database.cc at line 662 [9.13932]

Replacement in crawl-ref/source/database.cc at line 671 [9.13932]

Insertion in crawl-ref/source/dat/database/godspeak.txt at line 367 [20.5538]

Insertion in crawl-ref/source/dat/database/godspeak.txt at line 405 [20.5538]

Insertion in crawl-ref/source/dat/database/godspeak.txt at line 407 [20.5538]