From bf5829b4a598e25180b1776216eeac85d750b79d Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Tue, 12 Aug 2014 20:10:39 +0200 Subject: Webtiles: Colour AC and weapon red when corroded (#8836). --- crawl-ref/source/webserver/game_data/static/player.js | 17 ++++++++++++++--- crawl-ref/source/webserver/game_data/static/style.css | 3 +++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/crawl-ref/source/webserver/game_data/static/player.js b/crawl-ref/source/webserver/game_data/static/player.js index 7f817adfa2..7a8fa848fd 100644 --- a/crawl-ref/source/webserver/game_data/static/player.js +++ b/crawl-ref/source/webserver/game_data/static/player.js @@ -115,18 +115,27 @@ function ($, comm, enums, map_knowledge, messages, options) { var item = player.inv[index]; var elem = $(""); elem.text(index_to_letter(index) + ") " + item.name); - if (item.col != -1) + if (item.col != -1 && item.col != null) elem.addClass("fg" + item.col); return elem; } function wielded_weapon() { + var elem; var wielded = player.equip[enums.equip.WEAPON]; if (wielded == -1) - return "-) " + player.unarmed_attack; + { + elem = $(""); + elem.text("-) " + player.unarmed_attack); + } else - return inventory_item_desc(wielded); + elem = inventory_item_desc(wielded); + + if (player.has_status("corroded equipment")) + elem.addClass("corroded_weapon"); + + return elem; } function quiver() @@ -177,6 +186,8 @@ function ($, comm, enums, map_knowledge, messages, options) { elem.addClass("degenerated_defense"); else if (player.has_status(defense_boosters[type])) elem.addClass("boosted_defense"); + else if (type == "ac" && player.has_status("corroded equipment")) + elem.addClass("degenerated_defense"); else if (type == "sh" && player.god == "Qazlal" && player.piety_rank > 0) elem.addClass("boosted_defense"); diff --git a/crawl-ref/source/webserver/game_data/static/style.css b/crawl-ref/source/webserver/game_data/static/style.css index 34c31b8ec2..a609cf7951 100644 --- a/crawl-ref/source/webserver/game_data/static/style.css +++ b/crawl-ref/source/webserver/game_data/static/style.css @@ -79,6 +79,9 @@ body { .boosted_defense { color: #729fcf; /* lightblue */ } +#stats_weapon .corroded_weapon { + color: #a40000; /* red */ +} .bar span { display: inline-block; -- cgit v1.2.3-54-g00ecf