From b8f321792917e42d1c32d91f9ee7e4d871adcf9a Mon Sep 17 00:00:00 2001 From: "Ben \"root\" Anderson" Date: Fri, 13 Dec 2013 12:27:48 -0600 Subject: [PATCH] Revert "Hide HoldJudgments in pump mode" This reverts commit df2598393664e9235543c4c5a61117cabf52bf62. Apparently you can't do that in ActorCommands --- Themes/_fallback/metrics.ini | 4 ++-- Themes/default/metrics.ini | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 3304b772ba..1f5de4e06c 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -405,8 +405,8 @@ LabelOnCommand=x,6;y,22.5;shadowlength,1;zoom,0.75;diffusebottomedge,color("0.75 [HoldJudgment] # System Direction -HoldJudgmentLetGoCommand=IsGame("pump") and visible,false or finishtweening;visible,true;shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 -HoldJudgmentHeldCommand=IsGame("pump") and visible,false, or finishtweening;visible,true;shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 +HoldJudgmentLetGoCommand=finishtweening;visible,true;shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 +HoldJudgmentHeldCommand=finishtweening;visible,true;shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 [HelpDisplay] # The help display on the menus, and what it does. diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 5a5eb440f3..1435f2789c 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -63,8 +63,8 @@ ComboLabelOnCommand=x,0;y,23;shadowlength,1;zoom,0.75;align,0,1 MissLabelOnCommand=x,0;y,23;shadowlength,1;zoom,0.75;align,0,1 [HoldJudgment] -HoldJudgmentLetGoCommand=IsGame("Pump") and visible,false or finishtweening;visible,true;shadowlength,0;diffusealpha,1;zoom,1;linear,0.8;zoom,0.75;sleep,0.5;linear,0.1;diffusealpha,0 -HoldJudgmentHeldCommand=IsGame("Pump") and visible,false or finishtweening;visible,true;shadowlength,0;diffusealpha,1;zoom,1;linear,0.3;zoom,0.75;sleep,0.5;linear,0.1;diffusealpha,0 +HoldJudgmentLetGoCommand=finishtweening;visible,true;shadowlength,0;diffusealpha,1;zoom,1;linear,0.8;zoom,0.75;sleep,0.5;linear,0.1;diffusealpha,0 +HoldJudgmentHeldCommand=finishtweening;visible,true;shadowlength,0;diffusealpha,1;zoom,1;linear,0.3;zoom,0.75;sleep,0.5;linear,0.1;diffusealpha,0 [HelpDisplay] TipShowTime=7