fiddlerwoaroof/crawl - Change ZBPS5ZTPF3DVTR5WET4XEFHYXU26CRHU2OHX3YO6PD4MTM2DUXAQC

Fix [1951429] Mutations being miscoloured after listing innate

boosted mutations.

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

Created by j-p-e-g on April 25, 2008

ZBPS5ZTPF3DVTR5WET4XEFHYXU26CRHU2OHX3YO6PD4MTM2DUXAQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/traps.cc at line 972 [4.5308]
B:BD[3.1370] → [3.1370:1376]
```
    {
```
Deletion in crawl-ref/source/traps.cc at line 973 [4.5308]
B:BD[3.1400] → [3.1400:1406]
```
    }
```
Replacement in crawl-ref/source/mutation.cc at line 1087 [6.1263003]
B:BD[5.674] → [5.674:706]
```
            result += "<cyan>";
```
[5.674]
[5.706]
```
            result += "</lightblue><cyan>";
```

Replacement in crawl-ref/source/mutation.cc at line 1099 [6.1263003]

B:BD[2.19891] → [2.19891:20003]

            result += "<cyan>You can exhale a cloud of poison.</cyan>"
                      EOL "<lightblue>";

[2.19891]

[2.20003]

            result += "</lightblue><cyan>You can exhale a cloud of poison."
                      "</cyan><lightblue>" EOL ;

Replacement in crawl-ref/source/mutation.cc at line 1105 [6.1263003]
B:BD[7.1399] → [8.158:190]
```
            result += "<cyan>";
```
[7.1399]
[7.1435]
```
            result += "</lightblue><cyan>";
```
Replacement in crawl-ref/source/mutation.cc at line 1115 [6.1263003]
B:BD[7.1800] → [8.225:257]
```
            result += "<cyan>";
```
[7.1800]
[7.1836]
```
            result += "</lightblue><cyan>";
```
Replacement in crawl-ref/source/mutation.cc at line 1125 [6.1263003]
B:BD[5.968] → [5.968:1000]
```
            result += "<cyan>";
```
[5.968]
[5.1000]
```
            result += "</lightblue><cyan>";
```

Replacement in crawl-ref/source/monstuff.cc at line 3169 [6.1396662]

B:BD[6.1477188] → [9.423302:423342]

∅:D[9.423342] → [6.1477240:1477355]

B:BD[6.1477240] → [6.1477240:1477355]

        beem.name = "volley of spikes";
        beem.range = 9;
        beem.rangeMax = 9;
        beem.hit = 14;
        beem.damage = dice_def( 2, 10 );

[6.1477188]

[6.1477355]

        beem.name        = "volley of spikes";
        beem.range       = 9;
        beem.rangeMax    = 9;
        beem.hit         = 14;
        beem.damage      = dice_def( 2, 10 );

Replacement in crawl-ref/source/monstuff.cc at line 3175 [6.1396662]

B:BD[6.1477406] → [10.4565:4619]

∅:D[10.4619] → [6.1477439:1477588]

B:BD[6.1477439] → [6.1477439:1477588]

B:BD[6.1477588] → [9.423343:423373]

        beem.type = dchar_glyph(DCHAR_FIRED_MISSILE);
        beem.colour = LIGHTGREY;
        beem.flavour = BEAM_MISSILE;
        beem.thrower = KILL_MON;
        beem.aux_source = "volley of spikes";
        beem.is_beam = false;

[6.1477406]

[6.1477617]

        beem.type        = dchar_glyph(DCHAR_FIRED_MISSILE);
        beem.colour      = LIGHTGREY;
        beem.flavour     = BEAM_MISSILE;
        beem.thrower     = KILL_MON;
        beem.aux_source  = "volley of spikes";
        beem.is_beam     = false;

Replacement in crawl-ref/source/monstuff.cc at line 6320 [6.1396662]

B:BD[6.1547245] → [9.447017:447042]

B:BD[9.447042] → [10.4620:4667]

∅:D[10.4667] → [6.1547310:1547413]

B:BD[6.1547310] → [6.1547310:1547413]

    pbolt.name = "acid";
    pbolt.type = dchar_glyph(DCHAR_FIRED_ZAP);
    pbolt.range = 9;
    pbolt.rangeMax = 9;
    pbolt.colour = YELLOW;
    pbolt.flavour = BEAM_ACID;

[6.1547160]

[6.1547413]

    pbolt.name        = "acid";
    pbolt.type        = dchar_glyph(DCHAR_FIRED_ZAP);
    pbolt.range       = 9;
    pbolt.rangeMax    = 9;
    pbolt.colour      = YELLOW;
    pbolt.flavour     = BEAM_ACID;

Replacement in crawl-ref/source/monstuff.cc at line 6327 [6.1396662]

B:BD[6.1547461] → [6.1547461:1547582]

    pbolt.damage = dice_def( 3, 7 );
    pbolt.hit = 20 + (3 * monster->hit_dice);
    pbolt.thrower = KILL_MON_MISSILE;

[6.1547461]

[9.447043]

    pbolt.damage      = dice_def( 3, 7 );
    pbolt.hit         = 20 + (3 * monster->hit_dice);
    pbolt.thrower     = KILL_MON_MISSILE;

Replacement in crawl-ref/source/misc.cc at line 1833 [6.1933596]

B:BD[11.17429] → [11.17429:17536]

    bool shaft = ((!force_stair
                   && trap_type_at_xy(you.x_pos, you.y_pos) == TRAP_SHAFT)

[11.17429]

[11.17536]

    bool shaft = (!force_stair
                      && trap_type_at_xy(you.x_pos, you.y_pos) == TRAP_SHAFT

Fix [1951429] Mutations being miscoloured after listing innate

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/traps.cc at line 972 [4.5308]

Deletion in crawl-ref/source/traps.cc at line 973 [4.5308]

Replacement in crawl-ref/source/mutation.cc at line 1087 [6.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1099 [6.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1105 [6.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1115 [6.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1125 [6.1263003]

Replacement in crawl-ref/source/monstuff.cc at line 3169 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3175 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6320 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6327 [6.1396662]

Replacement in crawl-ref/source/misc.cc at line 1833 [6.1933596]