fiddlerwoaroof/crawl - Change 6L4EP4ZRWWYLT55PD5KTTJON5J2JB5VV5MWNHF5VPZQZ5BKEYZ4QC

Tweaked unique code to eliminate the confusing arithmetic on MONS enum values.

Breaks save compatibility again.

Added a unique curse skull. Indulge me.

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

Created by dshaligram on March 16, 2007

6L4EP4ZRWWYLT55PD5KTTJON5J2JB5VV5MWNHF5VPZQZ5BKEYZ4QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.cc at line 3401 [3.16817]
B:BD[3.106409] → [4.67963:68065]
∅:D[4.68065] → [3.106996:106997]
B:BD[3.106996] → [3.106996:106997]
```
    for (count_x = 0; count_x < NUM_STATUE_TYPES; count_x++)
        you.visible_statue[count_x] = 0;
```

Replacement in crawl-ref/source/tags.cc at line 889 [3.164589]

B:BD[3.186190] → [3.186190:186245]

    marshallByte(th, 50);
    for (j = 0; j < 50; ++j)

[3.186190]

[3.186245]

    marshallShort(th, NUM_MONSTERS);
    for (j = 0; j < NUM_MONSTERS; ++j)

Replacement in crawl-ref/source/tags.cc at line 922 [3.164589]
B:BD[3.187040] → [3.187040:187079]
```
    you.religion = unmarshallByte(th);
```
[3.187040]
[3.187079]
```
    you.religion = static_cast<god_type>(unmarshallByte(th));
```
Replacement in crawl-ref/source/tags.cc at line 1176 [3.164589]
B:BD[3.202844] → [3.202844:202862]
```
    char count_c;
```
[3.202844]
[3.202862]
```
    int count_c;
```
Replacement in crawl-ref/source/tags.cc at line 1180 [3.164589]
B:BD[3.202916] → [3.202916:202950]
```
    count_c = unmarshallByte(th);
```
[3.202916]
[3.202950]
```
    count_c = unmarshallShort(th);
    you.unique_creatures.init(false);
```

Replacement in crawl-ref/source/tags.cc at line 1183 [3.164589]

B:BD[3.202984] → [3.202984:203038]

        you.unique_creatures[j] = unmarshallByte(th);

[3.202984]

[3.203038]

    {
        const bool created = static_cast<bool>(unmarshallByte(th));
        if (j < NUM_MONSTERS)
            you.unique_creatures[j] = created;
    }

Deletion in crawl-ref/source/tags.cc at line 1195 [3.164589]
B:BD[5.2519] → [5.2519:2569]
∅:D[5.2569] → [3.203241:203242]
B:BD[3.203241] → [3.203241:203242]
```
    cprintf("found %d branches\n", (int)count_c);
```
Deletion in crawl-ref/source/tags.cc at line 1196 [3.164589]
B:BD[3.203301] → [5.2570:2620]
```
    cprintf("found %d maxlevel\n", (int)count_s);
```
Deletion in crawl-ref/source/tags.cc at line 1198 [3.164589]
B:BD[5.2627] → [5.2627:2661]
```
//        cprintf("i = %d\n", i);
```

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

[6.196180]

[4.179507]

                    break;
                default:

