fiddlerwoaroof/crawl - Change 4GFCF6N3MZSCHUB77Z3SQYJ3FYR5N3VBW2CGWANLJ74O5FEQH3CQC

[1752536] fire_order is now smarter.

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

Created by dshaligram on July 12, 2007

4GFCF6N3MZSCHUB77Z3SQYJ3FYR5N3VBW2CGWANLJ74O5FEQH3CQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/item_use.cc at line 1119 [4.2781507]

B:BD[4.2808847] → [4.2808847:2808971]

// Return index of first valid balanced throwing weapon or ENDOFPACK
static int try_finding_throwing_weapon( int sub_type )

[4.2808847]

[4.2808971]

static bool fire_item_matches(const item_def &item, unsigned fire_type)

Replacement in crawl-ref/source/item_use.cc at line 1121 [4.2781507]

B:BD[4.2808973] → [4.2808973:2809044]

    int i;
    for (i = Options.fire_items_start; i < ENDOFPACK; i++)

[4.2808973]

[4.2809044]

    if (!is_valid_item(item))
        return (false);
    
    if (item.base_type == OBJ_MISSILES)

Replacement in crawl-ref/source/item_use.cc at line 1126 [4.2781507]

B:BD[4.2809050] → [4.2809050:2809191]

        // skip invalid objects, wielded object
        if (!is_valid_item( you.inv[i] ) || you.equip[EQ_WEAPON] == i)
            continue;

[4.2809050]

[4.2809191]

        if ((fire_type & FIRE_DART) && item.sub_type == MI_DART)
            return (true);
        if ((fire_type & FIRE_STONE)
            && (item.sub_type == MI_STONE || item.sub_type == MI_SLING_BULLET))
            return (true);
        if ((fire_type & FIRE_JAVELIN) && item.sub_type == MI_JAVELIN)
            return (true);
        if ((fire_type & FIRE_ROCK) && item.sub_type == MI_LARGE_ROCK)
            return (true);

Replacement in crawl-ref/source/item_use.cc at line 1136 [4.2781507]

B:BD[4.2809192] → [4.2809192:2809346]

        // consider melee weapons that can also be thrown
        if (you.inv[i].base_type == OBJ_WEAPONS
            && you.inv[i].sub_type == sub_type)

[4.2809192]

[4.2809346]

        if (fire_type & FIRE_LAUNCHER)

Replacement in crawl-ref/source/item_use.cc at line 1138 [4.2781507]

B:BD[4.2809356] → [4.2809356:2809375]

            break;

[4.2809356]

[4.2809375]

            const item_def *weapon = you.weapon();
            if (weapon && item.launched_by(*weapon))
                return (true);

Replacement in crawl-ref/source/item_use.cc at line 1143 [4.2781507]

B:BD[4.2809391] → [4.2809391:2809408]


    return (i);

[4.2809391]

[4.2809408]

    else if (item.base_type == OBJ_WEAPONS
             && is_throwable(item, you.body_size()))
    {
        if ((fire_type & FIRE_DAGGER) && item.sub_type == WPN_DAGGER)
            return (true);
        if ((fire_type & FIRE_SPEAR) && item.sub_type == WPN_SPEAR)
            return (true);
        if ((fire_type & FIRE_HAND_AXE) && item.sub_type == WPN_HAND_AXE)
            return (true);
        if ((fire_type & FIRE_CLUB) && item.sub_type == WPN_CLUB)
            return (true);
    }
    return (false);

Replacement in crawl-ref/source/item_use.cc at line 1158 [4.2781507]

B:BD[4.2809411] → [4.2809411:2809469]

B:BD[4.2809469] → [3.10540:10620]

// Return index of first missile of sub_type or ENDOFPACK
static int try_finding_missile( int sub_type, const item_def *launcher = NULL )

[4.2809411]

[4.2809516]

static int find_fire_item_matching(unsigned fire_type_flags, int start = 0)

Replacement in crawl-ref/source/item_use.cc at line 1160 [4.2781507]
B:BD[4.2809518] → [4.2809518:2809589]
```
    int i;
    for (i = Options.fire_items_start; i < ENDOFPACK; i++)
```
[4.2809518]
[4.2809589]
```
    for (int i = start; i < ENDOFPACK; ++i)
```

