fiddlerwoaroof/crawl - Change TFO3DNZBDBA7YGKQKL624CG6DMVCEOPWQNAXDEV42ZODT5U3666AC

In my previous commit I also moved equipment slots around,

so the spears of Berserkers start at 'c'. Now I did the same for Merfolk Hunters (javelins).

Also: removed enforced random weapon for Chaos Knights (FR 1772666). I am very much aware of the reason behind this rule (chaos = randomization), but a) it probably does lead to startscumming, b) we do not wildly randomize gods or stats, and c) the weapons are not important enough to really enforce this. All IMHO, of course.

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

Created by j-p-e-g on September 3, 2007

TFO3DNZBDBA7YGKQKL624CG6DMVCEOPWQNAXDEV42ZODT5U3666AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/newgame.cc at line 1628 [3.1132300]
B:BD[3.1168368] → [3.1168368:1168451]
```
    if (you.char_class == JOB_CHAOS_KNIGHT)
    {
        temp_rand = random2(4);
```

Deletion in crawl-ref/source/newgame.cc at line 1629 [3.1132300]

B:BD[3.1168452] → [3.1168452:1168650]

B:BD[3.1168650] → [4.2144:2165]

∅:D[4.2165] → [3.1168666:1168673]

B:BD[3.1168666] → [3.1168666:1168673]

        you.inv[0].sub_type = ((temp_rand == 0) ? WPN_SHORT_SWORD :
                           (temp_rand == 1) ? WPN_MACE :
                           (temp_rand == 2) ? WPN_HAND_AXE : WPN_SPEAR);
        return true;
    }

Insertion in crawl-ref/source/newgame.cc at line 4078 [3.1132300]
[3.1235254]
[3.1235293]
```
        you.equip[EQ_WEAPON] = 0;
```

Insertion in crawl-ref/source/newgame.cc at line 4086 [3.1132300]

[3.1235517]

[5.442]

        if (player_genus(GENPC_DRACONIAN))
            you.inv[2].sub_type = ARM_ROBE;
        else if (you.species == SP_OGRE)
            you.inv[2].sub_type = ARM_ANIMAL_SKIN;

Replacement in crawl-ref/source/newgame.cc at line 4095 [3.1132300]

B:BD[5.562] → [5.562:797]

            you.inv[1].quantity = 6;
            you.inv[1].base_type = OBJ_MISSILES;
            you.inv[1].sub_type = MI_JAVELIN;
            you.inv[1].plus = 0;
            you.inv[1].plus2 = 0;
            you.inv[1].special = 0;

[5.562]

[5.797]

            you.inv[1] = you.inv[2];
            you.equip[EQ_BODY_ARMOUR] = 1;
            you.inv[2].quantity = 6;
            you.inv[2].base_type = OBJ_MISSILES;
            you.inv[2].sub_type = MI_JAVELIN;
            you.inv[2].plus = 0;
            you.inv[2].plus2 = 0;
            you.inv[2].special = 0;

Insertion in crawl-ref/source/newgame.cc at line 4107 [3.1132300]
[3.1235566]
[5.821]
```
            you.equip[EQ_BODY_ARMOUR] = 2;
            
```

Deletion in crawl-ref/source/newgame.cc at line 4123 [3.1132300]

B:BD[3.1236631] → [3.1236631:1236675]

B:BD[3.1236675] → [5.1076:1120]

B:BD[5.1120] → [2.6463:6555]


        if (player_genus(GENPC_DRACONIAN))
            you.inv[2].sub_type = ARM_ROBE;
        else if (you.species == SP_OGRE)
            you.inv[2].sub_type = ARM_ANIMAL_SKIN;

Deletion in crawl-ref/source/newgame.cc at line 4124 [3.1132300]
B:BD[3.1236779] → [3.1236779:1236813]
B:BD[3.1236813] → [5.1121:1160]
∅:D[5.1160] → [3.1236852:1236853]
B:BD[3.1236852] → [3.1236852:1236853]
```
        you.equip[EQ_WEAPON] = 0;
        you.equip[EQ_BODY_ARMOUR] = 2;
```

In my previous commit I also moved equipment slots around,

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/newgame.cc at line 1628 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1629 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 4078 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 4086 [3.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4095 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 4107 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 4123 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 4124 [3.1132300]