fiddlerwoaroof/crawl - Change NQ5X2L66MPWZTR3ANZDBQ5ISPDTJ3AGEYTFQIS437S7MOTXN7A2AC

Add yet another unique courtesy of castamir: Dissolution, sentient

jelly. Update Credits.

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

Created by j-p-e-g on January 10, 2009

NQ5X2L66MPWZTR3ANZDBQ5ISPDTJ3AGEYTFQIS437S7MOTXN7A2AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tilepick.cc at line 942 [8.96318]

[6.369]

[7.18858]

    case MONS_DISSOLUTION:
        return TILEP_MONS_DISSOLUTION;

Insertion in crawl-ref/source/rltiles/dc-mon.txt at line 369 [8.4192854]
[9.8697]
[9.8697]
```
dissolution MONS_DISSOLUTION
```
File addition: dissolution.png (----------)
[10.8871]
Insertion in crawl-ref/source/rltiles/dc-corpse.txt at line 141 [8.5647738]
[2.2670]
[8.5651679]
```
jackal CORPSE_JACKAL /* h */
```
Deletion in crawl-ref/source/rltiles/dc-corpse.txt at line 148 [8.5647738]
B:BD[8.5651811] → [8.5651811:5651841]
```
jackal CORPSE_JACKAL /* j */
```

Replacement in crawl-ref/source/monstuff.cc at line 4477 [11.1396662]

B:BD[11.1465585] → [11.1465585:1465657]

    if (monster->type == MONS_BORING_BEETLE && monster->foe == MHITYOU)

[11.1465585]

[11.1465657]

    if (mons_class_flag(monster->type, M_BURROWS) && monster->foe == MHITYOU)

Replacement in crawl-ref/source/monstuff.cc at line 7786 [11.1396662]
B:BD[12.3959] → [12.3959:4003]
```
    if (monster->type == MONS_BORING_BEETLE
```
[12.3959]
[12.4003]
```
    if (mons_class_flag(monster->type, M_BURROWS)
```
Replacement in crawl-ref/source/monstuff.cc at line 8183 [11.1396662]
∅:D[13.7395] → [11.1544485:1544530]
B:BD[11.1544485] → [11.1544485:1544530]
```
    if (monster->type == MONS_BORING_BEETLE)
```
[13.7395]
[11.1544530]
```
    if (mons_class_flag(monster->type, M_BURROWS))
```

Replacement in crawl-ref/source/monstuff.cc at line 8193 [11.1396662]

∅:D[14.34184] → [15.446089:446153]

B:BD[11.1544802] → [15.446089:446153]

                mpr("You hear a grinding noise.", MSGCH_SOUND);

[14.34184]

[11.1544853]

            {
                // Message depends on whether caused by boring beetle or
                // acid (Dissolution).
                mpr((monster->type == MONS_BORING_BEETLE) ?
                    "You hear a grinding noise." :
                    "You hear a sizzling sound.", MSGCH_SOUND);
            }

Insertion in crawl-ref/source/monstuff.cc at line 8481 [11.1396662]
[6.4072]
[11.1554644]
```
        case MONS_DISSOLUTION:
```
Replacement in crawl-ref/source/mon-data.h at line 1721 [11.1826214]
B:BD[16.49041] → [16.49041:49057]
```
    M_NO_FLAGS,
```
[16.49041]
[16.49057]
```
    M_BURROWS,
```
Deletion in crawl-ref/source/mon-data.h at line 2284 [11.1826214]
B:BD[11.1854679] → [11.1854679:1854681]
B:BD[11.1854681] → [17.2917:2971]
∅:D[17.2971] → [18.2735:2805]
B:BD[16.67903] → [18.2735:2805]
B:BD[18.2805] → [3.2650:2683]
∅:D[3.2683] → [16.67954:68060]
∅:D[18.2827] → [16.67954:68060]
∅:D[19.8477] → [16.67954:68060]
B:BD[16.67954] → [16.67954:68060]
B:BD[16.68060] → [19.8478:8577]
∅:D[19.8577] → [16.68147:68213]
B:BD[16.68147] → [16.68147:68213]
B:BD[16.68213] → [19.8578:8641]
∅:D[20.6677] → [21.21904:21907]
∅:D[19.8641] → [21.21904:21907]
∅:D[22.9454] → [21.21904:21907]
∅:D[16.68276] → [21.21904:21907]
B:BD[21.21904] → [21.21904:21907]
∅:D[21.21907] → [11.1854969:1854970]
B:BD[11.1854969] → [11.1854969:1854970]
```
{
    MONS_ROYAL_JELLY, 'J', YELLOW, "the royal jelly",
    M_NO_SKELETON | M_SENSE_INVIS | M_SPECIAL_ABILITY | M_ACID_SPLASH
        | M_NO_REGEN | M_UNIQUE,
    MR_RES_POISON | MR_RES_ASPHYX | MR_RES_ACID,
    0, 20, MONS_JELLY, MONS_ROYAL_JELLY, MH_NATURAL, -7,
    { {AT_HIT, AF_ACID, 50}, {AT_HIT, AF_ACID, 30}, AT_NO_ATK, AT_NO_ATK },
    { 21, 0, 0, 230 },
    8, 4, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SILENT, I_PLANT,
    HT_LAND, 16, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_SMALL
},
```

