Attached Files |
colorstr.png [^] (10,337 bytes) 2013-02-16 03:27
0001-Make-sure-WebTiles-HP-MP-bars-don-t-overflow.patch [^] (1,506 bytes) 2013-03-17 19:37 [Show Content] [Hide Content]From f25cf0b93cbc2ac3458735df24002cbafc80ffaf Mon Sep 17 00:00:00 2001
From: Pekka Lampila <pekka.lampila@iki.fi>
Date: Sun, 17 Mar 2013 20:33:07 +0200
Subject: [PATCH] Make sure WebTiles HP/MP bars don't overflow
Also set the percentage width with two decimal places, instead of zero,
to be a bit more accurate.
---
crawl-ref/source/webserver/game_data/static/player.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/crawl-ref/source/webserver/game_data/static/player.js b/crawl-ref/source/webserver/game_data/static/player.js
index f263847..47aded1 100644
--- a/crawl-ref/source/webserver/game_data/static/player.js
+++ b/crawl-ref/source/webserver/game_data/static/player.js
@@ -20,8 +20,10 @@ function ($, comm, enums, map_knowledge, messages) {
value = 0;
player["old_" + name] = value;
var increase = old_value < value;
- var full_bar = (100 * (increase ? old_value : value) / max).toFixed(0);
- var change_bar = (100 * Math.abs(old_value - value) / max).toFixed(0);
+ var full_bar = (100 * (increase ? old_value : value) / max).toFixed(2);
+ var change_bar = (100 * Math.abs(old_value - value) / max).toFixed(2);
+ if (full_bar + change_bar > 100)
+ change_bar = 100 - full_bar;
$("#stats_" + name + "_bar_full").css("width", full_bar + "%");
$("#stats_" + name + "_bar_" + (increase ? "increase" : "decrease"))
.css("width", change_bar + "%");
--
1.7.10.4
0001-Really-fix-WebTiles-HP-MP-bar-overflow.patch [^] (1,755 bytes) 2013-03-22 09:20 [Show Content] [Hide Content]From ed61c27f97caaabb4a98e11ff2106f3a42f8b270 Mon Sep 17 00:00:00 2001
From: Pekka Lampila <pekka.lampila@iki.fi>
Date: Fri, 22 Mar 2013 10:18:07 +0200
Subject: [PATCH] Really fix WebTiles HP/MP bar overflow
---
crawl-ref/source/webserver/game_data/static/player.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/crawl-ref/source/webserver/game_data/static/player.js b/crawl-ref/source/webserver/game_data/static/player.js
index 4f91b5a..43ffc05 100644
--- a/crawl-ref/source/webserver/game_data/static/player.js
+++ b/crawl-ref/source/webserver/game_data/static/player.js
@@ -31,13 +31,13 @@ function ($, comm, enums, map_knowledge, messages) {
old_value = max;
player["old_" + name] = value;
var increase = old_value < value;
- var full_bar = (100 * (increase ? old_value : value) / max).toFixed(2);
- var change_bar = (100 * Math.abs(old_value - value) / max).toFixed(2);
- if (full_bar + change_bar > 100)
- change_bar = 100 - full_bar;
- $("#stats_" + name + "_bar_full").css("width", full_bar + "%");
+ var full_bar = Math.round(10000 * (increase ? old_value : value) / max);
+ var change_bar = Math.round(10000 * Math.abs(old_value - value) / max);
+ if (full_bar + change_bar > 10000)
+ change_bar = 10000 - full_bar;
+ $("#stats_" + name + "_bar_full").css("width", (full_bar / 100) + "%");
$("#stats_" + name + "_bar_" + (increase ? "increase" : "decrease"))
- .css("width", change_bar + "%");
+ .css("width", (change_bar / 100) + "%");
$("#stats_" + name + "_bar_" + (increase ? "decrease" : "increase"))
.css("width", 0);
}
--
1.7.10.4
|