implements skin property (score points for 5key and 9key , draw flag …

…for result)
exch-bms2 · May 9, 2017 · 0e46886 · 0e46886
1 parent f834fa0
commit 0e46886
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 4 deletions.
diff --git a/src/bms/player/beatoraja/IRScoreData.java b/src/bms/player/beatoraja/IRScoreData.java
@@ -1,5 +1,7 @@
 package bms.player.beatoraja;
 
+import bms.model.Mode;
+
 /**
  * スコアデータ
  * LR2のスコアデータを元に拡張している
@@ -91,6 +93,16 @@ public class IRScoreData {
 	private int state;
 
 	private String scorehash = "";
+
+	private final Mode playmode;
+
+	public IRScoreData() {
+		this(Mode.BEAT_7K);
+	}
+
+	public IRScoreData(Mode playmode) {
+		this.playmode = playmode;
+	}
 
 	public long getDate() {
 		return date;
@@ -302,4 +314,8 @@ public int getDevice() {
 	public void setDevice(int device) {
 		this.device = device;
 	}
+
+	public Mode getPlaymode() {
+		return playmode;
+	}
 }
diff --git a/src/bms/player/beatoraja/ScoreDataProperty.java b/src/bms/player/beatoraja/ScoreDataProperty.java
@@ -37,8 +37,31 @@ public void update(IRScoreData score) {
     public void update(IRScoreData score, int notes) {
         final int exscore = score != null ? score.getExscore() : 0;
         final int totalnotes = score != null ? score.getNotes() : 0;
-        nowpoint = score != null ? (int)((long)150000 * score.getJudgeCount(0) + 100000 * score.getJudgeCount(1) + 20000 * score.getJudgeCount(2))
-        / score.getNotes() + (int)((long)50000 * score.getCombo() / score.getNotes()) : 0;
+        if(score != null) {
+            switch (score.getPlaymode()) {
+                case BEAT_5K:
+                case BEAT_10K:
+                    nowpoint = (int)((long)100000 * score.getJudgeCount(0) + 100000 * score.getJudgeCount(1) + 50000 * score.getJudgeCount(2))
+                            / score.getNotes();
+                    break;
+                case BEAT_7K:
+                case BEAT_14K:
+                    nowpoint = (int)((long)150000 * score.getJudgeCount(0) + 100000 * score.getJudgeCount(1) + 20000 * score.getJudgeCount(2))
+                            / score.getNotes() + (int)((long)50000 * score.getCombo() / score.getNotes());
+                    break;
+                case POPN_5K:
+                case POPN_9K:
+                    nowpoint = (int)((long)100000 * score.getJudgeCount(0) + 70000 * score.getJudgeCount(1) + 40000 * score.getJudgeCount(2))
+                            / score.getNotes();
+                    break;
+                default:
+                    nowpoint = (int)((long)1000000 * score.getJudgeCount(0) + 700000 * score.getJudgeCount(1) + 400000 * score.getJudgeCount(2))
+                            / score.getNotes();
+                    break;
+            }
+        } else {
+            nowpoint = 0;
+        }
         nowscore = exscore;
         rate = totalnotes == 0 ? 1.0f : ((float)exscore) / (totalnotes * 2);
         rateInt = (int)(rate * 100);

diff --git a/src/bms/player/beatoraja/play/BMSPlayer.java b/src/bms/player/beatoraja/play/BMSPlayer.java
@@ -376,7 +376,7 @@ public void render() {
 				judge.init(model, resource);
 				notes = 0;
 				starttimeoffset = (property.starttime > 1000 ? property.starttime - 1000 : 0) * 100 / property.freq;
-				playtime = (property.endtime + 1000) * 100 / property.freq;
+				playtime = (property.endtime + 1000) * 100 / property.freq + TIME_MARGIN;
 				bga.prepare(this);
 				state = STATE_READY;
                 timer[TIMER_READY] = now;

diff --git a/src/bms/player/beatoraja/play/JudgeManager.java b/src/bms/player/beatoraja/play/JudgeManager.java
@@ -158,7 +158,7 @@ public void init(BMSModel model, PlayerResource resource) {
 		judge = new int[20];
 		judgenow = new int[((PlaySkin) main.getSkin()).getJudgeregion()];
 		judgecombo = new int[((PlaySkin) main.getSkin()).getJudgeregion()];
-		score = new IRScoreData();
+		score = new IRScoreData(model.getMode());
 		score.setNotes(model.getTotalNotes());
 		score.setSha256(model.getSHA256());
 

diff --git a/src/bms/player/beatoraja/result/GradeResult.java b/src/bms/player/beatoraja/result/GradeResult.java
@@ -305,12 +305,20 @@ public boolean getBooleanValue(int id) {
 				return score.getClear() == GrooveGauge.CLEARTYPE_FAILED;
 			case OPTION_UPDATE_SCORE:
 				return score.getExscore() > oldexscore;
+			case OPTION_DRAW_SCORE:
+				return score.getExscore() == oldexscore;
 			case OPTION_UPDATE_MAXCOMBO:
 				return score.getCombo() > oldcombo;
+			case OPTION_DRAW_MAXCOMBO:
+				return score.getCombo() == oldcombo;
 			case OPTION_UPDATE_MISSCOUNT:
 				return score.getMinbp() < oldmisscount;
+			case OPTION_DRAW_MISSCOUNT:
+				return score.getMinbp() == oldmisscount;
 			case OPTION_UPDATE_SCORERANK:
 				return getScoreDataProperty().getNowRate() > getScoreDataProperty().getBestScoreRate();
+			case OPTION_DRAW_SCORERANK:
+				return getScoreDataProperty().getNowRate() == getScoreDataProperty().getBestScoreRate();
 			case OPTION_NO_REPLAYDATA:
 				return !getMainController().getPlayDataAccessor().existsReplayData(resource.getCourseBMSModels(),
 						resource.getConfig().getLnmode(), 0,resource.getConstraint());

diff --git a/src/bms/player/beatoraja/result/MusicResult.java b/src/bms/player/beatoraja/result/MusicResult.java
@@ -509,12 +509,20 @@ public boolean getBooleanValue(int id) {
 					|| (cscore != null && cscore.getClear() == GrooveGauge.CLEARTYPE_FAILED);
 		case OPTION_UPDATE_SCORE:
 			return score.getExscore() > oldexscore;
+			case OPTION_DRAW_SCORE:
+				return score.getExscore() == oldexscore;
 		case OPTION_UPDATE_MAXCOMBO:
 			return score.getCombo() > oldcombo;
+			case OPTION_DRAW_MAXCOMBO:
+				return score.getCombo() == oldcombo;
 		case OPTION_UPDATE_MISSCOUNT:
 			return score.getMinbp() < oldmisscount;
+			case OPTION_DRAW_MISSCOUNT:
+				return score.getMinbp() == oldmisscount;
 		case OPTION_UPDATE_SCORERANK:
 			return getScoreDataProperty().getNowRate() > getScoreDataProperty().getBestScoreRate();
+			case OPTION_DRAW_SCORERANK:
+				return getScoreDataProperty().getNowRate() == getScoreDataProperty().getBestScoreRate();
 		case OPTION_NO_REPLAYDATA:
 			return !getMainController().getPlayDataAccessor().existsReplayData(resource.getBMSModel(),
 					resource.getConfig().getLnmode(), 0);

diff --git a/src/bms/player/beatoraja/skin/SkinProperty.java b/src/bms/player/beatoraja/skin/SkinProperty.java
@@ -507,11 +507,15 @@ public class SkinProperty {
 	public static final int OPTION_BEST_F_1P = 327;
 
 	public static final int OPTION_UPDATE_SCORE = 330;
+	public static final int OPTION_DRAW_SCORE = 1330;
 	public static final int OPTION_UPDATE_MAXCOMBO = 331;
+	public static final int OPTION_DRAW_MAXCOMBO = 1331;
 	public static final int OPTION_UPDATE_MISSCOUNT = 332;
+	public static final int OPTION_DRAW_MISSCOUNT = 1332;
 	public static final int OPTION_UPDATE_TRIAL = 333;
 	public static final int OPTION_UPDATE_IRRANK = 334;
 	public static final int OPTION_UPDATE_SCORERANK = 335;
+	public static final int OPTION_DRAW_SCORERANK = 1335;
 
 	public static final int OPTION_NOW_AAA_1P = 340;
 	public static final int OPTION_NOW_AA_1P = 341;