fiddlerwoaroof/crawl - Change TTLTKFWPSA5YKJNZHRWQMIJKLX7EYHTWGHX3MJUVBEXWCHZHSYCQC

Fix assumptions about the order of weapon subtypes in _give_weapon() and

_beogh_retribution(), and fix them so that they work the same way as before r8681.

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

Created by dolorous on February 5, 2009

TTLTKFWPSA5YKJNZHRWQMIJKLX7EYHTWGHX3MJUVBEXWCHZHSYCQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 4558 [3.804403]

[3.867667]

[4.7113]

            const int temp_rand = random2(13);
            int wpn_type = ((temp_rand ==  0) ? WPN_CLUB :
                            (temp_rand ==  1) ? WPN_MACE :
                            (temp_rand ==  2) ? WPN_FLAIL :
                            (temp_rand ==  3) ? WPN_MORNINGSTAR :
                            (temp_rand ==  4) ? WPN_DAGGER :
                            (temp_rand ==  5) ? WPN_SHORT_SWORD :
                            (temp_rand ==  6) ? WPN_LONG_SWORD :
                            (temp_rand ==  7) ? WPN_SCIMITAR :
                            (temp_rand ==  8) ? WPN_GREAT_SWORD :
                            (temp_rand ==  9) ? WPN_HAND_AXE :
                            (temp_rand == 10) ? WPN_BATTLEAXE :
                            (temp_rand == 11) ? WPN_SPEAR
                                              : WPN_HALBERD);

Replacement in crawl-ref/source/religion.cc at line 4574 [3.804403]
∅:D[5.2665] → [6.297:366]
∅:D[4.7141] → [6.297:366]
B:BD[6.297] → [6.297:366]
```
            int slot = items(0, OBJ_WEAPONS, WPN_CLUB + random2(13),
```
[4.7141]
[5.2666]
```
            int slot = items(0, OBJ_WEAPONS, wpn_type,
```

Replacement in crawl-ref/source/makeitem.cc at line 3154 [7.927]

B:BD[7.106312] → [7.106312:106381]

B:BD[7.106381] → [8.15425:15494]

        item.sub_type = (one_chance_in(6) ? WPN_WAR_AXE + random2(4)
                                          : WPN_MACE + random2(12));

[7.106312]

[7.106455]


        if (one_chance_in(6))
        {
            const int temp_rand = random2(4);
            item.sub_type = ((temp_rand == 0) ? WPN_SPIKED_FLAIL :
                             (temp_rand == 1) ? WPN_GREAT_MACE :
                             (temp_rand == 2) ? WPN_WAR_AXE
                                              : WPN_TRIDENT);
        }
        else
        {
            const int temp_rand = random2(12);
            item.sub_type = ((temp_rand ==  0) ? WPN_MACE :
                             (temp_rand ==  1) ? WPN_FLAIL :
                             (temp_rand ==  2) ? WPN_MORNINGSTAR :
                             (temp_rand ==  3) ? WPN_DAGGER :
                             (temp_rand ==  4) ? WPN_SHORT_SWORD :
                             (temp_rand ==  5) ? WPN_LONG_SWORD :
                             (temp_rand ==  6) ? WPN_SCIMITAR :
                             (temp_rand ==  7) ? WPN_GREAT_SWORD :
                             (temp_rand ==  8) ? WPN_HAND_AXE :
                             (temp_rand ==  9) ? WPN_BATTLEAXE :
                             (temp_rand == 10) ? WPN_SPEAR
                                               : WPN_HALBERD);
        }

Replacement in crawl-ref/source/makeitem.cc at line 3571 [7.927]

B:BD[7.118265] → [4.11528:11582]

        item.sub_type  = WPN_LONG_SWORD + random2(3);

[7.118265]

[7.118318]

        item.sub_type = (one_chance_in(3) ? WPN_LONG_SWORD :
                         coinflip()       ? WPN_SCIMITAR
                                          : WPN_GREAT_SWORD);

Replacement in crawl-ref/source/makeitem.cc at line 3681 [7.927]

B:BD[2.21194] → [2.21194:21260]

        item.sub_type = coinflip()? WPN_DAGGER : WPN_SHORT_SWORD;

[2.21194]

[2.21260]

        item.sub_type = coinflip() ? WPN_DAGGER : WPN_SHORT_SWORD;