fiddlerwoaroof/crawl - Change QANG7WJNRRHNWPRWQSILZI4QILSXVTRZEZRGCZCAPDMWNCJEDS3AC

Experimentally use Denzi and/or Mitsuhiro's water tiles for the Shoals.

It's possible that they make the water look too busy, but maybe I only need to get used to it. Also add some more alternative tiles for the plain dungeon floor and walls, and move around some spell tiles again.

Also fix 2844278: melding stacks stat bonuses for Merfolk. Update change log for the starting stat and exclusion changes.

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

Created by j-p-e-g on September 16, 2009

QANG7WJNRRHNWPRWQSILZI4QILSXVTRZEZRGCZCAPDMWNCJEDS3AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tilereg.cc at line 807 [7.54399]

[6.4131]

[7.74331]

        else if (tile_dngn_equal(TILE_SHOALS_DEEP_WATER, bg_idx))
            m_buf_main.add(TILE_MASK_DEEP_WATER_SHOALS, x, y);
        else if (tile_dngn_equal(TILE_SHOALS_SHALLOW_WATER, bg_idx))
            m_buf_main.add(TILE_MASK_SHALLOW_WATER_SHOALS, x, y);

Insertion in crawl-ref/source/tilepick.cc at line 2379 [10.96318]

[8.1257]

[9.1123]

        else if (player_in_branch(BRANCH_SHOALS))
            return TILE_SHOALS_DEEP_WATER;

Insertion in crawl-ref/source/tilepick.cc at line 2391 [10.96318]

[11.479]

        else if (player_in_branch(BRANCH_SHOALS))
            t = TILE_SHOALS_SHALLOW_WATER;

Insertion in crawl-ref/source/tilepick.cc at line 2401 [10.96318]
[8.1396]
[11.681]
Replacement in crawl-ref/source/rltiles/spells/necromancy/symbol_of_torment.png at line 3 [12.36348]
B:BD[12.36357] → [12.36357:37017]
[12.36357]
Deletion in crawl-ref/source/rltiles/dc-spells.txt at line 73 [12.111604]
B:BD[12.113471] → [13.5138:5154]
```
unknown UNKNOWN
```

Insertion in crawl-ref/source/rltiles/dc-misc.txt at line 46 [10.4951691]

[14.32718]

mask_deep_water_shoals MASK_DEEP_WATER_SHOALS
mask_shallow_water_shoals MASK_SHALLOW_WATER_SHOALS

File addition: mask_shallow_water_shoals.png (----------)
[10.4955259]
File addition: mask_deep_water_shoals.png (----------)
[10.4955259]
Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 15 [10.4169495]
[7.150808]
[7.150808]
```
wall/brick_brown4
wall/brick_brown5
wall/brick_brown6
wall/brick_brown7
```
Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 24 [10.4169495]
[7.150916]
[7.150916]
```
floor/pebble_gray5
floor/pebble_gray6
floor/pebble_gray7
floor/pebble_gray8
```
Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 398 [10.4169495]
[15.5085]
[16.3498]
```
%sdir dc-dngn/water
```

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 421 [10.4169495]

[2.2877]

[8.3717]

dngn_shoals_deep_water1 SHOALS_DEEP_WATER
dngn_shoals_deep_water2
dngn_shoals_deep_water3
dngn_shoals_deep_water4
dngn_shoals_shallow_water1 SHOALS_SHALLOW_WATER
dngn_shoals_shallow_water2
dngn_shoals_shallow_water3
dngn_shoals_shallow_water4
dngn_shoals_shallow_water_disturbance1 SHOALS_SHALLOW_WATER_DISTURBANCE
dngn_shoals_shallow_water_disturbance2
dngn_shoals_shallow_water_disturbance3

