diff --git a/NoteSkins/dance/midi-note/Down Tap Explosion Bright.png b/NoteSkins/dance/midi-note/Down Tap Explosion Bright.png index bd54411afb..251b65f913 100644 Binary files a/NoteSkins/dance/midi-note/Down Tap Explosion Bright.png and b/NoteSkins/dance/midi-note/Down Tap Explosion Bright.png differ diff --git a/NoteSkins/dance/midi-note/metrics.ini b/NoteSkins/dance/midi-note/metrics.ini index 943ed2c140..d315c3ab14 100644 --- a/NoteSkins/dance/midi-note/metrics.ini +++ b/NoteSkins/dance/midi-note/metrics.ini @@ -69,8 +69,8 @@ LetGoCommand=blend,'BlendMode_Add'; HeldCommand=blend,'BlendMode_Add';diffuse,1.0,1.0,0.3,0.875;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 [HoldGhostArrow] -HoldingOnCommand=visible,true -HoldingOffCommand=visible,false +HoldingOnCommand=blend,'BlendMode_Add';pulse;effectmagnitude,1,1.125,1;effectperiod,0.05;effectclock,'beatnooffset';visible,true +HoldingOffCommand=blend,'BlendMode_Add';stopeffect;visible,false [ReceptorArrow] W3Command=stoptweening;zoom,0.85;linear,0.12;zoom,1 diff --git a/Themes/_fallback/Scripts/02 StageMods.lua b/Themes/_fallback/Scripts/02 StageMods.lua index c4ddf6b60a..0c552bde5d 100644 --- a/Themes/_fallback/Scripts/02 StageMods.lua +++ b/Themes/_fallback/Scripts/02 StageMods.lua @@ -17,22 +17,32 @@ function SetFail() local sFail = ""; if GetGamePref("DefaultFail") then - sFail = string.format("fail%s", string.lower( GetGamePref("DefaultFail") )); + sFail = string.format("Fail%s", GetGamePref("DefaultFail")); else - sFail = "failoff"; + sFail = "FailOff"; end - sFail = sFail .. ",failimmediate,suddendeath"; - SCREENMAN:SystemMessage( 'NEW FAIL IS: ' .. tostring(sFail) ); - - GAMESTATE:SetSongOptions( "ModsLevel_Song", sFail ); + sFail = tostring(sFail); +-- SCREENMAN:SystemMessage( 'NEW FAIL IS: ' .. tostring(sFail) ); + + for pn in ivalues(GAMESTATE:GetHumanPlayers()) do +-- GAMESTATE:ApplyGameCommand( "stagemod,FailImmediateContinue", pn ); +-- GAMESTATE:GetPlayerState(pn):SetPlayerOptions( "ModsLevel_Song", 'mod,FailImmediateContinue' ); + MESSAGEMAN:Broadcast( "PlayerOptionsChanged", {PlayerNumber = pn} ); + end + +-- GAMESTATE:SetSongOptions( "ModsLevel_Preferred", 'mod,FailImmediateContinue' ); +-- GAMESTATE:SetSongOptions( "ModsLevel_Stage", 'mod,FailImmediateContinue' ); +-- GAMESTATE:SetSongOptions( "ModsLevel_Song",'mod,FailImmediateContinue' ); + GAMESTATE:ApplyGameCommand( "mod," .. sFail); +-- GAMESTATE:ApplyGameCommand( "stagemod,FailImmediateContinue"); MESSAGEMAN:Broadcast( "SongOptionsChanged" ); end function ScreenSelectMusic:setupmusicstagemods() Trace( "setupmusicstagemods" ) local pm = GAMESTATE:GetPlayMode() - + if pm == "PlayMode_Battle" or pm == "PlayMode_Rave" then local so = GAMESTATE:GetDefaultSongOptions(); GAMESTATE:SetSongOptions( "ModsLevel_Stage", so ); @@ -55,8 +65,6 @@ function ScreenSelectMusic:setupmusicstagemods() so = THEME:GetMetric("SongManager","ExtraStageStageModifiers"); end - so = so .. "," .. sFail; - local difficulty = steps:GetDifficulty() local Reverse = PlayerNumber:Reverse() diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 45ef0db6b5..ddeaff7d90 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -2085,7 +2085,7 @@ ForceTimer=true TimerMetricsGroup="MenuTimerNoSound" TimerSeconds=5 # -# ScreenOnCommand=%SetFail() +ScreenBeginCommand=%SetFail # [ScreenOptions] Fallback="ScreenWithMenuElements"