Merge branch 'pro'

src/lib/data/banners/events/1.5.json

@@ -17,7 +17,6 @@
 		},
 		{
 			"phase": 2,
-			"pro": true,
 			"banners": {
 				"regularVersion": 1,
 				"character": {
@@ -26,11 +25,7 @@
 				},
 				"lightcone": {
 					"bannerID": ["26-1", "17-2"],
-					"rateup": [
-						"resolution-shines-as-pearls-of-sweat",
-						"the-moles-welcome-you",
-						"only-silence-remains"
-					]
+					"rateup": ["post-op-conversation", "under-the-blue-sky", "the-birth-of-the-self"]
 				}
 			}
 		}

src/lib/data/banners/events/1.6.json

@@ -0,0 +1,35 @@
+{
+	"patch": 1.6,
+	"data": [
+		{
+			"phase": 1,
+			"pro": true,
+			"banners": {
+				"regularVersion": 1,
+				"character": {
+					"bannerID": ["27-1", "9-1"],
+					"rateup": ["xueyi", "march-7th", "tingyun"]
+				},
+				"lightcone": {
+					"bannerID": ["28-1", "19-1"],
+					"rateup": ["day-one-of-my-new-life", "planetary-rendezvous", "a-secret-vow"]
+				}
+			}
+		},
+		{
+			"phase": 2,
+			"pro": true,
+			"banners": {
+				"regularVersion": 1,
+				"character": {
+					"bannerID": ["29-1", "8-1"],
+					"rateup": ["sushang", "natasha", "hook"]
+				},
+				"lightcone": {
+					"bannerID": ["30-1", "20-1"],
+					"rateup": ["only-silence-remains", "perfect-timing", "landaus-choice"]
+				}
+			}
+		}
+	]
+}

src/lib/data/banners/lists.json

@@ -153,6 +153,30 @@
 			"name": "brilliant-fixation",
 			"featured": "an-instance-before-a-gaze",
 			"type": "lightcone-event"
+		},
+		{
+			"id": 27,
+			"name": "floral-triptych",
+			"featured": "ruan-mei",
+			"type": "character-event"
+		},
+		{
+			"id": 28,
+			"name": "brilliant-fixation",
+			"featured": "past-self-in-mirror",
+			"type": "lightcone-event"
+		},
+		{
+			"id": 29,
+			"name": "panta-rhei",
+			"featured": "dr-ratio",
+			"type": "character-event"
+		},
+		{
+			"id": 30,
+			"name": "brilliant-fixation",
+			"featured": "baptism-of-pure-thought",
+			"type": "lightcone-event"
 		}
 	]
 }

src/lib/data/characters.json