File addition: water (d--x------)
[10.5069500]
File addition: dngn_shoals_shallow_water_disturbance3.png (----------)
[0.6053]
File addition: dngn_shoals_shallow_water_disturbance2.png (----------)
[0.6053]
File addition: dngn_shoals_shallow_water_disturbance1.png (----------)
[0.6053]
File addition: dngn_shoals_shallow_water4.png (----------)
[0.6053]
File addition: dngn_shoals_shallow_water3.png (----------)
[0.6053]
File addition: dngn_shoals_shallow_water2.png (----------)
[0.6053]
File addition: dngn_shoals_shallow_water1.png (----------)
[0.6053]
File addition: dngn_shoals_deep_water4.png (----------)
[0.6053]
File addition: dngn_shoals_deep_water3.png (----------)
[0.6053]
File addition: dngn_shoals_deep_water2.png (----------)
[0.6053]
File addition: dngn_shoals_deep_water1.png (----------)
[0.6053]
File move: dngn_shallow_water_murky_disturbance2.png → dngn_shallow_water_murky_disturbance2.png
BF:BFD[10.5069500] → [2.4862:4934]
BF:BF[2.4934] → [2.4066:4066]
[0.6053]
[2.4066]
File move: dngn_shallow_water_murky_disturbance.png → dngn_shallow_water_murky_disturbance.png
BF:BFD[10.5069500] → [11.8466:8537]
BF:BF[11.8537] → [11.7353:7353]
[0.6053]
[11.7353]
File move: dngn_shallow_water_murky2.png → dngn_shallow_water_murky2.png
BF:BFD[10.5069500] → [2.6491:6551]
BF:BF[2.6551] → [2.5781:5781]
[0.6053]
[2.5781]
File move: dngn_shallow_water_murky.png → dngn_shallow_water_murky.png
BF:BFD[10.5069500] → [17.8668:8727]
BF:BF[17.8727] → [17.7934:7934]
[0.6053]
[17.7934]
File move: dngn_shallow_water_disturbance2.png → dngn_shallow_water_disturbance2.png
BF:BFD[10.5069500] → [2.7300:7366]
BF:BF[2.7366] → [2.6554:6554]
[0.6053]
[2.6554]
File move: dngn_shallow_water_disturbance.png → dngn_shallow_water_disturbance.png
BF:BFD[10.5069500] → [11.9654:9719]
BF:BF[11.9719] → [11.8540:8540]
[0.6053]
[11.8540]
File move: dngn_shallow_water2.png → dngn_shallow_water2.png
BF:BFD[10.5069500] → [2.8887:8941]
BF:BF[2.8941] → [2.8159:8159]
[0.6053]
[2.8159]
File move: dngn_shallow_water.png → dngn_shallow_water.png
BF:BFD[10.5069500] → [18.1243041:1243094]
BF:BF[18.1243094] → [18.1242352:1242352]
[0.6053]
[18.1242352]
File move: dngn_open_sea2.png → dngn_open_sea2.png
BF:BFD[10.5069500] → [2.9707:9756]
BF:BF[2.9756] → [2.8948:8948]
[0.6053]
[2.8948]
File move: dngn_open_sea.png → dngn_open_sea.png
BF:BFD[10.5069500] → [16.4539:4587]
BF:BF[16.4587] → [16.3787:3787]
[0.6053]
[16.3787]
File move: dngn_deep_water_murky2.png → dngn_deep_water_murky2.png
BF:BFD[10.5069500] → [2.14698:14755]
BF:BF[2.14755] → [2.13942:13942]
[0.6053]
[2.13942]
File move: dngn_deep_water_murky.png → dngn_deep_water_murky.png
BF:BFD[10.5069500] → [17.9446:9502]
BF:BF[17.9502] → [17.8752:8752]
[0.6053]
[17.8752]
File move: dngn_deep_water2.png → dngn_deep_water2.png
BF:BFD[10.5069500] → [2.15580:15631]
BF:BF[2.15631] → [2.14758:14758]
[0.6053]
[2.14758]
File move: dngn_deep_water.png → dngn_deep_water.png
BF:BFD[10.5069500] → [18.1263120:1263170]
BF:BF[18.1263170] → [18.1262224:1262224]
[0.6053]
[18.1262224]
File addition: brick_brown7.png (----------)
[10.5069521]
File addition: brick_brown6.png (----------)
[10.5069521]
File addition: brick_brown5.png (----------)
[10.5069521]
File addition: brick_brown4.png (----------)
[10.5069521]
File addition: pebble_gray8.png (----------)
[10.5267329]
File addition: pebble_gray7.png (----------)
[10.5267329]
File addition: pebble_gray6.png (----------)
[10.5267329]
File addition: pebble_gray5.png (----------)
[10.5267329]
File addition: symbol_of_torment.png (----------)
[19.15908]
File move: mephitic_cloud2.png → mephitic_cloud.png
BF:BFD[19.15908] → [13.6047:6097]
BF:BF[13.6097] → [12.104333:104333]
[19.15908]
[12.104333]
File addition: components (d--x------)
[19.15908]
File move: tornado.png → tornado.png
BF:BFD[19.15908] → [4.3249:3291]
BF:BF[4.3291] → [4.2762:2762]
[0.37135]
[4.2762]
File move: sword.png → sword.png
BF:BFD[19.15908] → [4.3574:3614]
BF:BF[4.3614] → [4.3294:3294]
[0.37135]
[4.3294]
File move: stones.png → stones.png
BF:BFD[19.15908] → [4.4181:4222]
BF:BF[4.4222] → [4.3616:3616]
[0.37135]
[4.3616]
File move: stone_cracked.png → stone_cracked.png
BF:BFD[19.15908] → [4.4794:4842]
BF:BF[4.4842] → [4.4224:4224]
[0.37135]
[4.4224]
File move: stone.png → stone.png
BF:BFD[19.15908] → [4.5252:5292]
BF:BF[4.5292] → [4.4844:4844]
[0.37135]
[4.4844]
File move: snowflake.png → snowflake.png
BF:BFD[19.15908] → [4.5532:5576]
BF:BF[4.5576] → [4.5294:5294]
[0.37135]
[4.5294]
File move: skull.png → skull.png
BF:BFD[19.15908] → [4.5946:5986]
BF:BF[4.5986] → [4.5578:5578]
[0.37135]
[4.5578]
File move: scroll.png → scroll.png
BF:BFD[19.15908] → [4.6737:6778]
BF:BF[4.6778] → [4.5988:5988]
[0.37135]
[4.5988]
File move: running.png → running.png
BF:BFD[19.15908] → [4.7315:7357]
BF:BF[4.7357] → [4.6780:6780]
[0.37135]
[4.6780]
File move: rat.png → rat.png
BF:BFD[19.15908] → [4.7901:7939]
BF:BF[4.7939] → [4.7359:7359]
[0.37135]
[4.7359]
File move: person5.png → person4.png
BF:BFD[19.15908] → [4.8157:8199]
BF:BF[4.8199] → [4.7941:7941]
[0.37135]
[4.7941]
File move: person4.png → person3.png
BF:BFD[19.15908] → [4.8463:8505]
BF:BF[4.8505] → [4.8201:8201]
[0.37135]
[4.8201]
File move: person2.png → person2.png
BF:BFD[19.15908] → [4.9514:9556]
BF:BF[4.9556] → [4.8951:8951]
[0.37135]
[4.8951]
File move: person1.png → person1.png
BF:BFD[19.15908] → [4.10024:10066]
BF:BF[4.10066] → [4.9558:9558]
[0.37135]
[4.9558]
File move: pentagram_vertical.png → pentagram_vertical.png
BF:BFD[19.15908] → [4.10478:10531]
BF:BF[4.10531] → [4.10068:10068]
[0.37135]
[4.10068]
File move: pentagram_horizontal.png → pentagram_horizontal.png
BF:BFD[19.15908] → [4.10831:10886]
BF:BF[4.10886] → [4.10533:10533]
[0.37135]
[4.10533]
File move: ice_spear.png → ice_spear.png
BF:BFD[19.15908] → [4.11274:11318]
BF:BF[4.11318] → [4.10891:10891]
[0.37135]
[4.10891]
File move: ice.png → ice.png
BF:BFD[19.15908] → [4.11687:11725]
BF:BF[4.11725] → [4.11320:11320]
[0.37135]
[4.11320]
File move: horn.png → horn.png
BF:BFD[19.15908] → [4.12125:12164]
BF:BF[4.12164] → [4.11727:11727]
[0.37135]
[4.11727]
File move: hand5.png → hand5.png
BF:BFD[19.15908] → [4.12750:12790]
BF:BF[4.12790] → [4.12166:12166]
[0.37135]
[4.12166]
File move: hand4.png → hand4.png
BF:BFD[19.15908] → [4.13303:13343]
BF:BF[4.13343] → [4.12792:12792]
[0.37135]
[4.12792]
File move: hand3.png → hand3.png
BF:BFD[19.15908] → [4.13794:13834]
BF:BF[4.13834] → [4.13345:13345]
[0.37135]
[4.13345]
File move: hand2.png → hand2.png
BF:BFD[19.15908] → [4.14179:14219]
BF:BF[4.14219] → [4.13836:13836]
[0.37135]
[4.13836]
File move: hand1.png → hand1.png
BF:BFD[19.15908] → [4.14563:14603]
BF:BF[4.14603] → [4.14221:14221]
[0.37135]
[4.14221]
File move: face.png → face.png
BF:BFD[19.15908] → [4.15199:15238]
BF:BF[4.15238] → [4.14606:14606]
[0.37135]
[4.14606]
File move: eye.png → eye.png
BF:BFD[19.15908] → [4.15563:15601]
BF:BF[4.15601] → [4.15240:15240]
[0.37135]
[4.15240]
File move: dragon.png → dragon.png
BF:BFD[19.15908] → [4.16266:16307]
BF:BF[4.16307] → [4.15603:15603]
[0.37135]
[4.15603]
File move: dog2.png → dog2.png
BF:BFD[19.15908] → [4.17019:17058]
BF:BF[4.17058] → [4.16309:16309]
[0.37135]
[4.16309]
File move: dog1.png → dog1.png
BF:BFD[19.15908] → [4.17469:17508]
BF:BF[4.17508] → [4.17060:17060]
[0.37135]
[4.17060]
File move: person3.png → corpse.png
BF:BFD[19.15908] → [4.8907:8949]
BF:BF[4.8949] → [4.8507:8507]
[0.37135]
[4.8507]
File move: bowl.png → bowl.png
BF:BFD[19.15908] → [4.17940:17979]
BF:BF[4.17979] → [4.17511:17511]
[0.37135]
[4.17511]
File move: bolt.png → bolt.png
BF:BFD[19.15908] → [4.18303:18342]
BF:BF[4.18342] → [4.17981:17981]
[0.37135]
[4.17981]
File move: bird.png → bird.png
BF:BFD[19.15908] → [4.19014:19053]
BF:BF[4.19053] → [4.18344:18344]
[0.37135]
[4.18344]
File move: arrow.png → arrow.png
BF:BFD[19.15908] → [4.19364:19404]
BF:BF[4.19404] → [4.19055:19055]
[0.37135]
[4.19055]

