From e76403f9df6fe458c6a12f5dfd98d99112372f72 Mon Sep 17 00:00:00 2001 From: Shimi9999 Date: Fri, 6 Sep 2019 11:12:50 +0900 Subject: [PATCH] Add randomselectbar option --- src/bms/player/beatoraja/skin/SkinProperty.java | 1 + .../skin/property/BooleanPropertyFactory.java | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/bms/player/beatoraja/skin/SkinProperty.java b/src/bms/player/beatoraja/skin/SkinProperty.java index c0778cd31..7d343c071 100644 --- a/src/bms/player/beatoraja/skin/SkinProperty.java +++ b/src/bms/player/beatoraja/skin/SkinProperty.java @@ -472,6 +472,7 @@ public class SkinProperty { public static final int OPTION_GRADEBAR_LN = 1015; public static final int OPTION_GRADEBAR_CN = 1016; public static final int OPTION_GRADEBAR_HCN = 1017; + public static final int OPTION_RANDOMSELECTBAR = 1030; public static final int OPTION_PLAYABLEBAR = 5; diff --git a/src/bms/player/beatoraja/skin/property/BooleanPropertyFactory.java b/src/bms/player/beatoraja/skin/property/BooleanPropertyFactory.java index f794540fb..b27b968d9 100644 --- a/src/bms/player/beatoraja/skin/property/BooleanPropertyFactory.java +++ b/src/bms/player/beatoraja/skin/property/BooleanPropertyFactory.java @@ -27,11 +27,7 @@ import bms.player.beatoraja.result.CourseResult; import bms.player.beatoraja.result.MusicResult; import bms.player.beatoraja.select.MusicSelector; -import bms.player.beatoraja.select.bar.Bar; -import bms.player.beatoraja.select.bar.DirectoryBar; -import bms.player.beatoraja.select.bar.GradeBar; -import bms.player.beatoraja.select.bar.SelectableBar; -import bms.player.beatoraja.select.bar.SongBar; +import bms.player.beatoraja.select.bar.*; import bms.player.beatoraja.skin.SkinObject; import bms.player.beatoraja.song.SongData; @@ -483,13 +479,17 @@ public boolean get(MainState state) { case OPTION_GRADEBAR: return new DrawProperty(DrawProperty.TYPE_NO_STATIC, (state) -> ((state instanceof MusicSelector) ? ((MusicSelector) state).getSelectedBar() instanceof GradeBar : false)); + case OPTION_RANDOMSELECTBAR: + return new DrawProperty(DrawProperty.TYPE_NO_STATIC, + (state) -> ((state instanceof MusicSelector) ? ((MusicSelector) state).getSelectedBar() instanceof ExecutableBar : false)); case OPTION_PLAYABLEBAR: return new DrawProperty(DrawProperty.TYPE_NO_STATIC, (state) -> { if(state instanceof MusicSelector) { Bar selected = ((MusicSelector) state).getSelectedBar(); return ((selected instanceof SongBar) && ((SongBar)selected).getSongData().getPath() != null) || - ((selected instanceof GradeBar) && ((GradeBar)selected).existsAllSongs()); + ((selected instanceof GradeBar) && ((GradeBar)selected).existsAllSongs()) || + (selected instanceof ExecutableBar); } return false; });