fix(Granblue Fantasy): remove largeImageText & fix getting boss hp (#…

…9140)
PreMiD · Jan 10, 2025 · e3740b3 · e3740b3
1 parent 997c8b6
commit e3740b3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 36 deletions.
diff --git a/websites/G/Granblue Fantasy/metadata.json b/websites/G/Granblue Fantasy/metadata.json
@@ -22,7 +22,7 @@
 		"vi_VN": "Trò chơi đóng vai Nhật Bản"
 	},
 	"url": "game.granbluefantasy.jp",
-	"version": "1.5.2",
+	"version": "1.5.3",
 	"logo": "https://cdn.rcd.gg/PreMiD/websites/G/Granblue%20Fantasy/assets/logo.png",
 	"thumbnail": "https://cdn.rcd.gg/PreMiD/websites/G/Granblue%20Fantasy/assets/thumbnail.jpg",
 	"color": "#2F4F7A",
@@ -55,12 +55,6 @@
 			"icon": "fas fa-image",
 			"value": false
 		},
-		{
-			"id": "profile",
-			"title": "Show profile detaiils",
-			"icon": "fad fa-user",
-			"value": false
-		},
 		{
 			"id": "button",
 			"title": "Show profile button",

diff --git a/websites/G/Granblue Fantasy/presence.ts b/websites/G/Granblue Fantasy/presence.ts
@@ -110,14 +110,12 @@ presence.on("UpdateData", async () => {
 			largeImageKey:
 				"https://cdn.rcd.gg/PreMiD/websites/G/Granblue%20Fantasy/assets/logo.png",
 			startTimestamp: browsingTimestamp,
-			largeImageText: "Granblue Fantasy",
 		},
 		{ href } = document.location,
-		[health, turn, djeeta, profile, button] = await Promise.all([
+		[health, turn, djeeta, button] = await Promise.all([
 			presence.getSetting<number>("health"),
 			presence.getSetting<number>("turn"),
 			presence.getSetting<boolean>("djeeta"),
-			presence.getSetting<boolean>("profile"),
 			presence.getSetting<boolean>("button"),
 		]);
 	let userData = await presence.getPageVariable<UserData>(
@@ -171,17 +169,15 @@ presence.on("UpdateData", async () => {
 				"Starting battle...";
 		}
 
-		if (health === 0) {
-			presenceData.state = `At ${
-				document.querySelectorAll(".btn-enemy-gauge.prt-enemy-percent.alive")[0]
-					.textContent
-			}`;
-		} else if (health === 1 && boss) {
-			const hp = parseInt(boss.hp);
-			presenceData.state = `${hp.toLocaleString()} [${(
-				(hp * 100) /
-				parseInt(boss.hpmax)
-			).toFixed(2)}%]`;
+		if (boss) {
+			const hp = parseInt(boss.hp),
+				percentage = (hp * 100) / parseInt(boss.hpmax);
+			if (health === 0) presenceData.state = `At ${Math.ceil(percentage)}%`;
+			else if (health === 1) {
+				presenceData.state = `${hp.toLocaleString()} [${percentage.toFixed(
+					2
+				)}%]`;
+			}
 		}
 
 		if (turn && gameStatus?.turn) {
@@ -195,9 +191,6 @@ presence.on("UpdateData", async () => {
 				presenceData.smallImageKey = ElementIcons[charaAlive.attr];
 				presenceData.smallImageText = ElementsNames[charaAlive.attr];
 				presenceData.largeImageKey = `${userData.imgUri}/sp/assets/leader/raid_normal/${charaAlive.pid}.jpg`;
-				presenceData.largeImageText = `${charaAlive.name} | ${
-					charaAlive.hp
-				} [${((charaAlive.hp * 100) / charaAlive.hpmax).toFixed(2)}%]`;
 			}
 		}
 	} else if (href.includes("/#party/index/0/npc/0"))
@@ -338,18 +331,13 @@ presence.on("UpdateData", async () => {
 	else if (href.includes("#frontier/alchemy"))
 		presenceData.details = "In Alchemy Lab";
 
-	if (userData?.userId) {
-		if (profile && presenceData.largeImageText === "Granblue Fantasy")
-			presenceData.largeImageText = `UID: ${userData.userId} | Rank ${userData.userRank}`;
-
-		if (button) {
-			presenceData.buttons = [
-				{
-					label: "Profile",
-					url: `${userData.baseUri}/#profile/${userData.userId}`,
-				},
-			];
-		}
+	if (userData?.userId && button) {
+		presenceData.buttons = [
+			{
+				label: "Profile",
+				url: `${userData.baseUri}/#profile/${userData.userId}`,
+			},
+		];
 	}
 
 	presence.setActivity(presenceData);