Replacement in crawl-ref/source/player.cc at line 264 [21.962854]

B:BD[20.4157] → [20.4157:4231]

            else if (!grid_is_water(new_grid) && grid_is_water(old_grid))

[20.4157]

[20.4231]

            else if (!grid_is_water(new_grid) && grid_is_water(old_grid)
                     && !is_grid_dangerous(new_grid))

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 1360 [22.307]
B:BD[3.6115] → [3.6115:6117]
```
 
```
[3.6115]
[3.6117]

Insertion in crawl-ref/docs/changelog.txt at line 8 [24.210753]

[5.8380]

[23.3191]

* Starting stats and equipment, and hp gain, are no longer assigned randomly.

Insertion in crawl-ref/docs/changelog.txt at line 11 [24.210753]

[5.8411]

[23.3233]

* Exclusions are displayed in the overview screen ('Ctrl-O' command).
* Autoexclusions get removed again once the trigger monster is no longer there.

Replacement in crawl-ref/docs/changelog.txt at line 32 [24.210753]
B:BD[25.25874] → [19.16947:16979]
```
* Tiles: clickable spells menu.
```
[25.25874]
[23.4003]
```
* Tiles: added clickable spells display (toggle with '_' command).
```

Experimentally use Denzi and/or Mitsuhiro's water tiles for the Shoals.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/tilereg.cc at line 807 [7.54399]

