Fixing draco, "tried", and shadow tiles issues caused by previous check-in. Adding transparency to a number of tiles.

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

27 files changed, 13 insertions, 7 deletions

diff --git a/crawl-ref/source/rltiles/dc-misc.txt b/crawl-ref/source/rltiles/dc-misc.txt
index 714c65bf68..0972fdc71e 100644
--- a/crawl-ref/source/rltiles/dc-misc.txt
+++ b/crawl-ref/source/rltiles/dc-misc.txt
@@ -79,6 +79,7 @@ num6 NUM6
 num7 NUM7

 num8 NUM8

 num9 NUM9

+tried TRIED

 

 slot_eq ITEM_SLOT_EQUIP

 slot_cursed ITEM_SLOT_CURSED

diff --git a/crawl-ref/source/rltiles/dc-misc/halo.png b/crawl-ref/source/rltiles/dc-misc/halo.png
index 70d29a31e6..291b1c5ae9 100644
--- a/crawl-ref/source/rltiles/dc-misc/halo.png
+++ b/crawl-ref/source/rltiles/dc-misc/halo.png
diff --git a/crawl-ref/source/rltiles/dc-misc/mask_deep_water.png b/crawl-ref/source/rltiles/dc-misc/mask_deep_water.png
index 9ab688c69c..80c6065976 100644
--- a/crawl-ref/source/rltiles/dc-misc/mask_deep_water.png
+++ b/crawl-ref/source/rltiles/dc-misc/mask_deep_water.png
diff --git a/crawl-ref/source/rltiles/dc-misc/mask_lava.png b/crawl-ref/source/rltiles/dc-misc/mask_lava.png
index f3b602cd48..3c988908f8 100644
--- a/crawl-ref/source/rltiles/dc-misc/mask_lava.png
+++ b/crawl-ref/source/rltiles/dc-misc/mask_lava.png
diff --git a/crawl-ref/source/rltiles/dc-misc/mask_shallow_water.png b/crawl-ref/source/rltiles/dc-misc/mask_shallow_water.png
index cca3fd4b90..d10ee4d41e 100644
--- a/crawl-ref/source/rltiles/dc-misc/mask_shallow_water.png
+++ b/crawl-ref/source/rltiles/dc-misc/mask_shallow_water.png
diff --git a/crawl-ref/source/rltiles/dc-misc/tried.png b/crawl-ref/source/rltiles/dc-misc/tried.png
new file mode 100644
index 0000000000..97fea0fd86
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-misc/tried.png
diff --git a/crawl-ref/source/rltiles/effect/cloud_black_smoke.png b/crawl-ref/source/rltiles/effect/cloud_black_smoke.png
index 92eefd7abf..4f8532c546 100644
--- a/crawl-ref/source/rltiles/effect/cloud_black_smoke.png
+++ b/crawl-ref/source/rltiles/effect/cloud_black_smoke.png
diff --git a/crawl-ref/source/rltiles/effect/cloud_blue_smoke.png b/crawl-ref/source/rltiles/effect/cloud_blue_smoke.png
index 8bc750653d..3c7dd74389 100644
--- a/crawl-ref/source/rltiles/effect/cloud_blue_smoke.png
+++ b/crawl-ref/source/rltiles/effect/cloud_blue_smoke.png
diff --git a/crawl-ref/source/rltiles/effect/cloud_cold0.png b/crawl-ref/source/rltiles/effect/cloud_cold0.png
index 84c00bc53a..892ac11847 100644
--- a/crawl-ref/source/rltiles/effect/cloud_cold0.png
+++ b/crawl-ref/source/rltiles/effect/cloud_cold0.png
diff --git a/crawl-ref/source/rltiles/effect/cloud_cold1.png b/crawl-ref/source/rltiles/effect/cloud_cold1.png
index ca1f9a3095..e8cb95547e 100644
--- a/crawl-ref/source/rltiles/effect/cloud_cold1.png
+++ b/crawl-ref/source/rltiles/effect/cloud_cold1.png
diff --git a/crawl-ref/source/rltiles/effect/cloud_cold2.png b/crawl-ref/source/rltiles/effect/cloud_cold2.png
index 3cfdcb8a10..a19d680f88 100644
--- a/crawl-ref/source/rltiles/effect/cloud_cold2.png
+++ b/crawl-ref/source/rltiles/effect/cloud_cold2.png
diff --git a/crawl-ref/source/rltiles/effect/cloud_fire0.png b/crawl-ref/source/rltiles/effect/cloud_fire0.png
index a1df6184dc..ddcf8d74bf 100644
--- a/crawl-ref/source/rltiles/effect/cloud_fire0.png
+++ b/crawl-ref/source/rltiles/effect/cloud_fire0.png
diff --git a/crawl-ref/source/rltiles/effect/cloud_fire1.png b/crawl-ref/source/rltiles/effect/cloud_fire1.png
index 05de62638d..94f50e1d1b 100644
--- a/crawl-ref/source/rltiles/effect/cloud_fire1.png
+++ b/crawl-ref/source/rltiles/effect/cloud_fire1.png
diff --git a/crawl-ref/source/rltiles/effect/cloud_fire2.png b/crawl-ref/source/rltiles/effect/cloud_fire2.png
index 18e489ce72..2be74bc03f 100644
--- a/crawl-ref/source/rltiles/effect/cloud_fire2.png
+++ b/crawl-ref/source/rltiles/effect/cloud_fire2.png
diff --git a/crawl-ref/source/rltiles/effect/cloud_grey_smoke.png b/crawl-ref/source/rltiles/effect/cloud_grey_smoke.png
index b41a9c9879..4a5e1a910f 100644
--- a/crawl-ref/source/rltiles/effect/cloud_grey_smoke.png
+++ b/crawl-ref/source/rltiles/effect/cloud_grey_smoke.png
diff --git a/crawl-ref/source/rltiles/effect/cloud_miasma.png b/crawl-ref/source/rltiles/effect/cloud_miasma.png
index 92eefd7abf..684bd67839 100644
--- a/crawl-ref/source/rltiles/effect/cloud_miasma.png
+++ b/crawl-ref/source/rltiles/effect/cloud_miasma.png
diff --git a/crawl-ref/source/rltiles/effect/cloud_poison0.png b/crawl-ref/source/rltiles/effect/cloud_poison0.png
index 499000cabe..7bd4a466cd 100644
--- a/crawl-ref/source/rltiles/effect/cloud_poison0.png
+++ b/crawl-ref/source/rltiles/effect/cloud_poison0.png
diff --git a/crawl-ref/source/rltiles/effect/cloud_poison1.png b/crawl-ref/source/rltiles/effect/cloud_poison1.png
index d75348c7d9..d9649a6c49 100644
--- a/crawl-ref/source/rltiles/effect/cloud_poison1.png
+++ b/crawl-ref/source/rltiles/effect/cloud_poison1.png
diff --git a/crawl-ref/source/rltiles/effect/cloud_poison2.png b/crawl-ref/source/rltiles/effect/cloud_poison2.png
index 28098f3fcd..d022ea55ae 100644
--- a/crawl-ref/source/rltiles/effect/cloud_poison2.png
+++ b/crawl-ref/source/rltiles/effect/cloud_poison2.png
diff --git a/crawl-ref/source/rltiles/effect/cloud_purp_smoke.png b/crawl-ref/source/rltiles/effect/cloud_purp_smoke.png
index c6b6b40237..010d01b022 100644
--- a/crawl-ref/source/rltiles/effect/cloud_purp_smoke.png
+++ b/crawl-ref/source/rltiles/effect/cloud_purp_smoke.png
diff --git a/crawl-ref/source/rltiles/effect/sanctuary.png b/crawl-ref/source/rltiles/effect/sanctuary.png
index 380bc3bc95..bcf2a443c7 100644
--- a/crawl-ref/source/rltiles/effect/sanctuary.png
+++ b/crawl-ref/source/rltiles/effect/sanctuary.png
diff --git a/crawl-ref/source/rltiles/item/weapon/blessed_blade.png b/crawl-ref/source/rltiles/item/weapon/blessed_blade.png
index 6e427ed715..c751ef133e 100644
--- a/crawl-ref/source/rltiles/item/weapon/blessed_blade.png
+++ b/crawl-ref/source/rltiles/item/weapon/blessed_blade.png
diff --git a/crawl-ref/source/rltiles/item/weapon/urand_brilliance.png b/crawl-ref/source/rltiles/item/weapon/urand_brilliance.png
index 484a1d45e6..e8747fe78a 100644
--- a/crawl-ref/source/rltiles/item/weapon/urand_brilliance.png
+++ b/crawl-ref/source/rltiles/item/weapon/urand_brilliance.png
diff --git a/crawl-ref/source/rltiles/player/halo/halo_player.png b/crawl-ref/source/rltiles/player/halo/halo_player.png
index 234de68eaf..3992253584 100644
--- a/crawl-ref/source/rltiles/player/halo/halo_player.png
+++ b/crawl-ref/source/rltiles/player/halo/halo_player.png
diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc
index 2f69cffb06..3de5276d92 100644
--- a/crawl-ref/source/tile2.cc
+++ b/crawl-ref/source/tile2.cc
@@ -409,7 +409,7 @@ static void _load_doll_data(const char *fn, dolls_data *dolls, int max,
             tilep_race_default(you.species, coinflip() ? 1 : 0,
                                you.experience_level, dolls[i].parts);
 
-            dolls[i].parts[TILEP_PART_SHADOW] = 1;
+            dolls[i].parts[TILEP_PART_SHADOW] = TILEP_SHADOW_SHADOW;
             dolls[i].parts[TILEP_PART_CLOAK]  = TILEP_SHOW_EQUIP;
             dolls[i].parts[TILEP_PART_BOOTS]  = TILEP_SHOW_EQUIP;
             dolls[i].parts[TILEP_PART_LEG]    = TILEP_SHOW_EQUIP;
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index e25acdda7d..695281c990 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -2602,7 +2602,10 @@ void tilep_race_default(int race, int gender, int level, int *parts)
         case SP_PALE_DRACONIAN:
             hair = 0;
             if (player_mutation_level(MUT_BIG_WINGS))
-                parts[TILEP_PART_DRCWING] = 1 + draconian_color(race, level);
+            {
+                int st = tile_player_part_start[TILEP_PART_DRCWING];
+                parts[TILEP_PART_DRCWING] = st + draconian_color(race, level);
+            }
 
             result = TILEP_BASE_DRACONIAN + draconian_color(race, level)*2;
             break;
@@ -2652,7 +2655,7 @@ void tilep_race_default(int race, int gender, int level, int *parts)
     parts[TILEP_PART_BASE]   = result;
     parts[TILEP_PART_HAIR]   = hair;
     parts[TILEP_PART_BEARD]  = beard;
-    parts[TILEP_PART_SHADOW] = 1;
+    parts[TILEP_PART_SHADOW] = TILEP_SHADOW_SHADOW;
 }
 
 void tilep_job_default(int job, int gender, int *parts)
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index 8334104929..972856f93d 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -512,10 +512,12 @@ void DungeonRegion::draw_draco(int colour, int mon_idx, int equ_tile, unsigned i
     for (int i = 0; i < TILEP_PART_MAX; i++)
          doll.parts[i] = 0;
 
-    doll.parts[TILEP_PART_SHADOW] = 1;
+    doll.parts[TILEP_PART_SHADOW] = TILEP_SHADOW_SHADOW;
     doll.parts[TILEP_PART_BASE] = TILEP_BASE_DRACONIAN + colour * 2;
-    doll.parts[TILEP_PART_DRCWING] = 1 + colour;
-    doll.parts[TILEP_PART_DRCHEAD] = 1 + colour;
+    doll.parts[TILEP_PART_DRCWING] = tile_player_part_start[TILEP_PART_DRCWING] 
+                                     + colour;
+    doll.parts[TILEP_PART_DRCHEAD] = tile_player_part_start[TILEP_PART_DRCHEAD]
+                                     + colour;
 
     switch (mon_idx)
     {
@@ -1360,7 +1362,7 @@ void InventoryRegion::pack_verts()
 
 
             if (item.flag & TILEI_FLAG_TRIED)
-                add_quad_char('?', x, y, 0, TILE_Y / 2);
+                add_quad(TEX_DEFAULT, TILE_TRIED, x, y, 0, TILE_Y / 2, false);
         }
     }
 }