From d9fd16ee029ec3907835c08397367a35a795d0b5 Mon Sep 17 00:00:00 2001 From: hellmonk Date: Tue, 14 Mar 2017 21:20:24 -0500 Subject: [PATCH] fix + test some bugs --- crawl-ref/source/dat/des/arrival/small.des | 34 ------------------- .../webserver/game_data/static/player.js | 6 ++-- 2 files changed, 4 insertions(+), 36 deletions(-) diff --git a/crawl-ref/source/dat/des/arrival/small.des b/crawl-ref/source/dat/des/arrival/small.des index d1f92e47984..cd048835966 100644 --- a/crawl-ref/source/dat/des/arrival/small.des +++ b/crawl-ref/source/dat/des/arrival/small.des @@ -2648,40 +2648,6 @@ wcccccccwcWtWcwcccccccw wwwwwwwwwcccccwwwwwwwww ENDMAP -############################################################## -# A small-room arrival with wooden doors and big ring of trees and rocks. -NAME: saegor_arrival_under_anarchy -TAGS: arrival no_trap_gen no_monster_gen -ORIENT: float -NSUBST: @ = 3:@ / *:X -SUBST: X = tc w:1 -COLOUR: # = lightgreen / green / yellow:1 -NSUBST: p = 2:+ / *:c -COLOUR: + : brown -SUBST: # = .. 1:1 -MONS: plant -KPROP: w = no_tele_into -NSUBST: { = 1:{ / *:. -MAP - xxx @@@ xxx - XXXX@.@XXXX - @@XXX.X.XXX@@ -xX@...........@Xx -xXX...........XXx -xXX..ccpppcc..XXx -xXX..c#####c..XXx -@X...p##{##p...X@ -@.X..p#####p..X.@ -@X...p#{#{#p...X@ -xXX..c#####c..XXx -xXX..ccpppcc..XXx -xXX...........XXx -xX@...........@Xx - @@XXX.X.XXX@@ - XXXX@.@XXXX - xxx @@@ xxx -ENDMAP - ############################################################## # Moated graveyard arrival (oiseaux) NAME: moated_graveyard_arrival diff --git a/crawl-ref/source/webserver/game_data/static/player.js b/crawl-ref/source/webserver/game_data/static/player.js index 368c423bbba..b7dc67f25ed 100644 --- a/crawl-ref/source/webserver/game_data/static/player.js +++ b/crawl-ref/source/webserver/game_data/static/player.js @@ -353,12 +353,14 @@ function ($, comm, enums, map_knowledge, messages, options) { $("#stats_titleline").text(player.name + " " + player.title); if (player.wizard) $("#stats_wizmode").text("WIZARD"); + else if (player.diff == -1) + $("#stats_wizmode").text("CASUAL"); else if (player.diff == 0) - $("#stats_wizmode").text("CASUAL"); + $("#stats_wizmode").text("NORMAL"); else if (player.diff == 1) $("#stats_wizmode").text("NORMAL"); else - $("#stats_wizmode").text(""); + $("#stats_wizmode").text("Casual"); var do_temperature = false; var do_contam = false;