diff options
Diffstat (limited to 'crawl-ref/source/rltiles')
-rw-r--r-- | crawl-ref/source/rltiles/dc-2d.txt | 6 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn.txt | 188 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/dc-misc.txt | 101 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/dc-misc/tutorial_cursor.bmp | bin | 0 -> 2102 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-misc/unseen_water_monster.bmp | bin | 0 -> 2102 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-mon.txt | 5 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/dc-pl.txt | 2 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/dngn.txt (renamed from crawl-ref/source/rltiles/dc-wall2d.txt) | 770 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/license.txt | 10 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/makefile.mgw | 14 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/makefile.unix | 9 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/tool/dctile.c | 38 |
12 files changed, 480 insertions, 663 deletions
diff --git a/crawl-ref/source/rltiles/dc-2d.txt b/crawl-ref/source/rltiles/dc-2d.txt index 3b0e06c2e7..dff5fe74ba 100644 --- a/crawl-ref/source/rltiles/dc-2d.txt +++ b/crawl-ref/source/rltiles/dc-2d.txt @@ -1,13 +1,13 @@ %tiledef tiledef.h
-%width 30
+%width 32
%back none
#%htmlfile tile.htm
#%tilelist tile.txt
#%htmlbody
%name tile
-## Dungeon features
-%include dc-dngn.txt
+# idx == 0 must be invalid.
+dc-dngn/dngn_unseen
## Set black rim
## Items
diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt deleted file mode 100644 index ab2e6b96a6..0000000000 --- a/crawl-ref/source/rltiles/dc-dngn.txt +++ /dev/null @@ -1,188 +0,0 @@ -%sdir dc-dngn - -blank BLANK -dngn_unseen DNGN_UNSEEN - -# Do not separate basic floors and rock walls. They get overwritten by -# branch-specific floors and walls and will overwrite anything in between. -floor/pebble_gray0 DNGN_FLOOR -floor/pebble_gray1 -floor/pebble_gray2 -floor/pebble_gray3 -floor/pebble_gray3 -floor/pebble_gray3 -floor/pebble_gray3 -floor/pebble_gray3 DNGN_FLOOR_SPECIAL -wall/brick_brown0 DNGN_ROCK_WALL_OFS -wall/brick_brown1 -wall/brick_brown2 -wall/brick_brown3 -wall/brick_brown3 -wall/brick_brown3 -wall/brick_brown3 -wall/brick_brown3 -wall/brick_brown3 -wall/brick_brown3 -wall/brick_brown3 -wall/brick_brown3 - -floor/floor_nerves0 DNGN_FLOOR_CORRUPT -floor/floor_nerves1 -floor/floor_nerves2 -floor/floor_nerves3 -wall/undead0 DNGN_WALL_CORRUPT -wall/undead1 -wall/undead2 -wall/undead3 - -floor/lava0 DNGN_LAVA -floor/lava1 -floor/lava2 -floor/lava3 -dngn_deep_water DNGN_DEEP_WATER -dngn_deep_water -dngn_deep_water -dngn_deep_water -dngn_shallow_water DNGN_SHALLOW_WATER -dngn_shallow_water -dngn_shallow_water -dngn_shallow_water - -wall/stone2_gray0 DNGN_STONE_WALL -wall/stone2_gray1 -wall/stone2_gray2 -wall/stone2_gray3 -dngn_metal_wall DNGN_METAL_WALL -dngn_green_crystal_wall DNGN_GREEN_CRYSTAL_WALL -dngn_wax_wall DNGN_WAX_WALL -dngn_transparent_wall DNGN_TRANSPARENT_WALL - -#dngn_rock_wall_00 DNGN_ROCK_WALL_OFS -#dngn_rock_wall_01 IGNORE_COMMENT -#dngn_rock_wall_02 IGNORE_COMMENT -#dngn_rock_wall_03 IGNORE_COMMENT -#dngn_rock_wall_04 IGNORE_COMMENT -#dngn_rock_wall_05 IGNORE_COMMENT -#dngn_rock_wall_06 IGNORE_COMMENT -#dngn_rock_wall_07 IGNORE_COMMENT -#dngn_rock_wall_08 IGNORE_COMMENT -#dngn_rock_wall_09 IGNORE_COMMENT -#dngn_rock_wall_10 IGNORE_COMMENT -#dngn_rock_wall_11 IGNORE_COMMENT -#dngn_rock_wall_12 IGNORE_COMMENT -#dngn_rock_wall_13 IGNORE_COMMENT -#dngn_rock_wall_14 IGNORE_COMMENT -#dngn_rock_wall_15 IGNORE_COMMENT -#dngn_stone_wall DNGN_STONE_WALL - -dngn_closed_door DNGN_CLOSED_DOOR -gate_closed_left DNGN_GATE_CLOSED_LEFT -gate_closed_middle DNGN_GATE_CLOSED_MIDDLE -gate_closed_right DNGN_GATE_CLOSED_RIGHT -dngn_open_door DNGN_OPEN_DOOR -gate_open_left DNGN_GATE_OPEN_LEFT -gate_open_middle DNGN_GATE_OPEN_MIDDLE -gate_open_right DNGN_GATE_OPEN_RIGHT -###dc/wal8 DNGN_SECRET_DOOR -dngn_orcish_idol DNGN_ORCISH_IDOL -dngn_silver_statue DNGN_SILVER_STATUE -dngn_granite_statue DNGN_GRANITE_STATUE -dngn_orange_crystal_statue DNGN_ORANGE_CRYSTAL_STATUE -dngn_ice_statue DNGN_ICE_STATUE - -###dc/wal1 DNGN_PERMAROCK_WALL -###dc/wal1 DNGN_LAST_SOLID_TILE - -%rim 1 -dngn_enter_hell DNGN_ENTER_HELL -%rim 0 -dngn_branch_stairs DNGN_BRANCH_STAIRS -dngn_trap_dart DNGN_TRAP_DART -dngn_trap_arrow DNGN_TRAP_ARROW -dngn_trap_spear DNGN_TRAP_SPEAR -dngn_trap_axe DNGN_TRAP_AXE -dngn_trap_teleport DNGN_TRAP_TELEPORT -dngn_trap_alarm DNGN_TRAP_ALARM -dngn_trap_blade DNGN_TRAP_BLADE -dngn_trap_bolt DNGN_TRAP_BOLT -dngn_trap_net DNGN_TRAP_NET -dngn_trap_zot DNGN_TRAP_ZOT -dngn_trap_needle DNGN_TRAP_NEEDLE -dngn_trap_shaft DNGN_TRAP_SHAFT -###847 DNGN_UNDISCOVERED_TRAP -stone_stairs_down DNGN_STONE_STAIRS_DOWN -#nh-dngn/staircase_down DNGN_STONE_STAIRS_DOWN_II -#nh-dngn/staircase_down DNGN_STONE_STAIRS_DOWN_III -rock_stairs_down DNGN_ROCK_STAIRS_DOWN -stone_stairs_up DNGN_STONE_STAIRS_UP -#nh-dngn/staircase_up DNGN_STONE_STAIRS_UP_II -#nh-dngn/staircase_up DNGN_STONE_STAIRS_UP_III -rock_stairs_up DNGN_ROCK_STAIRS_UP - -dngn_enter_shop DNGN_ENTER_SHOP -dngn_enter_labyrinth DNGN_ENTER_LABYRINTH -dngn_enter_dis DNGN_ENTER_DIS -dngn_enter_gehenna DNGN_ENTER_GEHENNA -dngn_enter_cocytus DNGN_ENTER_COCYTUS -dngn_enter_tartarus DNGN_ENTER_TARTARUS - -dngn_enter_abyss DNGN_ENTER_ABYSS -dngn_exit DNGN_EXIT_ABYSS - -dngn_stone_arch DNGN_STONE_ARCH -dngn_enter_pandemonium DNGN_ENTER_PANDEMONIUM -dngn_exit DNGN_EXIT_PANDEMONIUM -%rim 1 -dngn_transit_pandemonium DNGN_TRANSIT_PANDEMONIUM -%rim 0 -####846 DNGN_BUILDER_SPECIAL_WALL -####846 DNGN_BUILDER_SPECIAL_FLOOR -dngn_enter DNGN_ENTER -#851 DNGN_ENTER_ORCISH_MINES -#851 DNGN_ENTER_HIVE -#851 DNGN_ENTER_LAIR -#851 DNGN_ENTER_SLIME_PITS -#851 DNGN_ENTER_VAULTS -#851 DNGN_ENTER_CRYPT -#851 DNGN_ENTER_HALL_OF_BLADES -#851 DNGN_ENTER_ZOT -#851 DNGN_ENTER_TEMPLE -#851 DNGN_ENTER_SNAKE_PIT -#851 DNGN_ENTER_ELVEN_HALLS -#851 DNGN_ENTER_TOMB -#851 DNGN_ENTER_SWAMP -%rim 1 -dngn_return DNGN_RETURN -%rim 0 -#850 DNGN_RETURN_FROM_ORCISH_MINES -#850 DNGN_RETURN_FROM_HIVE -#850 DNGN_RETURN_FROM_LAIR -#850 DNGN_RETURN_FROM_SLIME_PITS -#850 DNGN_RETURN_FROM_VAULTS -#850 DNGN_RETURN_FROM_CRYPT -#850 DNGN_RETURN_FROM_HALL_OF_BLADES -#850 DNGN_RETURN_FROM_ZOT -#850 DNGN_RETURN_FROM_TEMPLE -#850 DNGN_RETURN_FROM_SNAKE_PIT -#850 DNGN_RETURN_FROM_ELVEN_HALLS -#850 DNGN_RETURN_FROM_TOMB -#850 DNGN_RETURN_FROM_SWAMP -dngn_altar_zin DNGN_ALTAR_ZIN -dngn_altar_shining_one DNGN_ALTAR_SHINING_ONE -dngn_altar_kikubaaqudgha DNGN_ALTAR_KIKUBAAQUDGHA -dngn_altar_yredelemnul DNGN_ALTAR_YREDELEMNUL -dngn_altar_xom DNGN_ALTAR_XOM -dngn_altar_vehumet DNGN_ALTAR_VEHUMET -dngn_altar_okawaru DNGN_ALTAR_OKAWARU -dngn_altar_makhleb DNGN_ALTAR_MAKHLEB -dngn_altar_sif_muna DNGN_ALTAR_SIF_MUNA -dngn_altar_trog DNGN_ALTAR_TROG -dngn_altar_nemelex_xobeh DNGN_ALTAR_NEMELEX_XOBEH -dngn_altar_elyvilon DNGN_ALTAR_ELYVILON -dngn_altar_lugonu DNGN_ALTAR_LUGONU -dngn_altar_beogh DNGN_ALTAR_BEOGH -dngn_blue_fountain DNGN_BLUE_FOUNTAIN -dngn_sparkling_fountain DNGN_SPARKLING_FOUNTAIN -dngn_blood_fountain DNGN_BLOOD_FOUNTAIN -dngn_dry_fountain DNGN_DRY_FOUNTAIN -#858 DNGN_PERMADRY_FOUNTAIN diff --git a/crawl-ref/source/rltiles/dc-misc.txt b/crawl-ref/source/rltiles/dc-misc.txt index 0c89b0b41a..08a71c27c7 100644 --- a/crawl-ref/source/rltiles/dc-misc.txt +++ b/crawl-ref/source/rltiles/dc-misc.txt @@ -25,11 +25,8 @@ cloud_grey_smoke CLOUD_GREY_SMOKE cloud_miasma CLOUD_MIASMA
cloud_purp_smoke CLOUD_PURP_SMOKE
-sanctuary SANCTUARY
-
#########MAP
%sdir dc-misc
-halo HALO
%corpse 0
%back none
%mesh 0
@@ -41,23 +38,18 @@ unseen_item UNSEEN_ITEM %back dc-misc/blood_red
unseen_monster UNSEEN_CORPSE
%corpse 0
-dc-misc/blood_red BLOOD0
-dc-misc/blood_red1 BLOOD1
-dc-misc/blood_red2 BLOOD2
-dc-misc/blood_red3 BLOOD3
-dc-misc/blood_red4 BLOOD4
%back none
dc-dngn/dngn_altar UNSEEN_ALTAR
dc-dngn/dngn_entrance UNSEEN_ENTRANCE
%back none
-#mask_deep_water MASK_DEEP_WATER
-#mask_shallow_water MASK_SHALLOW_WATER
-#mask_lava MASK_LAVA
-sink_mask SINK_MASK
+mask_deep_water MASK_DEEP_WATER
+mask_shallow_water MASK_SHALLOW_WATER
+mask_lava MASK_LAVA
cursor CURSOR
cursor_red CURSOR2
cursor_green CURSOR3
+tutorial_cursor TUTORIAL_CURSOR
%rim 1
heart HEART
neutral NEUTRAL
@@ -71,15 +63,14 @@ unseen PLAYER blank MESH
%mesh 0
magicmap MAGIC_MAP_MESH
-ray RAY_MESH
txt1 TEXT_PARTS_J
txt2 TEXT_DOLLS_J
txt3 TEXT_PARTS_E
txt4 TEXT_DOLLS_E
something_under SOMETHING_UNDER
error ERROR
-travel_exclusion TRAVEL_EXCLUSION
-travel_exclusion_centre TRAVEL_EXCL_CENTRE
+travel_exclusion TRAVEL_EXCLUSION_FG
+travel_exclusion_centre TRAVEL_EXCLUSION_CENTRE_FG
%rim 1
todo TODO
new_stair NEW_STAIR
@@ -98,89 +89,11 @@ char68 char70
char78
-slot ITEM_SLOT
slot_eq ITEM_SLOT_EQUIP
slot_cursed ITEM_SLOT_CURSED
slot_eq_cursed ITEM_SLOT_EQUIP_CURSED
+ray ITEM_SLOT_SELECTED
%back unseen
dc-misc/unseen_monster MCACHE_START
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
-dc-misc/unseen_monster
dc-misc/unseen_monster MCACHE_END
diff --git a/crawl-ref/source/rltiles/dc-misc/tutorial_cursor.bmp b/crawl-ref/source/rltiles/dc-misc/tutorial_cursor.bmp Binary files differnew file mode 100644 index 0000000000..3d9f23a6fe --- /dev/null +++ b/crawl-ref/source/rltiles/dc-misc/tutorial_cursor.bmp diff --git a/crawl-ref/source/rltiles/dc-misc/unseen_water_monster.bmp b/crawl-ref/source/rltiles/dc-misc/unseen_water_monster.bmp Binary files differnew file mode 100644 index 0000000000..01b75a80bb --- /dev/null +++ b/crawl-ref/source/rltiles/dc-misc/unseen_water_monster.bmp diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index 00cece283e..8ef8749521 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -498,3 +498,8 @@ merfolk_fighter_water MONS_MERFOLK_FIGHTER_WATER mermaid MONS_MERMAID
mermaid_water MONS_MERMAID_WATER
rock_worm MONS_ROCK_WORM
+
+%sdir dc-dngn
+dngn_orange_crystal_statue DNGN_ORANGE_CRYSTAL_STATUE
+dngn_ice_statue DNGN_ICE_STATUE
+%sdir dc-mon
diff --git a/crawl-ref/source/rltiles/dc-pl.txt b/crawl-ref/source/rltiles/dc-pl.txt index af130b5e05..5f057b9b7f 100644 --- a/crawl-ref/source/rltiles/dc-pl.txt +++ b/crawl-ref/source/rltiles/dc-pl.txt @@ -1,4 +1,4 @@ -%width 20
+%width 32
%back none
%name player
diff --git a/crawl-ref/source/rltiles/dc-wall2d.txt b/crawl-ref/source/rltiles/dngn.txt index d3e7054da9..a2c290056f 100644 --- a/crawl-ref/source/rltiles/dc-wall2d.txt +++ b/crawl-ref/source/rltiles/dngn.txt @@ -1,345 +1,425 @@ -%enumprefix W2D_
-%tiledef tiledef-w2d.h
-%tilecount tilecount-w2d.h
-%width 16
-%back none
-%name wall2d
-
-%sdir dc-dngn
-
-wall/brick_brown0 WALL_NORMAL
-wall/brick_brown1
-wall/brick_brown2
-wall/brick_brown3
-floor/pebble_gray0 FLOOR_NORMAL
-floor/pebble_gray1
-floor/pebble_gray2
-floor/pebble_gray3
-floor/pebble_gray4
-
-wall/relief0 WALL_HALL
-wall/relief1
-wall/relief2
-wall/relief3
-floor/mesh0 FLOOR_HALL
-floor/mesh1
-floor/mesh2
-floor/mesh3
-
-wall/hive0 WALL_HIVE
-wall/hive1
-wall/hive2
-wall/hive3
-floor/hive0 FLOOR_HIVE
-floor/hive1
-floor/hive2
-floor/hive3
-
-wall/ice0 WALL_ICE
-wall/ice1
-wall/ice2
-wall/ice3
-floor/ice0 FLOOR_ICE
-floor/ice1
-floor/ice2
-floor/ice3
-
-wall/lair0 WALL_LAIR
-wall/lair1
-wall/lair2
-wall/lair3
-floor/lair0 FLOOR_LAIR
-floor/lair1
-floor/lair2
-floor/lair3
-
-## orcs don't have their own floor or walls yet...
-wall/lair0 WALL_ORC
-wall/lair1
-wall/lair2
-wall/lair3
-floor/hive0 FLOOR_ORC
-floor/hive1
-floor/hive2
-floor/hive3
-
-wall/slime0 WALL_SLIME
-wall/slime1
-wall/slime2
-wall/slime3
-floor/bog_green0 FLOOR_SLIME
-floor/bog_green1
-floor/bog_green2
-floor/bog_green3
-
-wall/snake0 WALL_SNAKE
-wall/snake1
-wall/snake2
-wall/snake3
-floor/snake0 FLOOR_SNAKE
-floor/snake1
-floor/snake2
-floor/snake3
-
-## swamp also doesn't have any unique walls...
-wall/lair0 WALL_SWAMP
-wall/lair1
-wall/lair2
-wall/lair3
-floor/swamp0 FLOOR_SWAMP
-floor/swamp1
-floor/swamp2
-floor/swamp3
-
-wall/tomb0 WALL_TOMB
-wall/tomb1
-wall/tomb2
-wall/tomb3
-floor/tomb0 FLOOR_TOMB
-floor/tomb1
-floor/tomb2
-floor/tomb3
-
-wall/undead0 WALL_UNDEAD
-wall/undead1
-wall/undead2
-wall/undead3
-floor/tomb0 FLOOR_UNDEAD
-floor/tomb1
-floor/tomb2
-floor/tomb3
-
-wall/vault0 WALL_VAULT
-wall/vault1
-wall/vault2
-wall/vault3
-floor/rect_gray0 FLOOR_VAULT
-floor/rect_gray1
-floor/rect_gray2
-floor/rect_gray3
-
-wall/zot_blue0 WALL_ZOT_BLUE
-wall/zot_blue1
-wall/zot_blue2
-wall/zot_blue3
-floor/tomb0 FLOOR_ZOT_BLUE
-floor/tomb1
-floor/tomb2
-floor/tomb3
-
-wall/zot_cyan0 WALL_ZOT_CYAN
-wall/zot_cyan1
-wall/zot_cyan2
-wall/zot_cyan3
-floor/tomb0 FLOOR_ZOT_CYAN
-floor/tomb1
-floor/tomb2
-floor/tomb3
-
-wall/zot_gray0 WALL_ZOT_GRAY
-wall/zot_gray1
-wall/zot_gray2
-wall/zot_gray3
-floor/tomb0 FLOOR_ZOT_GRAY
-floor/tomb1
-floor/tomb2
-floor/tomb3
-
-wall/zot_green0 WALL_ZOT_GREEN
-wall/zot_green1
-wall/zot_green2
-wall/zot_green3
-floor/tomb0 FLOOR_ZOT_GREEN
-floor/tomb1
-floor/tomb2
-floor/tomb3
-
-wall/zot_magenta0 WALL_ZOT_MAGENTA
-wall/zot_magenta1
-wall/zot_magenta2
-wall/zot_magenta3
-floor/tomb0 FLOOR_ZOT_MAGENTA
-floor/tomb1
-floor/tomb2
-floor/tomb3
-
-wall/zot_red0 WALL_ZOT_RED
-wall/zot_red1
-wall/zot_red2
-wall/zot_red3
-floor/tomb0 FLOOR_ZOT_RED
-floor/tomb1
-floor/tomb2
-floor/tomb3
-
-wall/zot_yellow0 WALL_ZOT_YELLOW
-wall/zot_yellow1
-wall/zot_yellow2
-wall/zot_yellow3
-floor/tomb0 FLOOR_ZOT_YELLOW
-floor/tomb1
-floor/tomb2
-floor/tomb3
-
-wall/wall_flesh0 WALL_FLESH
-wall/wall_flesh1
-wall/wall_flesh2
-wall/wall_flesh3
-wall/wall_flesh4
-wall/wall_flesh5
-wall/wall_flesh6
-
-floor/floor_nerves0 FLOOR_NERVES
-floor/floor_nerves1
-floor/floor_nerves2
-floor/floor_nerves3
-floor/floor_nerves4
-floor/floor_nerves5
-floor/floor_nerves6
-
-wall/wall_vines0 WALL_VINES
-wall/wall_vines1
-wall/wall_vines2
-wall/wall_vines3
-wall/wall_vines4
-wall/wall_vines5
-wall/wall_vines6
-
-floor/floor_vines0 FLOOR_VINES
-floor/floor_vines1
-floor/floor_vines2
-floor/floor_vines3
-floor/floor_vines4
-floor/floor_vines5
-floor/floor_vines6
-
-wall/pebble_red0 WALL_PEBBLE_RED
-wall/pebble_red1
-wall/pebble_red2
-wall/pebble_red3
-
-floor/rough_red0 FLOOR_ROUGH_RED
-floor/rough_red1
-floor/rough_red2
-floor/rough_red3
-
-floor/floor_sand_stone0 FLOOR_SAND_STONE
-floor/floor_sand_stone1
-floor/floor_sand_stone2
-floor/floor_sand_stone3
-floor/floor_sand_stone4
-floor/floor_sand_stone5
-floor/floor_sand_stone6
-floor/floor_sand_stone7
-
-wall/wall_yellow_rock0 WALL_YELLOW_ROCK
-wall/wall_yellow_rock1
-wall/wall_yellow_rock2
-wall/wall_yellow_rock3
-
-wall/brick_gray0 WALL_BAZAAR_GRAY
-wall/brick_gray1
-wall/brick_gray2
-wall/brick_gray3
-
-wall/stone_gray0 WALL_BAZAAR_STONE
-wall/stone_gray1
-wall/stone_gray2
-wall/stone_gray3
-
-floor/grass0 FLOOR_BAZAAR_GRASS
-floor/grass1
-floor/grass2
-
-floor/grass_n FLOOR_BAZAAR_GRASS1_SPECIAL
-floor/grass_ne
-floor/grass_e
-floor/grass_se
-floor/grass_s
-floor/grass_sw
-floor/grass_w
-floor/grass_nw
-floor/grass_full
-
-%start
-%compose floor/grass0
-%compose floor/pedestal_n
-%finish FLOOR_BAZAAR_GRASS2_SPECIAL
-%start
-%compose floor/grass1
-%compose floor/pedestal_ne
-%finish
-%start
-%compose floor/grass2
-%compose floor/pedestal_e
-%finish
-%start
-%compose floor/grass1
-%compose floor/pedestal_se
-%finish
-%start
-%compose floor/grass0
-%compose floor/pedestal_s
-%finish
-%start
-%compose floor/grass1
-%compose floor/pedestal_sw
-%finish
-%start
-%compose floor/grass2
-%compose floor/pedestal_w
-%finish
-%start
-%compose floor/grass0
-%compose floor/pedestal_nw
-%finish
-floor/pedestal_full
-
-%start
-%compose floor/rect_gray0
-%compose floor/pedestal_n
-%finish FLOOR_BAZAAR_VAULT_SPECIAL
-%start
-%compose floor/rect_gray1
-%compose floor/pedestal_ne
-%finish
-%start
-%compose floor/rect_gray2
-%compose floor/pedestal_e
-%finish
-%start
-%compose floor/rect_gray3
-%compose floor/pedestal_se
-%finish
-%start
-%compose floor/rect_gray2
-%compose floor/pedestal_s
-%finish
-%start
-%compose floor/rect_gray1
-%compose floor/pedestal_sw
-%finish
-%start
-%compose floor/rect_gray0
-%compose floor/pedestal_w
-%finish
-%start
-%compose floor/rect_gray3
-%compose floor/pedestal_nw
-%finish
-floor/pedestal_full
-
-floor/dirt0 FLOOR_BAZAAR_DIRT
-floor/dirt1
-floor/dirt2
-
-floor/dirt_n FLOOR_BAZAAR_DIRT_SPECIAL
-floor/dirt_ne
-floor/dirt_e
-floor/dirt_se
-floor/dirt_s
-floor/dirt_sw
-floor/dirt_w
-floor/dirt_nw
-floor/dirt_full
-
+%enumprefix DNGN_ +%tiledef tiledef-dngn.h +%tilecount tilecount-dngn.h +%width 16 +%back none +%name dngn + +%sdir dc-dngn + +dngn_unseen DNGN_UNSEEN + + +wall/brick_brown0 WALL_NORMAL +wall/brick_brown1 +wall/brick_brown2 +wall/brick_brown3 +floor/pebble_gray0 FLOOR_NORMAL +floor/pebble_gray1 +floor/pebble_gray2 +floor/pebble_gray3 +floor/pebble_gray4 + +wall/relief0 WALL_HALL +wall/relief1 +wall/relief2 +wall/relief3 +floor/mesh0 FLOOR_HALL +floor/mesh1 +floor/mesh2 +floor/mesh3 + +wall/hive0 WALL_HIVE +wall/hive1 +wall/hive2 +wall/hive3 +floor/hive0 FLOOR_HIVE +floor/hive1 +floor/hive2 +floor/hive3 + +wall/ice0 WALL_ICE +wall/ice1 +wall/ice2 +wall/ice3 +floor/ice0 FLOOR_ICE +floor/ice1 +floor/ice2 +floor/ice3 + +wall/lair0 WALL_LAIR +wall/lair1 +wall/lair2 +wall/lair3 +floor/lair0 FLOOR_LAIR +floor/lair1 +floor/lair2 +floor/lair3 + +## orcs don't have their own floor or walls yet... +wall/lair0 WALL_ORC +wall/lair1 +wall/lair2 +wall/lair3 +floor/hive0 FLOOR_ORC +floor/hive1 +floor/hive2 +floor/hive3 + +wall/slime0 WALL_SLIME +wall/slime1 +wall/slime2 +wall/slime3 +floor/bog_green0 FLOOR_SLIME +floor/bog_green1 +floor/bog_green2 +floor/bog_green3 + +wall/snake0 WALL_SNAKE +wall/snake1 +wall/snake2 +wall/snake3 +floor/snake0 FLOOR_SNAKE +floor/snake1 +floor/snake2 +floor/snake3 + +## swamp also doesn't have any unique walls... +wall/lair0 WALL_SWAMP +wall/lair1 +wall/lair2 +wall/lair3 +floor/swamp0 FLOOR_SWAMP +floor/swamp1 +floor/swamp2 +floor/swamp3 + +wall/tomb0 WALL_TOMB +wall/tomb1 +wall/tomb2 +wall/tomb3 +floor/tomb0 FLOOR_TOMB +floor/tomb1 +floor/tomb2 +floor/tomb3 + +wall/vault0 WALL_VAULT +wall/vault1 +wall/vault2 +wall/vault3 +floor/rect_gray0 FLOOR_VAULT +floor/rect_gray1 +floor/rect_gray2 +floor/rect_gray3 + +wall/zot_blue0 WALL_ZOT_BLUE +wall/zot_blue1 +wall/zot_blue2 +wall/zot_blue3 + +wall/zot_cyan0 WALL_ZOT_CYAN +wall/zot_cyan1 +wall/zot_cyan2 +wall/zot_cyan3 + +wall/zot_gray0 WALL_ZOT_GRAY +wall/zot_gray1 +wall/zot_gray2 +wall/zot_gray3 + +wall/zot_green0 WALL_ZOT_GREEN +wall/zot_green1 +wall/zot_green2 +wall/zot_green3 + +wall/zot_magenta0 WALL_ZOT_MAGENTA +wall/zot_magenta1 +wall/zot_magenta2 +wall/zot_magenta3 + +wall/zot_red0 WALL_ZOT_RED +wall/zot_red1 +wall/zot_red2 +wall/zot_red3 + +wall/zot_yellow0 WALL_ZOT_YELLOW +wall/zot_yellow1 +wall/zot_yellow2 +wall/zot_yellow3 + +wall/wall_flesh0 WALL_FLESH +wall/wall_flesh1 +wall/wall_flesh2 +wall/wall_flesh3 +wall/wall_flesh4 +wall/wall_flesh5 +wall/wall_flesh6 + +wall/wall_vines0 WALL_VINES +wall/wall_vines1 +wall/wall_vines2 +wall/wall_vines3 +wall/wall_vines4 +wall/wall_vines5 +wall/wall_vines6 + +floor/floor_vines0 FLOOR_VINES +floor/floor_vines1 +floor/floor_vines2 +floor/floor_vines3 +floor/floor_vines4 +floor/floor_vines5 +floor/floor_vines6 + +wall/pebble_red0 WALL_PEBBLE_RED +wall/pebble_red1 +wall/pebble_red2 +wall/pebble_red3 + +floor/rough_red0 FLOOR_ROUGH_RED +floor/rough_red1 +floor/rough_red2 +floor/rough_red3 + +floor/floor_sand_stone0 FLOOR_SAND_STONE +floor/floor_sand_stone1 +floor/floor_sand_stone2 +floor/floor_sand_stone3 +floor/floor_sand_stone4 +floor/floor_sand_stone5 +floor/floor_sand_stone6 +floor/floor_sand_stone7 + +wall/wall_yellow_rock0 WALL_YELLOW_ROCK +wall/wall_yellow_rock1 +wall/wall_yellow_rock2 +wall/wall_yellow_rock3 + +wall/brick_gray0 WALL_BAZAAR_GRAY +wall/brick_gray1 +wall/brick_gray2 +wall/brick_gray3 + +wall/stone_gray0 WALL_BAZAAR_STONE +wall/stone_gray1 +wall/stone_gray2 +wall/stone_gray3 + +floor/grass0 FLOOR_BAZAAR_GRASS +floor/grass1 +floor/grass2 + +floor/grass_n FLOOR_BAZAAR_GRASS1_SPECIAL +floor/grass_ne +floor/grass_e +floor/grass_se +floor/grass_s +floor/grass_sw +floor/grass_w +floor/grass_nw +floor/grass_full + +## NOTE: wall_undead and floor_nerves are used for the corruption effect. +## They need to go last. +wall/undead0 WALL_UNDEAD +wall/undead1 +wall/undead2 +wall/undead3 + +floor/floor_nerves0 FLOOR_NERVES +floor/floor_nerves1 +floor/floor_nerves2 +floor/floor_nerves3 +floor/floor_nerves4 +floor/floor_nerves5 +floor/floor_nerves6 + +%start +%compose floor/grass0 +%compose floor/pedestal_n +%finish FLOOR_BAZAAR_GRASS2_SPECIAL +%start +%compose floor/grass1 +%compose floor/pedestal_ne +%finish +%start +%compose floor/grass2 +%compose floor/pedestal_e +%finish +%start +%compose floor/grass1 +%compose floor/pedestal_se +%finish +%start +%compose floor/grass0 +%compose floor/pedestal_s +%finish +%start +%compose floor/grass1 +%compose floor/pedestal_sw +%finish +%start +%compose floor/grass2 +%compose floor/pedestal_w +%finish +%start +%compose floor/grass0 +%compose floor/pedestal_nw +%finish +floor/pedestal_full + +%start +%compose floor/rect_gray0 +%compose floor/pedestal_n +%finish FLOOR_BAZAAR_VAULT_SPECIAL +%start +%compose floor/rect_gray1 +%compose floor/pedestal_ne +%finish +%start +%compose floor/rect_gray2 +%compose floor/pedestal_e +%finish +%start +%compose floor/rect_gray3 +%compose floor/pedestal_se +%finish +%start +%compose floor/rect_gray2 +%compose floor/pedestal_s +%finish +%start +%compose floor/rect_gray1 +%compose floor/pedestal_sw +%finish +%start +%compose floor/rect_gray0 +%compose floor/pedestal_w +%finish +%start +%compose floor/rect_gray3 +%compose floor/pedestal_nw +%finish +floor/pedestal_full + +floor/dirt0 FLOOR_BAZAAR_DIRT +floor/dirt1 +floor/dirt2 + +floor/dirt_n FLOOR_BAZAAR_DIRT_SPECIAL +floor/dirt_ne +floor/dirt_e +floor/dirt_se +floor/dirt_s +floor/dirt_sw +floor/dirt_w +floor/dirt_nw +floor/dirt_full + +floor/lava0 DNGN_LAVA +floor/lava1 +floor/lava2 +floor/lava3 +dngn_deep_water DNGN_DEEP_WATER +dngn_deep_water +dngn_deep_water +dngn_deep_water +dngn_shallow_water DNGN_SHALLOW_WATER +dngn_shallow_water +dngn_shallow_water +dngn_shallow_water + +wall/stone2_gray0 DNGN_STONE_WALL +wall/stone2_gray1 +wall/stone2_gray2 +wall/stone2_gray3 +dngn_metal_wall DNGN_METAL_WALL +dngn_green_crystal_wall DNGN_GREEN_CRYSTAL_WALL + +dngn_wax_wall DNGN_WAX_WALL +dngn_transparent_wall DNGN_TRANSPARENT_WALL + +dngn_closed_door DNGN_CLOSED_DOOR +gate_closed_left DNGN_GATE_CLOSED_LEFT +gate_closed_middle DNGN_GATE_CLOSED_MIDDLE +gate_closed_right DNGN_GATE_CLOSED_RIGHT +dngn_open_door DNGN_OPEN_DOOR +gate_open_left DNGN_GATE_OPEN_LEFT +gate_open_middle DNGN_GATE_OPEN_MIDDLE +gate_open_right DNGN_GATE_OPEN_RIGHT +dngn_orcish_idol DNGN_ORCISH_IDOL +dngn_silver_statue DNGN_SILVER_STATUE +dngn_granite_statue DNGN_GRANITE_STATUE + +%rim 1 +dngn_enter_hell DNGN_ENTER_HELL +%rim 0 +dngn_branch_stairs DNGN_BRANCH_STAIRS +dngn_trap_dart DNGN_TRAP_DART +dngn_trap_arrow DNGN_TRAP_ARROW +dngn_trap_spear DNGN_TRAP_SPEAR +dngn_trap_axe DNGN_TRAP_AXE +dngn_trap_teleport DNGN_TRAP_TELEPORT +dngn_trap_alarm DNGN_TRAP_ALARM +dngn_trap_blade DNGN_TRAP_BLADE +dngn_trap_bolt DNGN_TRAP_BOLT +dngn_trap_net DNGN_TRAP_NET +dngn_trap_zot DNGN_TRAP_ZOT +dngn_trap_needle DNGN_TRAP_NEEDLE +dngn_trap_shaft DNGN_TRAP_SHAFT +stone_stairs_down DNGN_STONE_STAIRS_DOWN +rock_stairs_down DNGN_ROCK_STAIRS_DOWN +stone_stairs_up DNGN_STONE_STAIRS_UP +rock_stairs_up DNGN_ROCK_STAIRS_UP + +dngn_enter_shop DNGN_ENTER_SHOP +dngn_enter_labyrinth DNGN_ENTER_LABYRINTH +dngn_enter_dis DNGN_ENTER_DIS +dngn_enter_gehenna DNGN_ENTER_GEHENNA +dngn_enter_cocytus DNGN_ENTER_COCYTUS +dngn_enter_tartarus DNGN_ENTER_TARTARUS + +dngn_enter_abyss DNGN_ENTER_ABYSS +dngn_exit DNGN_EXIT_ABYSS + +dngn_stone_arch DNGN_STONE_ARCH +dngn_enter_pandemonium DNGN_ENTER_PANDEMONIUM +dngn_exit DNGN_EXIT_PANDEMONIUM +%rim 1 +dngn_transit_pandemonium DNGN_TRANSIT_PANDEMONIUM +%rim 0 +dngn_enter DNGN_ENTER +%rim 1 +dngn_return DNGN_RETURN +%rim 0 +dngn_altar_zin DNGN_ALTAR_ZIN +dngn_altar_shining_one DNGN_ALTAR_SHINING_ONE +dngn_altar_kikubaaqudgha DNGN_ALTAR_KIKUBAAQUDGHA +dngn_altar_yredelemnul DNGN_ALTAR_YREDELEMNUL +dngn_altar_xom DNGN_ALTAR_XOM +dngn_altar_vehumet DNGN_ALTAR_VEHUMET +dngn_altar_okawaru DNGN_ALTAR_OKAWARU +dngn_altar_makhleb DNGN_ALTAR_MAKHLEB +dngn_altar_sif_muna DNGN_ALTAR_SIF_MUNA +dngn_altar_trog DNGN_ALTAR_TROG +dngn_altar_nemelex_xobeh DNGN_ALTAR_NEMELEX_XOBEH +dngn_altar_elyvilon DNGN_ALTAR_ELYVILON +dngn_altar_lugonu DNGN_ALTAR_LUGONU +dngn_altar_beogh DNGN_ALTAR_BEOGH +dngn_blue_fountain DNGN_BLUE_FOUNTAIN +dngn_sparkling_fountain DNGN_SPARKLING_FOUNTAIN +dngn_blood_fountain DNGN_BLOOD_FOUNTAIN +dngn_dry_fountain DNGN_DRY_FOUNTAIN + +## Miscellaneous entries that get drawn on the background +dc-misc/blood_red BLOOD +dc-misc/blood_red1 +dc-misc/blood_red2 +dc-misc/blood_red3 +dc-misc/blood_red4 +dc-misc/halo HALO +dc-misc/ray RAY_MESH +dc-misc/travel_exclusion TRAVEL_EXCLUSION_BG +dc-misc/travel_exclusion_centre TRAVEL_EXCLUSION_CENTRE_BG +dc-misc/slot ITEM_SLOT +effect/sanctuary SANCTUARY diff --git a/crawl-ref/source/rltiles/license.txt b/crawl-ref/source/rltiles/license.txt index 7b9526fccf..3c350d53f7 100644 --- a/crawl-ref/source/rltiles/license.txt +++ b/crawl-ref/source/rltiles/license.txt @@ -1,17 +1,11 @@ Part of the graphic tiles used in this program are from the public -domain roguelike tileset "RLTiles". - -Some of the tiles have been modified by Enne Walker (enne.walker@gmail.com) +domain roguelike tileset "RLTiles". Some of the tiles have been modified. You can find the original tileset at: http://rltiles.sf.net - - Part of the source code used in this program is from the public -domain program "RLTiles". - -Some of the source code has been modified by Enne Walker (enne.walker@gmail.com) +domain program "RLTiles". Some of the source code has been modified. You can find the original source code at: http://sourceforge.net/projects/rltiles/ diff --git a/crawl-ref/source/rltiles/makefile.mgw b/crawl-ref/source/rltiles/makefile.mgw index 040110d4e7..a0e1cfb9f8 100644 --- a/crawl-ref/source/rltiles/makefile.mgw +++ b/crawl-ref/source/rltiles/makefile.mgw @@ -32,8 +32,8 @@ HEADERS = \ tiledef.h \ tiledef-p.h \ tilep-cmt.h \ -tiledef-w2d.h \ -tilecount-w2d.h \ +tiledef-dngn.h \ +tilecount-dngn.h \ map.htm ALLTOOLS = $(TOOLS) $(EXTRATOOLS) @@ -41,7 +41,7 @@ ALLTOOLS = $(TOOLS) $(EXTRATOOLS) GENERATEDBMP = \ tile.bmp \ player.bmp \ -wall2d.bmp +dngn.bmp TILEBMP = \ $(GENERATEDBMP) \ @@ -57,7 +57,7 @@ all: tools tiles tools: $(TOOLS) -tiles: $(TILEBMP) +tiles: $(TILEBMP) $(TILEPNG) ########################################################################## # Tools @@ -96,15 +96,15 @@ tile.bmp: dc-2d.txt dctile.exe player.bmp: dc-pl.txt dcpl.exe ./dcpl dc-pl.txt -wall2d.bmp: dc-wall2d.txt dctile.exe - ./dctile dc-wall2d.txt +dngn.bmp: dngn.txt dctile.exe + ./dctile dngn.txt ########################################################################## # PNG Conversion # $(B2PTOOL): - pushd $(B2PSRC) && $(MAKE) -f makefile.mgw $(B2P) && popd + pushd $(B2PSRC) && $(MAKE) -f makefile.lin $(B2P) && popd %.png: %.bmp $(B2PTOOL) $(DELETE) $@ diff --git a/crawl-ref/source/rltiles/makefile.unix b/crawl-ref/source/rltiles/makefile.unix index 1fb2efe23e..33d3a6b6e2 100644 --- a/crawl-ref/source/rltiles/makefile.unix +++ b/crawl-ref/source/rltiles/makefile.unix @@ -31,8 +31,8 @@ HEADERS = \ tiledef.h \ tiledef-p.h \ tilep-cmt.h \ -tiledef-w2d.h \ -tilecount-w2d.h \ +tiledef-dngn.h \ +tilecount-dngn.h \ map.htm ALLTOOLS = $(TOOLS) $(EXTRATOOLS) @@ -40,7 +40,7 @@ ALLTOOLS = $(TOOLS) $(EXTRATOOLS) GENERATEDBMP = \ tile.bmp \ player.bmp \ -wall2d.bmp +dngn.bmp TILEBMP = \ $(GENERATEDBMP) \ @@ -90,6 +90,9 @@ dcreverse: $(SRC)dcreverse.o $(SRC)bm.o # and then output the .bmp and .txt dependencies for it. It's kind # of a low priority though, as tiles will be rebuilt infrequently. +dngn.bmp: dngn.txt dctile + ./dctile dngn.txt + tile.bmp: dc-2d.txt dctile ./dctile dc-2d.txt diff --git a/crawl-ref/source/rltiles/tool/dctile.c b/crawl-ref/source/rltiles/tool/dctile.c index 4bc2c0af9e..a6e01210b4 100644 --- a/crawl-ref/source/rltiles/tool/dctile.c +++ b/crawl-ref/source/rltiles/tool/dctile.c @@ -12,7 +12,7 @@ FILE *cfp=NULL; // lengths of tile counts int tilecount = 0; int tilecountidx = -1; int counts[1024]; -int countnames[100][100]; +int countnames[512][100]; char outname[1024], ctgname[100], subsname[100]; char sdir[300]; @@ -379,7 +379,6 @@ void process_config(char *fname) } fprintf(cfp,"/* Automatically generated by tile generator. */\n"); fprintf(cfp,"#include \"%s\"\n", tiledefname); - fprintf(cfp, "enum TILE_%sCOUNT_IDX {\n", enumprefix); continue; } @@ -553,8 +552,7 @@ void process_config(char *fname) tilecountidx++; else counts[tilecountidx++] = tilecount; - fprintf(cfp, " IDX_%s,\n",st); - sprintf(countnames[tilecountidx], "TILE_%s", st); + sprintf(countnames[tilecountidx], "%s", st); tilecount = 1; } } @@ -603,13 +601,6 @@ char *argv[]; strcpy(fn,argv[1]); process_config(fn); - if (sfp) - { - fprintf(sfp, "TILE_%sTOTAL};\n\n", enumprefix); - fprintf(sfp,"#define TILE_%sPER_ROW %d\n", enumprefix, xx0); - fclose(sfp); - } - if(mfp) { fprintf(mfp,"</map>\n<img src=%s usemap=\"#nhmap\" >\n", imgname); @@ -617,14 +608,28 @@ char *argv[]; fclose(mfp); } + if (sfp) + { + fprintf(sfp, "TILE_%sTOTAL};\n\n", enumprefix); + fprintf(sfp,"#define TILE_%sPER_ROW %d\n", enumprefix, xx0); + } + if (cfp) { int i; - fprintf(cfp, " IDX_%sTOTAL\n};\n\n", enumprefix); - counts[tilecountidx++] = tilecount; + fprintf(sfp, "\n\n"); + fprintf(sfp, "enum TILE_%sCOUNT_IDX {\n", enumprefix); + for (i = 0; i < tilecountidx; i++) + { + fprintf(sfp, " IDX_%s,\n", countnames[i]); + } + fprintf(sfp, " IDX_%sTOTAL\n};\n\n", enumprefix); + fprintf(sfp, "extern int tile_%scount[IDX_%sTOTAL];\n", enumprefix, enumprefix); + fprintf(sfp, "extern int tile_%sstart[IDX_%sTOTAL];\n\n", enumprefix, enumprefix); + fprintf(cfp, "int tile_%scount[IDX_%sTOTAL] =\n{\n", enumprefix, enumprefix); @@ -641,7 +646,7 @@ char *argv[]; for (i = 0; i < tilecountidx; i++) { - fprintf(cfp, (i < tilecountidx - 1) ? " %s,\n" : " %s\n", + fprintf(cfp, (i < tilecountidx - 1) ? " TILE_%s,\n" : " TILE_%s\n", countnames[i]); } @@ -649,6 +654,11 @@ char *argv[]; close(cfp); } + if (sfp) + { + fclose(sfp); + } + if(tfp) { fclose(tfp); |