Insertion in crawl-ref/source/tilepick.cc at line 2379 [10.96318]

Insertion in crawl-ref/source/tilepick.cc at line 2391 [10.96318]

Insertion in crawl-ref/source/tilepick.cc at line 2401 [10.96318]

Replacement in crawl-ref/source/rltiles/spells/necromancy/symbol_of_torment.png at line 3 [12.36348]

Deletion in crawl-ref/source/rltiles/dc-spells.txt at line 73 [12.111604]

Insertion in crawl-ref/source/rltiles/dc-misc.txt at line 46 [10.4951691]

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

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

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 15 [10.4169495]

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 24 [10.4169495]

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 398 [10.4169495]

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 421 [10.4169495]

File addition: water (d--x------)

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

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

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

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

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

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

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

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

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

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

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

File move: dngn_shallow_water_murky_disturbance2.png → dngn_shallow_water_murky_disturbance2.png

File move: dngn_shallow_water_murky_disturbance.png → dngn_shallow_water_murky_disturbance.png

File move: dngn_shallow_water_murky2.png → dngn_shallow_water_murky2.png

File move: dngn_shallow_water_murky.png → dngn_shallow_water_murky.png

File move: dngn_shallow_water_disturbance2.png → dngn_shallow_water_disturbance2.png

File move: dngn_shallow_water_disturbance.png → dngn_shallow_water_disturbance.png