Insertion in crawl-ref/source/mon-data.h at line 3970 [11.1826214]

[6.5782]

},
{
    MONS_ROYAL_JELLY, 'J', YELLOW, "the royal jelly",
    M_NO_SKELETON | M_SENSE_INVIS | M_SPECIAL_ABILITY | M_ACID_SPLASH
        | M_NO_REGEN | M_UNIQUE,
    MR_RES_POISON | MR_RES_ASPHYX | MR_RES_ACID,
    0, 20, MONS_JELLY, MONS_ROYAL_JELLY, MH_NATURAL, -7,
    { {AT_HIT, AF_ACID, 50}, {AT_HIT, AF_ACID, 30}, AT_NO_ATK, AT_NO_ATK },
    { 21, 0, 0, 230 },
    8, 4, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SILENT, I_PLANT,
    HT_LAND, 16, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_SMALL

Insertion in crawl-ref/source/mon-data.h at line 3985 [11.1826214]

[6.5788]

[23.12117]

    MONS_DISSOLUTION, 'J', LIGHTMAGENTA, "Dissolution",
    M_UNIQUE | M_NO_SKELETON | M_SENSE_INVIS | M_ACID_SPLASH | M_BURROWS
        | M_SPEAKS,
    MR_RES_POISON | MR_RES_ASPHYX | mrd(MR_RES_ACID, 3),
    0, 11, MONS_JELLY, MONS_DISSOLUTION, MH_NATURAL, -7,
    { {AT_HIT, AF_ACID, 50}, {AT_HIT, AF_ACID, 30}, AT_NO_ATK, AT_NO_ATK },
    { 12, 3, 5, 180 },
    10, 1, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_NORMAL,
    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_LARGE
},
{

Insertion in crawl-ref/source/enum.h at line 2006 [11.3287960]
[6.6703]
[24.3693]
```
    MONS_DISSOLUTION,                  // 460
```
Replacement in crawl-ref/source/enum.h at line 2009 [11.3287960]
B:BD[24.3718] → [6.6704:6750]
```
    MONS_TEST_SPAWNER,                 // 460
```
[24.3718]
[11.3340022]
```
    MONS_TEST_SPAWNER,
```

Replacement in crawl-ref/source/dungeon.cc at line 3265 [11.3429798]

B:BD[23.24848] → [5.3453:3511]

                            MONS_SONJA, MONS_NESSOS, -1);

[23.24848]

[25.4093]

                            MONS_SONJA, MONS_NESSOS, MONS_DISSOLUTION, -1);

Replacement in crawl-ref/source/dungeon.cc at line 3273 [11.3429798]

B:BD[23.24963] → [23.24963:25013]

                            MONS_SAINT_ROKA, -1);

[23.24963]

[25.4410]

                            MONS_SAINT_ROKA, MONS_DISSOLUTION, -1);

Insertion in crawl-ref/source/dungeon.cc at line 3281 [11.3429798]

[26.2663]

[25.4464]

    if (player_in_branch(BRANCH_SLIME_PITS))
    {
        // Only allow Dissolution in the Slime Pits.
        if (player_branch_depth() > 1 && one_chance_in(3))
            return MONS_DISSOLUTION;
        return MONS_PROGRAM_BUG;
    }

Replacement in crawl-ref/source/dungeon.cc at line 3340 [11.3429798]

B:BD[11.3577389] → [27.46801:46876]

        monster_type which_unique = MONS_PROGRAM_BUG;   //     30 in total

[11.3577389]

[28.1392]

        monster_type which_unique = MONS_PROGRAM_BUG;

Insertion in crawl-ref/source/dungeon.cc at line 3345 [11.3429798]
[11.3577534]
[29.6203]
```
            which_unique = _pick_unique(level_number);
```

Replacement in crawl-ref/source/dungeon.cc at line 3348 [11.3429798]

∅:D[29.6273] → [27.46980:47051]

B:BD[28.1534] → [27.46980:47051]

            if (which_unique != MONS_PROGRAM_BUG && !one_chance_in(3))

[29.6273]

[28.1590]

            if (which_unique == MONS_PROGRAM_BUG
                || you.unique_creatures[which_unique] && !one_chance_in(3))

Deletion in crawl-ref/source/dungeon.cc at line 3354 [11.3429798]
B:BD[28.1676] → [28.1676:1677]
B:BD[28.1677] → [30.25780:25835]
```
            which_unique = _pick_unique(level_number);
```

Insertion in crawl-ref/source/dat/descript/monsters.txt at line 66 [32.17579]

[31.30597]

[32.37235]

%%%%
Dissolution
The Pits of Slime used to be a thriving civilization and Dissolution was the prophet of their god.  When the city was overtaken by its current residents and their god became the Slime God, only Dissolution survived, becoming a tremendous mass of acidic ooze.  He retained his intelligence but is filled with hate for anything that can hold a form.