Insertion in crawl-ref/source/religion.cc at line 1252 [3.804403]
[4.182310]
[4.182310]
```
        default:
            break;
```
Insertion in crawl-ref/source/religion.cc at line 1278 [3.804403]
[4.182837]
[4.182837]
```
        default:
            break;
```
Insertion in crawl-ref/source/religion.cc at line 1294 [3.804403]
[4.183189]
[4.183189]
```
            break;
        default:
```
Insertion in crawl-ref/source/religion.cc at line 1319 [3.804403]
[3.837330]
[3.837330]
```
            
        default:
            break;
```
Insertion in crawl-ref/source/religion.cc at line 1346 [3.804403]
[4.183985]
[3.837682]
```
            break;
        default:
```
Insertion in crawl-ref/source/religion.cc at line 1366 [3.804403]
[4.184149]
[3.838052]
```
            break;
        default:
```
Insertion in crawl-ref/source/religion.cc at line 1384 [3.804403]
[3.838427]
[3.838427]
```
        default:
            break;
```
Insertion in crawl-ref/source/religion.cc at line 1430 [3.804403]
[3.839388]
[3.839388]
```
        default:
            break;
```
Insertion in crawl-ref/source/religion.cc at line 1447 [3.804403]
[4.185777]
[3.839842]
```
            break;
        default:
```
Insertion in crawl-ref/source/religion.cc at line 1468 [3.804403]
[4.186163]
[4.186163]
```
        default:
            break;
```
Insertion in crawl-ref/source/religion.cc at line 1485 [3.804403]
[4.186537]
[3.840147]
```
            break;
        default:
```
Insertion in crawl-ref/source/religion.cc at line 1500 [3.804403]
[4.186795]
[3.840316]
```
            break;
        default:
```

Replacement in crawl-ref/source/religion.cc at line 2574 [3.804403]

B:BD[3.883139] → [3.883139:883220]

    you.religion = which_god;   //jmf: moved up so god_speaks gives right colour

[3.883139]

[3.883220]

    //jmf: moved up so god_speaks gives right colour
    you.religion = static_cast<god_type>(which_god);

Insertion in crawl-ref/source/player.cc at line 5200 [3.962854]
[7.1795]
```
god_type player::deity() const
{
    return (religion);
}
```
Insertion in crawl-ref/source/ouch.cc at line 719 [3.1104358]
[3.1119892]
[3.1119892]
```
            break;
        default:
```

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

B:BD[3.1223274] → [6.231286:231337]

            ng_pr = you.religion = Options.priest;

[3.1223274]

[3.1223317]

            ng_pr = you.religion = static_cast<god_type>( Options.priest );

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

B:BD[3.1254674] → [6.233272:233329]

            ng_ck = you.religion = Options.chaos_knight;

[3.1254674]

[3.1254723]

            ng_ck = you.religion =
                static_cast<god_type>( Options.chaos_knight );

Replacement in crawl-ref/source/monstuff.cc at line 723 [3.1396662]
B:BD[3.1417743] → [3.1417743:1417800]
```
        you.unique_creatures[ monster->type - 280 ] = 0;
```
[3.1417743]
[3.1417800]
```
        you.unique_creatures[ monster->type ] = false;
```

Replacement in crawl-ref/source/monplace.cc at line 526 [3.1641732]

B:BD[3.1655067] → [3.1655067:1655177]

    if (mon_type >= MONS_TERENCE && mon_type <= MONS_BORIS)
        you.unique_creatures[mon_type - 280] = 1;

[3.1655067]

[3.1655177]

    if (mons_is_unique(mon_type))
        you.unique_creatures[mon_type] = true;

Insertion in crawl-ref/source/mon-util.cc at line 2939 [3.1699344]
[8.15447]
[8.15447]
```
god_type monsters::deity() const
{
    return (god);
}
```

Insertion in crawl-ref/source/mon-data.h at line 4391 [3.1826214]

[9.23583]