File move: dngn_shallow_water2.png → dngn_shallow_water2.png

File move: dngn_shallow_water.png → dngn_shallow_water.png

File move: dngn_open_sea2.png → dngn_open_sea2.png

File move: dngn_open_sea.png → dngn_open_sea.png

File move: dngn_deep_water_murky2.png → dngn_deep_water_murky2.png

File move: dngn_deep_water_murky.png → dngn_deep_water_murky.png

File move: dngn_deep_water2.png → dngn_deep_water2.png

File move: dngn_deep_water.png → dngn_deep_water.png

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

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

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

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

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

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

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

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

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

File move: mephitic_cloud2.png → mephitic_cloud.png

File addition: components (d--x------)

File move: tornado.png → tornado.png

File move: sword.png → sword.png

File move: stones.png → stones.png

File move: stone_cracked.png → stone_cracked.png

File move: stone.png → stone.png

File move: snowflake.png → snowflake.png

File move: skull.png → skull.png

File move: scroll.png → scroll.png

File move: running.png → running.png

File move: rat.png → rat.png

File move: person5.png → person4.png

File move: person4.png → person3.png

File move: person2.png → person2.png

File move: person1.png → person1.png

File move: pentagram_vertical.png → pentagram_vertical.png

File move: pentagram_horizontal.png → pentagram_horizontal.png

File move: ice_spear.png → ice_spear.png

File move: ice.png → ice.png

File move: horn.png → horn.png

File move: hand5.png → hand5.png

File move: hand4.png → hand4.png

File move: hand3.png → hand3.png

File move: hand2.png → hand2.png

File move: hand1.png → hand1.png

File move: face.png → face.png

File move: eye.png → eye.png