@@ -2,16 +2,46 @@
 	"data": [
 		{
 			"pro": true,
+			"name": "xueyi",
+			"rarity": 4,
+			"combat_type": "quantum",
+			"path": "destruction",
+			"release": "1.6-1",
+			"splashartOffset": { "w": 80, "l": 52, "t": 55 },
+			"gachaCardOffset": { "l": 40, "t": 235, "w": 445 }
+		},
+		{
+			"pro": true,
+			"name": "dr-ratio",
+			"rarity": 5,
+			"combat_type": "imaginary",
+			"path": "hunt",
+			"bannerOffset": { "b": -65, "l": 12.5, "w": 120 },
+			"buttonOffset": { "t": -36, "l": 0, "w": 100 },
+			"splashartOffset": { "t": 65, "l": 57.5, "w": 100 },
+			"gachaCardOffset": { "l": 45, "t": 330, "w": 570 }
+		},
+		{
+			"pro": true,
+			"name": "ruan-mei",
+			"rarity": 5,
+			"combat_type": "ice",
+			"path": "harmony",
+			"bannerOffset": { "b": -20, "l": 10.5, "w": 100 },
+			"buttonOffset": { "t": -31.5, "l": -2, "w": 105 },
+			"splashartOffset": { "t": 50, "w": 90, "l": 52 },
+			"gachaCardOffset": { "l": 35, "t": 145, "w": 410 }
+		},
+		{
 			"name": "hanya",
 			"rarity": 4,
 			"combat_type": "physical",
 			"path": "nihility",
-			"release": "1000000.0-2",
+			"release": "1.4-2",
 			"splashartOffset": { "w": 90, "l": 52, "t": 55 },
 			"gachaCardOffset": { "l": 45, "t": 150, "w": 400 }
 		},
 		{
-			"pro": true,
 			"name": "argenti",
 			"rarity": 5,
 			"combat_type": "physical",

src/lib/data/light-cones.json

@@ -2,6 +2,21 @@
 	"data": [
 		{
 			"pro": true,
+			"name": "baptism-of-pure-thought",
+			"rarity": 5,
+			"path": "hunt",
+			"limited": true,
+			"bannerOffset": { "t": -15, "l": 45, "w": 75 }
+		},
+		{
+			"pro": true,
+			"name": "past-self-in-mirror",
+			"rarity": 5,
+			"path": "harmony",
+			"limited": true,
+			"bannerOffset": { "b": -48, "r": -30, "w": 80 }
+		},
+		{
 			"name": "an-instance-before-a-gaze",
 			"rarity": 5,
 			"path": "erudition",

src/lib/data/logs.json

@@ -173,7 +173,6 @@
 		},
 		{
 			"date": "23 Oct 2023",
-			"featured": true,
 			"changes": [
 				"Unlock Content: The 2nd phase of 1.4",
 				"<b>Topaz</b> & <b>Worrisome Blissful</b>",
@@ -182,8 +181,33 @@
 		},
 		{
 			"date": "10 Nov 2023",
-			"featured": true,
 			"changes": ["Unlock Content: The 1st phase of 1.5 - <b>Huohuo & Night of Fright</b>"]
+		},
+		{
+			"date": "14 Nov 2023",
+			"featured": true,
+			"changes": [
+				"Add New Character: <b>Ruan Mei (5★)</b> & <b>Dr. Ratio (5★)</b>",
+				"Add New Character: <b>Xueyi (4★)</b>",
+				"Add New Light Cones: <b>Past Self in Mirror</b> & <b>Baptism of Pure Thought</b>"
+			]
+		},
+		{
+			"date": "10 Nov 2023",
+			"featured": true,
+			"changes": [
+				"Unlock Content: The 2nd phase of 1.5",
+				"- <b>Argenti & An Instance Before a Gaze</b>",
+				"- <b>Silver Wolf & Incessant Rain</b>"
+			]
+		},
+		{
+			"date": "16 Dec 2023",
+			"changes": [
+				"Unlock Content: The 1st phase of v1.6",
+				"- <b>Ruan Mei & Past Self in Mirror</b>",
+				"- <b>Blade & The Unreachable Side</b>"
+			]
 		}
 	]
 }

src/lib/data/tracks.json

@@ -422,12 +422,40 @@
 				{
 					"title": "Aurum Alley: Logistics Planning",
 					"sourceID": "ZkVvJaI3td4"
+				},
+				{
+					"title": "Fyxestroll Garden: Nesting Avians",
+					"sourceID": "iFrOSbJHYYc"
+				},
+				{
+					"title": "Swallowsong Pavilion: Guqin Recording",
+					"sourceID": "Prsq6ALt3ag"
+				},
+				{
+					"title": "Wedding Wine (Vocal)",
+					"sourceID": "iQycrVRCMRo"
+				},
+				{
+					"title": "Wedding Wine (Instrumental)",
+					"sourceID": "EWfSlWa51GA"
+				},
+				{
+					"title": "Dancing Fantasms",
+					"sourceID": "kaQKKcy19is"
 				}
 			]
 		},
 		{
 			"album": "experience-the-paths",
 			"tracks": [
+				{
+					"title": "Argenti - Chivalric Romances",
+					"sourceID": "zL1pursSH8c"
+				},
+				{
+					"title": "Huohuo - Night of Thrills",
+					"sourceID": "_CNpOc2sQFA"
+				},
 				{
 					"title": "Topaz - Expert Tutorial",
 					"sourceID": "HvMrYtLxfuk"
@@ -565,6 +593,22 @@
 					"title": "Intermission (v1.1 Special Program)",
 					"sourceID": "N7dUziUUpKM"
 				},
+				{
+					"title": "Argenti: Knights of Beauty",
+					"sourceID": "yrt7WrwofCw"
+				},
+				{
+					"title": "Argenti: Code of Chivalry",
+					"sourceID": "SktO9pe4Yys"
+				},
+				{
+					"title": "Argenti: A Gentleman's Fantasy",
+					"sourceID": "LoM9t3wcNVg"
+				},
+				{
+					"title": "Cosmic Sacrifice for Love",
+					"sourceID": "yAE7Lc-J39k"
+				},
 				{
 					"title": "Aetherium Wars: Topaz Fight",
 					"sourceID": "43ZNO8zCKPM"

src/lib/data/warp-setup.json

@@ -1,8 +1,8 @@
 {
 	"version": "1.5",
-	"warpPhase": 1,
-	"storageVersion": "1.5-1",
-	"allPatch": [1.0, 1.1, 1.2, 1.3, 1.4, 1.5],
+	"warpPhase": 2,
+	"storageVersion": "1.5-2",
+	"allPatch": [1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6],
 	"initialAmount": {
 		"stellarJade": 8000,
 		"ticketPass": 25,

src/locales/en-US.json

@@ -103,7 +103,9 @@
 		"gentle-eclipse-of-the-moon": "Gentle Eclipse of the Moon",
 		"sunset-clause": "Sunset Clause",
 		"bloom-in-gloom": "Bloom in Gloom",
-		"thorns-of-scented-crown": "Thorns of Scented Crown"
+		"thorns-of-scented-crown": "Thorns of Scented Crown",
+		"floral-triptych": "Floral Triptych",
+		"panta-rhei": "Panta Rhei"
 	},
 	"details": {
 		"heading": "Details",
@@ -283,6 +285,7 @@
 		"out-of-control": "Out of Control",
 		"svah-sanishyu": "Svah Sanishyu",
 		"of-snow-and-ember": "Of Snow and Ember",
+		"experience-the-paths": "Experience the Paths",
 		"more-ost": "More Music and OST",
 		"custom-musics": "Custom Musics",
 		"currentSong": "Current Song",

src/locales/id-ID.json

@@ -103,7 +103,9 @@
 		"gentle-eclipse-of-the-moon": "Kelembutan Gerhana Bulan",
 		"sunset-clause": "Klausul Matahari Terbenam",
 		"bloom-in-gloom": "Titah Penakluk Kejahatan",
-		"thorns-of-scented-crown": "Aroma Mahkota Mawar"
+		"thorns-of-scented-crown": "Aroma Mahkota Mawar",
+		"floral-triptych": "Trilogi Elegansi",
+		"panta-rhei": "Ritme Alam Semesta"
 	},
 	"details": {
 		"heading": "Detail",
@@ -283,6 +285,7 @@
 		"out-of-control": "Out of Control",
 		"svah-sanishyu": "Svah Sanishyu",
 		"of-snow-and-ember": "Of Snow and Ember",
+		"experience-the-paths": "Experience the Paths",
 		"more-ost": "More Music and OST",
 		"custom-musics": "Musik Kustom",
 		"currentSong": "Current Song",

src/locales/items/en-US.json

@@ -1,4 +1,7 @@
 {
+	"xueyi": "Xueyi",
+	"dr-ratio": "Dr. Ratio",
+	"ruan-mei": "Ruan Mei",
 	"hanya": "Hanya",
 	"argenti": "Argenti",
 	"huohuo": "Huohuo",
@@ -36,6 +39,8 @@
 	"herta": "Herta",
 	"qingque": "Qingque",
 	"natasha": "Natasha",
+	"baptism-of-pure-thought": "Baptism of Pure Thought",
+	"past-self-in-mirror": "Past Self in Mirror",
 	"an-instance-before-a-gaze": "An Instance Before a Gaze",
 	"night-of-fright": "Night of Fright",
 	"worrisome-blissful": "Worrisome, Blissful",

src/locales/items/ja-JP.json

@@ -1,4 +1,7 @@
 {
+	"xueyi": "雪衣",
+	"dr-ratio": "Dr.レイシオ",
+	"ruan-mei": "ルアン・メェイ",
 	"hanya": "寒鴉",
 	"argenti": "アルジェンティ",
 	"huohuo": "フォフォ",
@@ -36,6 +39,8 @@
 	"herta": "ヘルタ",
 	"qingque": "青雀",
 	"natasha": "ナターシャ",
+	"baptism-of-pure-thought": "純粋な思惟の洗礼",
+	"past-self-in-mirror": "鏡の中の私",
 	"an-instance-before-a-gaze": "その一刻、目に焼き付けて",
 	"night-of-fright": "驚魂の夜",
 	"worrisome-blissful": "悩んで笑って",

src/locales/ja-JP.json

@@ -102,8 +102,10 @@
 		"foreseen-foreknown-foretold": "窮観妙算",
 		"gentle-eclipse-of-the-moon": "淡く月欠けて",
 		"sunset-clause": "サンセット条項",
-		"bloom-in-gloom": "Bloom in Gloom",
-		"thorns-of-scented-crown": "Thorns of Scented Crown"
+		"bloom-in-gloom": "貞凶の令を承りて",
+		"thorns-of-scented-crown": "荊冠と勲章",
+		"floral-triptych": "疎影三迭",
+		"panta-rhei": "パンタ・レイ"
 	},
 	"details": {
 		"heading": "詳細",
@@ -283,6 +285,7 @@
 		"out-of-control": "制御不能",
 		"svah-sanishyu": "長き生の短き夢",
 		"of-snow-and-ember": "雪は灰燼に融ける",
+		"experience-the-paths": "Experience the Paths",
 		"more-ost": "その他の曲",
 		"custom-musics": "追加曲",
 		"currentSong": "Now Playing",