[3.1928877]

}
,
{
    MONS_MURRAY, 'z', LIGHTRED, "Murray",
    M_SPELLCASTER | M_SEE_INVIS | M_EVIL | M_UNIQUE,
    MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD,
    0, 50, MONS_LICH, MONS_CURSE_SKULL, MH_UNDEAD, MAG_IMMUNE,
    { {AT_BITE, AF_PLAIN, 20}, {AT_BITE, AF_PLAIN, 20}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },
    { 14, 0, 0, 180 },
    30, 10, 10, 7, MST_CURSE_SKULL, CE_NOCORPSE, Z_NOZOMBIE, S_MOAN, I_HIGH, 
    MONUSE_NOTHING, SIZE_TINY

Deletion in crawl-ref/source/misc.cc at line 67 [3.1933596]
B:BD[3.1934628] → [3.1934628:1934629]
B:BD[3.1934629] → [4.542215:542289]
```
extern FixedVector<char, 10>  Visible_Statue;        // defined in acr.cc
```

Deletion in crawl-ref/source/misc.cc at line 1877 [3.1933596]

B:BD[4.548143] → [4.548143:548212]

B:BD[4.548212] → [10.158:304]


    /* statue check */
    if (you.visible_statue[STATUE_SILVER] ||
        you.visible_statue[STATUE_ORANGE_CRYSTAL] )
    {
        if (announce)
            mprf(MSGCH_WARN, "There are scary statues in view.");

Deletion in crawl-ref/source/misc.cc at line 1878 [3.1933596]
B:BD[11.1689] → [11.1689:1719]
∅:D[11.1719] → [10.304:305]
B:BD[10.304] → [10.304:305]
```
        return (false);
    }
```
Insertion in crawl-ref/source/files.cc at line 97 [3.3084589]
[2.27827]
[3.3088156]
```
#define YOU_MINOR_VERSION   1
```

Replacement in crawl-ref/source/files.cc at line 1142 [3.3084589]

B:BD[3.3113490] → [12.19229:19300]

    write_tagged_file( charf, SAVE_MAJOR_VERSION, 0, TAGTYPE_PLAYER );

[3.3113490]

[3.3113512]

    write_tagged_file( charf, SAVE_MAJOR_VERSION,
                       YOU_MINOR_VERSION, TAGTYPE_PLAYER );

Insertion in crawl-ref/source/externs.h at line 111 [3.3270163]
[9.81341]
[8.83954]
```
    virtual god_type  deity() const = 0;
    
```
Deletion in crawl-ref/source/externs.h at line 563 [3.3270163]
B:BD[4.897518] → [4.897518:897576]
```
  FixedVector< char, NUM_STATUE_TYPES >  visible_statue;
```
Replacement in crawl-ref/source/externs.h at line 637 [3.3270163]
B:BD[3.3278534] → [3.3278534:3278585]
```
  FixedVector<unsigned char, 50> unique_creatures;
```
[3.3278534]
[6.441535]
```
  FixedVector<bool, NUM_MONSTERS> unique_creatures;
```
Replacement in crawl-ref/source/externs.h at line 647 [3.3270163]
B:BD[3.3278677] → [3.3278677:3278694]
```
  char religion;
```
[3.3278677]
[3.3278694]
```
  god_type religion;
```
Insertion in crawl-ref/source/externs.h at line 718 [3.3270163]
[8.86433]
[8.86433]
```
    god_type  deity() const;
```
Insertion in crawl-ref/source/externs.h at line 868 [3.3270163]
[9.83631]
[8.88430]
```
    god_type  deity() const;
```
Insertion in crawl-ref/source/enum.h at line 2195 [3.3287960]
[4.922288]
[3.3337796]
```
    
    MONS_MURRAY,
```
Replacement in crawl-ref/source/dungeon.cc at line 3885 [3.3429798]
B:BD[3.3554528] → [3.3554528:3554559]
```
        if (one_chance_in(15))
```
[3.3554528]
[3.3554559]
```
        if (one_chance_in(4))
```

Replacement in crawl-ref/source/dungeon.cc at line 3898 [3.3429798]

B:BD[3.3554861] → [3.3554861:3554926]

            while (you.unique_creatures[40 + which_demon] == 1);

[3.3554861]

[3.3554926]

            while (you.unique_creatures[MONS_MNOLEG + which_demon]);

Replacement in crawl-ref/source/dungeon.cc at line 3907 [3.3429798]
∅:D[4.960715] → [3.3554977:3555033]
B:BD[3.3554977] → [3.3554977:3555033]
```
            you.unique_creatures[40 + which_demon] = 1;
```
[4.960715]
[4.960716]
```
            you.unique_creatures[MONS_MNOLEG + which_demon] = true;
```

Insertion in crawl-ref/source/dungeon.cc at line 4725 [3.3429798]

[3.3577046]


static int pick_unique(int lev)
{
    int which_unique =
        ((lev > 19) ? random_range(MONS_LOUISE, MONS_BORIS) :
         (lev > 16) ? random_range(MONS_ERICA, MONS_FRANCES) :
         (lev > 13) ? random_range(MONS_URUG, MONS_JOZEF) :
         (lev >  9) ? random_range(MONS_PSYCHE, MONS_MICHAEL) :
         (lev >  7) ? random_range(MONS_BLORK_THE_ORC, MONS_EROLCHA) :
         (lev >  3) ? random_range(MONS_IJYB, MONS_EDMUND) :
                      random_range(MONS_TERENCE, MONS_SIGMUND));
    if (player_in_branch(BRANCH_VESTIBULE_OF_HELL)
        && one_chance_in(7))
    {
        which_unique = MONS_MURRAY;
    }
    
    return (which_unique);
}

Replacement in crawl-ref/source/dungeon.cc at line 4795 [3.3429798]

B:BD[3.3578433] → [3.3578433:3578936]

                which_unique = ((level_number > 19) ? 20 + random2(11) :
                                (level_number > 16) ? 13 + random2(10) :
                                (level_number > 13) ?  9 + random2( 9) :
                                (level_number >  9) ?  6 + random2( 5) :
                                (level_number >  7) ?  4 + random2( 4) :
                                (level_number >  3) ?  2 + random2( 4)
                                                    : random2(4));

[3.3578433]

[3.3578936]

                which_unique = pick_unique(level_number);

Replacement in crawl-ref/source/dungeon.cc at line 4804 [3.3429798]

B:BD[3.3579198] → [3.3579198:3579274]

            if (place_monster( not_used, 280 + which_unique, level_number,

[3.3579198]

[13.1199]

            if (place_monster( not_used, which_unique, level_number,

Replacement in crawl-ref/source/describe.cc at line 5917 [3.3736416]

B:BD[3.3929512] → [3.3929512:3929580]

        description += "A shambling undead, related to the ghoul.";

[3.3929512]

[3.3929580]

        description += "A shambling undead creature, related to the ghoul.";

Insertion in crawl-ref/source/describe.cc at line 6231 [3.3736416]

[4.990360]

        break;
    case MONS_MURRAY:
        description += "A demonic skull rolling along the dungeon floor.";

Replacement in crawl-ref/source/dat/splev.des at line 332 [4.1090923]

B:BD[4.1098640] → [4.1098640:1098721]

xxxxxxxxxx.l.l.l.l.l.................................................xxxxxxxxxxx

[4.1098640]

[4.1098721]

xxxxxxxxxx.l.l.l.l.l...................f.............................xxxxxxxxxxx

Replacement in crawl-ref/source/dat/splev.des at line 335 [4.1090923]

B:BD[4.1098883] → [4.1098883:1098964]

xxxxxxxxx.l.l.l.A.l.l.................}1].............................=Axxxxxxxx

[4.1098883]

[4.1098964]

xxxxxxxxx.l.l.l.A.l.l..............e..}1]..2..........................=Axxxxxxxx

Replacement in crawl-ref/source/dat/splev.des at line 338 [4.1090923]

B:BD[4.1099126] → [4.1099126:1099207]

xxxxxxxxxx.l.l.l.l.l.l...............................................xxxxxxxxxxx

[4.1099126]

[4.1099207]

xxxxxxxxxx.l.l.l.l.l.l.................d.............................xxxxxxxxxxx

Replacement in crawl-ref/source/dat/splev.des at line 373 [4.1090923]
B:BD[4.1101807] → [4.1101807:1101873]
```
MONS: Geryon
MONS: random, random, random, random, random, random
```
[4.1101807]
[4.1101873]
```
MONS: Geryon, Murray
MONS: random, random, random, random, random
```
Insertion in crawl-ref/source/dat/splev.des at line 376 [4.1090923]
[4.1101874]
[4.1101874]
```
SHUFFLE: 2def
ITEM: nothing, nothing, nothing
```
Deletion in crawl-ref/source/beam.cc at line 2658 [3.4128068]
B:BD[3.4214636] → [3.4214636:4214685]
B:BD[3.4214685] → [4.1240207:1240264]
∅:D[4.1240264] → [3.4214738:4214800]
B:BD[3.4214738] → [3.4214738:4214800]
B:BD[3.4214800] → [4.1240265:1240330]
∅:D[4.1240330] → [3.4214861:4214862]
B:BD[3.4214861] → [3.4214861:4214862]
```
            if (targ_grid == DNGN_SILVER_STATUE)
                you.visible_statue[ STATUE_SILVER ] = 0;
            else if (targ_grid == DNGN_ORANGE_CRYSTAL_STATUE)
                you.visible_statue[ STATUE_ORANGE_CRYSTAL ] = 0;
```

Deletion in crawl-ref/source/acr.cc at line 2714 [3.4397395]

B:BD[3.4469808] → [3.4469808:4469934]

    }
    for (i = 0; i < 50; i++)
    {
        you.unique_creatures[i] = 0;
        you.unique_items[i] = UNIQ_NOT_EXISTS;

Replacement in crawl-ref/source/acr.cc at line 2716 [3.4397395]

B:BD[3.4469941] → [3.4469941:4469984]

B:BD[3.4469984] → [4.1280149:1280184]

    for (i = 0; i < NUM_STATUE_TYPES; i++)
        you.visible_statue[i] = 0;

[3.4469941]

[3.4470015]

    you.unique_creatures.init(false);
    you.unique_items.init(UNIQ_NOT_EXISTS);

Tweaked unique code to eliminate the confusing arithmetic on MONS enum values.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/view.cc at line 3401 [3.16817]

Replacement in crawl-ref/source/tags.cc at line 889 [3.164589]

Replacement in crawl-ref/source/tags.cc at line 922 [3.164589]

Replacement in crawl-ref/source/tags.cc at line 1176 [3.164589]

Replacement in crawl-ref/source/tags.cc at line 1180 [3.164589]

Replacement in crawl-ref/source/tags.cc at line 1183 [3.164589]

Deletion in crawl-ref/source/tags.cc at line 1195 [3.164589]

Deletion in crawl-ref/source/tags.cc at line 1196 [3.164589]

Deletion in crawl-ref/source/tags.cc at line 1198 [3.164589]

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

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

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

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

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/religion.cc at line 2574 [3.804403]

Insertion in crawl-ref/source/player.cc at line 5200 [3.962854]

Insertion in crawl-ref/source/ouch.cc at line 719 [3.1104358]

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

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

Replacement in crawl-ref/source/monstuff.cc at line 723 [3.1396662]

Replacement in crawl-ref/source/monplace.cc at line 526 [3.1641732]

Insertion in crawl-ref/source/mon-util.cc at line 2939 [3.1699344]

Insertion in crawl-ref/source/mon-data.h at line 4391 [3.1826214]

Deletion in crawl-ref/source/misc.cc at line 67 [3.1933596]

Deletion in crawl-ref/source/misc.cc at line 1877 [3.1933596]

Deletion in crawl-ref/source/misc.cc at line 1878 [3.1933596]

Insertion in crawl-ref/source/files.cc at line 97 [3.3084589]

Replacement in crawl-ref/source/files.cc at line 1142 [3.3084589]

Insertion in crawl-ref/source/externs.h at line 111 [3.3270163]

Deletion in crawl-ref/source/externs.h at line 563 [3.3270163]

Replacement in crawl-ref/source/externs.h at line 637 [3.3270163]

Replacement in crawl-ref/source/externs.h at line 647 [3.3270163]

Insertion in crawl-ref/source/externs.h at line 718 [3.3270163]

Insertion in crawl-ref/source/externs.h at line 868 [3.3270163]

Insertion in crawl-ref/source/enum.h at line 2195 [3.3287960]

Replacement in crawl-ref/source/dungeon.cc at line 3885 [3.3429798]