From eaf2fcdfbb2e63c21f376015c36ba72c15006671 Mon Sep 17 00:00:00 2001 From: Matt Rasmus Date: Mon, 8 Jul 2013 13:54:50 -0700 Subject: [PATCH] Keep showing the weapons panel while in the Path screen. --- script/engine.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/script/engine.js b/script/engine.js index eae1761..189454b 100644 --- a/script/engine.js +++ b/script/engine.js @@ -304,12 +304,16 @@ var Engine = { } module.onArrival(diff); - - if(Engine.activeModule == Room) { - $('div#weapons').animate({opacity: 0}, 300); + + if(Engine.activeModule == Room || Engine.activeModule == Path) { + // Don't fade out the weapons if we're switching to a module + // where we're going to keep showing them anyway. + if (module != Room && module != Path) { + $('div#weapons').animate({opacity: 0}, 300); + } } - if(module == Room) { + if(module == Room || module == Path) { $('div#weapons').animate({opacity: 1}, 300); }