Merge pull request #42 from hizumiaoba/release/v3.0.1

Release v3.0.1
hizumiaoba · Jan 6, 2022 · 208801e · 208801e
2 parents 66d3268 + 9f81249
commit 208801e
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 8 deletions.
diff --git a/generated/albumCycle.json b/generated/albumCycle.json
@@ -1,5 +1,5 @@
 {
-  "type" : "ALBUM C",
-  "daysLeft" : 1,
-  "dateDefinited" : "2021/12/11"
+  "type" : "ALBUM B",
+  "daysLeft" : 3,
+  "dateDefinited" : "2022/01/06"
 }
diff --git a/generated/database.json b/generated/database.json
@@ -14594,5 +14594,54 @@
     "level" : 29,
     "notes" : 887,
     "albumType" : "ALBUM B"
+  }, {
+    "attribute" : "全タイプ",
+    "name" : "ココカラミライヘ！",
+    "difficulty" : "DEBUT",
+    "level" : 7,
+    "notes" : 111,
+    "albumType" : "Not-Implemented"
+  }, {
+    "attribute" : "全タイプ",
+    "name" : "ココカラミライヘ！",
+    "difficulty" : "REGULAR",
+    "level" : 13,
+    "notes" : 172,
+    "albumType" : "Not-Implemented"
+  }, {
+    "attribute" : "全タイプ",
+    "name" : "ココカラミライヘ！",
+    "difficulty" : "PRO",
+    "level" : 18,
+    "notes" : 361,
+    "albumType" : "Not-Implemented"
+  }, {
+    "attribute" : "全タイプ",
+    "name" : "ココカラミライヘ！",
+    "difficulty" : "MASTER",
+    "level" : 26,
+    "notes" : 563,
+    "albumType" : "Not-Implemented"
+  }, {
+    "attribute" : "全タイプ",
+    "name" : "ココカラミライヘ！",
+    "difficulty" : "MASTER+",
+    "level" : 30,
+    "notes" : 843,
+    "albumType" : "Not-implemented"
+  }, {
+    "attribute" : "全タイプ",
+    "name" : "ココカラミライヘ！",
+    "difficulty" : "PIANO",
+    "level" : 26,
+    "notes" : 563,
+    "albumType" : "Not-Implemented"
+  }, {
+    "attribute" : "全タイプ",
+    "name" : "ココカラミライヘ！",
+    "difficulty" : "FORTE",
+    "level" : 32,
+    "notes" : 924,
+    "albumType" : "Not-Implemented"
   } ]
 }
diff --git a/src/com/ranfa/lib/EstimateAlbumTypeCycle.java b/src/com/ranfa/lib/EstimateAlbumTypeCycle.java
@@ -105,7 +105,7 @@ public static String getCurrentCycle() {
 	}
 
 	private static String cycling(String currentType, int times) {
-		int cyclingDelta = (times / 14) % 3;
+		int cyclingDelta = ((times / 14) + 1) % 3;
 		String[] typeArray = {
 				ALBUM_A,
 				ALBUM_B,

diff --git a/src/com/ranfa/main/DelesteRandomSelector.java b/src/com/ranfa/main/DelesteRandomSelector.java
@@ -43,7 +43,7 @@
 import com.ranfa.lib.TwitterIntegration;
 import com.ranfa.lib.Version;
 
-@Version(major = 3, minor = 0, patch = 0)
+@Version(major = 3, minor = 0, patch = 1)
 public class DelesteRandomSelector extends JFrame {
 
 	private static ArrayList<Song> selectedSongsList = new ArrayList<>();
@@ -171,8 +171,8 @@ public DelesteRandomSelector() {
 		this.setTitle(this.easter.getTodaysBirth());
 		this.logger.debug("Version: {}", CheckVersion.getVersion());
 		this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		// this.setBounds(100, 100, this.property.getWindowWidth(), this.property.getWindowHeight());
-		this.setBounds(100, 100, 640, 360);
+		this.setBounds(100, 100, this.property.getWindowWidth(), this.property.getWindowHeight());
+		// this.setBounds(100, 100, 640, 360);
 		this.contentPane = new JPanel();
 		this.contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
 		this.setContentPane(this.contentPane);

diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
 		"major": 3,
 		"minor": 0,
-		"patch": 0
+		"patch": 1
 }