Insertion in crawl-ref/source/dat/database/monspeak.txt at line 1283 [33.307]

[33.18087]

%%%%
# a sentient jelly
Dissolution
@The_monster@ gurgles.
@The_monster@ gurgles loudly.
@The_monster@ emits a sizzling noise.
@The_monster@ jiggles.
@The_monster@ says, "Join with me for eternity!"
@The_monster@ says, "Become one with my sorrow!"
## END Dissolution ##

Replacement in crawl-ref/source/branch.cc at line 210 [34.14355]
B:BD[34.16214] → [35.5533:5572]
```
      false, false, GREEN, LIGHTGREEN,
```
[34.16214]
[36.1785]
```
      false, true, GREEN, LIGHTGREEN,
```

Replacement in crawl-ref/CREDITS at line 18 [38.237297]

B:BD[37.5071] → [4.2811:3083]

Warwick Allison              Benoit Hudson             Stefan O'Rear
Juha Arpiainen               Iainuki                   Yuuma Oohara
Roy Axenov                   Ilyak                     Erik Piper
Max Bane                     Mitsuhiro Itakura         Lemuel Pitkin

[37.5071]

[4.3083]

Warwick Allison              Benoit Hudson             Yuuma Oohara
Juha Arpiainen               Iainuki                   Erik Piper
Roy Axenov                   Ilyak                     Lemuel Pitkin
Max Bane                     Mitsuhiro Itakura         Derek Ray

Replacement in crawl-ref/CREDITS at line 23 [38.237297]

B:BD[4.3147] → [4.3147:4370]

Alexander Beisig             Jarmo Kielosto            Derek Ray
Erik Inge Bolsø              Kornel Kisielewicz        David Rose
Peter Borgmann               Vsevolod Kozlov           Sebastian Salman
Terje Bø                     Ryan Kusnery              Brett Scarborough
Aaron Curtis                 Jukka Kuusisto            Darshan Shaligram
Denzi                        Maciej Lapinski           Robert Shimmin
Rachel Elizabeth Dillon      Jordan Lewis              Sigurd
Mike Drinen                  Icy Lich                  Edgar Simo
Kieron Dunbar                Jesse Luehrs              Solf
Christopher Evenstar         Markus Maier              Johan Strandell
Ben Goetter                  Arien Malec               Roman Sêk
Rob Grant                    Wille Mäntylä             Marc H. Thoben
John Greenberg               Shawn M Moore             Matt Titus
GreyKnight                   Eva Myers                 Robert Vollmert
Shayne Halvorson             Onia Ninara               Steven Wheeler
Ciaran Hamilton              Erkki Nurmi               Jeremey Wilson
Chris Hamons                 nyra                      Yelve Yakut
R. Dan Henry                 Dylan O'Donnell           Zooko

[4.3147]

Alexander Beisig             Jarmo Kielosto            David Rose
Erik Inge Bolsø              Kornel Kisielewicz        Sebastian Salman
Peter Borgmann               Vsevolod Kozlov           Brett Scarborough
Adam Borowski                Ryan Kusnery              Darshan Shaligram
Terje Bø                     Jukka Kuusisto            Robert Shimmin
Aaron Curtis                 Maciej Lapinski           Sigurd
Denzi                        Jordan Lewis              Edgar Simo
Rachel Elizabeth Dillon      Icy Lich                  Solf
Mike Drinen                  Jesse Luehrs              Johan Strandell
Kieron Dunbar                Markus Maier              Roman Sêk
Christopher Evenstar         Arien Malec               Marc H. Thoben
Ben Goetter                  Shawn M Moore             Matt Titus
Rob Grant                    Eva Myers                 Robert Vollmert
John Greenberg               Wille Mäntylä             Steven Wheeler
GreyKnight                   Onia Ninara               Jeremey Wilson
Shayne Halvorson             Erkki Nurmi               Yelve Yakut
Ciaran Hamilton              nyra                      Zooko
Chris Hamons                 Dylan O'Donnell
R. Dan Henry                 Stefan O'Rear

Add yet another unique courtesy of castamir: Dissolution, sentient

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/tilepick.cc at line 942 [8.96318]

Insertion in crawl-ref/source/rltiles/dc-mon.txt at line 369 [8.4192854]

File addition: dissolution.png (----------)

Insertion in crawl-ref/source/rltiles/dc-corpse.txt at line 141 [8.5647738]

Deletion in crawl-ref/source/rltiles/dc-corpse.txt at line 148 [8.5647738]

Replacement in crawl-ref/source/monstuff.cc at line 4477 [11.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7786 [11.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8183 [11.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8193 [11.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 8481 [11.1396662]

Replacement in crawl-ref/source/mon-data.h at line 1721 [11.1826214]

Deletion in crawl-ref/source/mon-data.h at line 2284 [11.1826214]

Insertion in crawl-ref/source/mon-data.h at line 3970 [11.1826214]

Insertion in crawl-ref/source/mon-data.h at line 3985 [11.1826214]

Insertion in crawl-ref/source/enum.h at line 2006 [11.3287960]

Replacement in crawl-ref/source/enum.h at line 2009 [11.3287960]