Replacement in crawl-ref/source/item_use.cc at line 1162 [4.2781507]

B:BD[4.2809595] → [4.2809595:2809669]

        // skip invalid objects
        if (!is_valid_item( you.inv[i] ))

[4.2809595]

[4.2809669]

        if (i < Options.fire_items_start)

Replacement in crawl-ref/source/item_use.cc at line 1164 [4.2781507]

B:BD[4.2809691] → [5.136:137]

B:BD[5.137] → [3.10621:10664]

∅:D[3.10664] → [5.137:348]

B:BD[5.137] → [5.137:348]

∅:D[5.348] → [4.2809691:2809692]

B:BD[4.2809691] → [4.2809691:2809692]

B:BD[4.2809692] → [3.10665:10746]

∅:D[3.10746] → [4.2809692:2809750]

B:BD[4.2809692] → [4.2809692:2809750]

B:BD[4.2809750] → [3.10747:10911]


        const item_def &item = you.inv[i];
        // In theory, we should do two passes, first trying
        // to find a non-warning-inscribed item, then looping
        // through the warning-inscribed ones. Seems unlikely
        // to matter much.
        if (launcher && item.launched_by(*launcher))
            break;
        
        // consider melee weapons that can also be thrown
        if (item.base_type == OBJ_MISSILES
            && (item.sub_type == sub_type
                || (sub_type == MI_STONE && item.sub_type == MI_SLING_BULLET))

[4.2809691]

[3.10911]

        if (fire_item_matches(you.inv[i], fire_type_flags)

Replacement in crawl-ref/source/item_use.cc at line 1166 [4.2781507]
∅:D[5.511] → [4.2809847:2809886]
∅:D[3.10977] → [4.2809847:2809886]
B:BD[4.2809847] → [4.2809847:2809886]
```
        {
            break;
        }
```
[3.10977]
[4.2809886]
```
            return (i);
```

Replacement in crawl-ref/source/item_use.cc at line 1169 [4.2781507]

B:BD[4.2809893] → [4.2809893:2809909]

    return (i);

[4.2809893]

[4.2809909]

    for (int i = 0; i < start; ++i)
    {
        if (i < Options.fire_items_start)
            continue;
        if (fire_item_matches(you.inv[i], fire_type_flags)
            && check_warning_inscriptions(you.inv[i], OPER_FIRE))
            return (i);
    }
        
    return (ENDOFPACK);

Deletion in crawl-ref/source/item_use.cc at line 1187 [4.2781507]
B:BD[4.2810114] → [4.2810114:2810161]
```
    const int weapon = you.equip[ EQ_WEAPON ];
```
Replacement in crawl-ref/source/item_use.cc at line 1188 [4.2781507]
B:BD[4.2810162] → [4.2810162:2810207]
```
    for (int i = 0; i < NUM_FIRE_TYPES; i++)
```
[4.2810162]
[4.2810207]
```
    for (unsigned i = 0; i < Options.fire_order.size(); i++)
```

Replacement in crawl-ref/source/item_use.cc at line 1190 [4.2781507]

B:BD[4.2810213] → [4.2810213:2810518]

B:BD[4.2810518] → [6.737982:738039]

∅:D[6.738039] → [4.2810584:2810598]

B:BD[4.2810584] → [4.2810584:2810598]

B:BD[4.2810598] → [3.10978:11051]

∅:D[3.11051] → [4.2810734:2810748]

B:BD[4.2810734] → [4.2810734:2810748]

        // look for next type on list... if found item is set != ENDOFPACK
        switch (Options.fire_order[i])
        {
        case FIRE_LAUNCHER:
            // check if we have ammo for a wielded launcher:
            if (weapon != -1 
                && you.inv[ weapon ].base_type == OBJ_WEAPONS
                && is_range_weapon( you.inv[ weapon ] ))
            {
                item = try_finding_missile( MI_NONE, &you.inv[weapon] );
            }

[4.2810213]

[4.2810748]

        const unsigned fire_flags = Options.fire_order[i];
        if ((item = find_fire_item_matching(fire_flags)) != ENDOFPACK)

Deletion in crawl-ref/source/item_use.cc at line 1193 [4.2781507]

B:BD[4.2810767] → [4.2810767:2810960]

B:BD[4.2810960] → [3.11052:11153]

∅:D[3.11153] → [4.2810960:2811542]

B:BD[4.2810960] → [4.2810960:2811542]


        case FIRE_DART:
            item = try_finding_missile( MI_DART );
            break;
        case FIRE_STONE:
            item = try_finding_missile( MI_STONE );
            break;
        case FIRE_JAVELIN:
            item = try_finding_missile( MI_JAVELIN );
            break;
        case FIRE_DAGGER:
            item = try_finding_throwing_weapon( WPN_DAGGER );
            break;
        case FIRE_SPEAR:
            item = try_finding_throwing_weapon( WPN_SPEAR );
            break;
        case FIRE_HAND_AXE:
            item = try_finding_throwing_weapon( WPN_HAND_AXE );
            break;
        case FIRE_CLUB:
            item = try_finding_throwing_weapon( WPN_CLUB );
            break;
        case FIRE_NONE:
        default:
            break;
        }
        // if successful break
        if (item != ENDOFPACK)
            break;

Replacement in crawl-ref/source/initfile.cc at line 258 [4.2957258]
B:BD[4.2961761] → [4.2961761:2961813]
```
    else if (str == "hand axe" || str == "handaxe")
```
[4.2961761]
[4.2961813]
```
    else if (str == "hand axe" || str == "handaxe" || str == "axe")
```
Insertion in crawl-ref/source/initfile.cc at line 262 [4.2957258]
[4.2961901]
[4.2961901]
```
    else if (str == "javelin")
        return (FIRE_JAVELIN);
```

Deletion in crawl-ref/source/initfile.cc at line 266 [4.2957258]

B:BD[4.2961926] → [4.2961926:2961985]

B:BD[4.2961985] → [7.2292:2372]

∅:D[7.2372] → [4.2962059:2962491]

B:BD[4.2962059] → [4.2962059:2962491]

}
static void str_to_fire_order( const std::string &str, 
                               FixedVector< fire_type, NUM_FIRE_TYPES > &list )
{
    int i;
    size_t pos = 0;
    std::string item = "";
    for (i = 0; i < NUM_FIRE_TYPES; i++)
    {
        // get next item from comma delimited list
        const size_t end = str.find( ',', pos );
        item = str.substr( pos, end - pos );
        trim_string( item );
        list[i] = str_to_fire_types( item );
        if (end == std::string::npos)
            break;
        else
            pos = end + 1;
    }

Replacement in crawl-ref/source/initfile.cc at line 694 [4.2957258]

B:BD[8.226] → [8.226:311]

∅:D[8.311] → [6.794624:794690]

B:BD[4.2965611] → [6.794624:794690]

B:BD[6.794690] → [3.14423:14590]

    for (int i = 0; i < NUM_FIRE_TYPES; i++)
        fire_order[i] = FIRE_NONE;
    
    fire_order[0] = FIRE_LAUNCHER;      // fire first from bow...
    fire_order[1] = FIRE_JAVELIN;
    fire_order[2] = FIRE_DART;          // then only consider darts
    fire_order[3] = FIRE_STONE;         // and then chuck stones

[8.226]

[9.4596]

    set_fire_order("launcher, javelin / dart / stone");

Insertion in crawl-ref/source/initfile.cc at line 812 [4.2957258]

[2.312]

[10.1031]

}
void game_options::set_fire_order(const std::string &s)
{
    fire_order.clear();
    std::vector<std::string> slots = split_string(",", s);
    for (int i = 0, size = slots.size(); i < size; ++i)
        add_fire_order_slot(slots[i]);
}
void game_options::add_fire_order_slot(const std::string &s)
{
    unsigned flags = 0;
    std::vector<std::string> alts = split_string("/", s);
    for (int i = 0, size = alts.size(); i < size; ++i)
        flags |= str_to_fire_types(alts[i]);
    if (flags)
        fire_order.push_back(flags);

Replacement in crawl-ref/source/initfile.cc at line 1761 [4.2957258]
B:BD[11.413989] → [6.803185:803233]
```
        str_to_fire_order( field, fire_order );
```
[11.413989]
[11.414045]
```
        set_fire_order(field);
```

Replacement in crawl-ref/source/externs.h at line 1636 [4.3270163]

B:BD[4.3285104] → [4.3285104:3285178]

B:BD[4.3285178] → [7.2385:2465]

    int         fire_items_start; // index of first item for fire command
    FixedVector<fire_type, NUM_FIRE_TYPES> fire_order; // order for 'f' command

[4.3285104]

[4.3285253]

    int         fire_items_start;     // index of first item for fire command
    std::vector<unsigned> fire_order; // missile search order for 'f' command

Insertion in crawl-ref/source/externs.h at line 1847 [4.3270163]

[12.1394]

[13.14880]

    void set_fire_order(const std::string &full);
    void add_fire_order_slot(const std::string &s);

Replacement in crawl-ref/source/enum.h at line 1310 [4.3287960]

B:BD[4.3315296] → [4.3315296:3315378]

B:BD[4.3315378] → [3.14801:14819]

∅:D[3.14819] → [4.3315378:3315428]

B:BD[4.3315378] → [4.3315378:3315428]

B:BD[4.3315428] → [6.915482:915497]

∅:D[6.915497] → [4.3315428:3315447]

B:BD[4.3315428] → [4.3315428:3315447]

    FIRE_NONE,
    FIRE_LAUNCHER,
    FIRE_DART,
    FIRE_STONE,
    FIRE_DAGGER,
    FIRE_JAVELIN,
    FIRE_SPEAR,
    FIRE_HAND_AXE,
    FIRE_CLUB,
    FIRE_ROCK,
    NUM_FIRE_TYPES

[4.3315296]

[4.3315447]

    FIRE_NONE     = 0x0000,
    FIRE_LAUNCHER = 0x0001,
    FIRE_DART     = 0x0002,
    FIRE_STONE    = 0x0004,
    FIRE_DAGGER   = 0x0008,
    FIRE_JAVELIN  = 0x0010,
    FIRE_SPEAR    = 0x0020,
    FIRE_HAND_AXE = 0x0040,
    FIRE_CLUB     = 0x0080,
    FIRE_ROCK     = 0x0100

Replacement in crawl-ref/source/dat/orc.des at line 404 [14.63762]

B:BD[14.72949] → [14.72949:73008]

MONS: hungry ghost/phantom/wraith, orc sorcerer/orc priest

[14.72949]

[14.73008]

MONS: hungry ghost/phantom/w:1 wraith, w:1 orc sorcerer/orc priest

Replacement in crawl-ref/source/dat/orc.des at line 407 [14.63762]
B:BD[14.73041] → [14.73041:73045]
```
MAP
```
[14.73041]
[14.73045]
```
DEPTH: 11
```

Replacement in crawl-ref/init.txt at line 201 [4.4830895]

B:BD[15.606] → [15.606:673]

# fire_order = launcher, dart, stone, dagger, spear, handaxe, club

[15.606]

[4.4838655]

# fire_order = launcher, dart / stone / javelin, dagger, spear, handaxe, club

Replacement in crawl-ref/docs/crawl_options.txt at line 923 [17.63392]

B:BD[16.31056] → [16.31056:31121]

fire_order = launcher, dart, stone, dagger, spear, handaxe, club

[16.31056]

[18.21639]

fire_order = launcher, dart / stone / dagger, spear, handaxe, club

Insertion in crawl-ref/docs/crawl_options.txt at line 925 [17.63392]

[18.21715]

        Items that appear first get higher priority.
        Items in any position may be slash-separated to indicate that these
        are of equal priority. In the example, darts, stones and daggers are
        at the same priority, so the first item in your inventory that is
        one of these will be picked for firing.

Replacement in crawl-ref/docs/crawl_options.txt at line 935 [17.63392]

B:BD[18.21946] → [18.21946:22016]

        weapon. The default is 
          fire_order = launcher, dart

[18.21946]

[18.22016]

        weapon. The default is
        
          fire_order = launcher, javelin / dart / stone