projects/hypixel-stats
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated bedwars progress

Browse Source
This commit is contained in:
Taken
2025-08-31 20:50:31 +02:00
parent 0729b1f8f6
commit 6834210999
3 changed files with 79 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/(stats)/player/[ign]/_stats/bedwars/bedwars.tsx
View File

@@ -45,11 +45,12 @@ export default function BedwarsStats({ stats }: { stats: NonNullStats["Bedwars"]
const bbl = (stats.beds_broken_bedwars / stats.beds_lost_bedwars).toFixed(2)
const level = getBWLevelForExp(stats.Experience)
const percent = getProgress(
getTotalExpForLevel(level),
stats.Experience,
getTotalExpForLevel(level + 1)
)
const current = getTotalExpForLevel(level)
const next = getTotalExpForLevel(level + 1)
const percent = getProgress(current, stats.Experience, next)
const xpProgress = stats.Experience - current
const ceilingXp = next - current
return (
<Card>
@@ -93,7 +94,7 @@ export default function BedwarsStats({ stats }: { stats: NonNullStats["Bedwars"]
</div>
<CollapsibleContent>
<Separator className="my-4" />
<BedwarsProgress level={level} percent={percent} />
<BedwarsProgress level={level} percent={percent} currentXp={xpProgress} ceilingXp={ceilingXp} />
<BedwarsGeneralStats statsChecked={stats} level={level} percent={percent} bbl={bbl} kd={kd} fkd={fkd} wl={wl} />
<Separator className="my-4" />
<BedwarsStatTable stats={stats} />

22
src/app/(stats)/player/[ign]/_stats/bedwars/components.tsx
View File

@@ -1,3 +1,4 @@
import { formatNumber } from "@/lib/formatters"
import { bedwarsLevelColors, getBedwarsStar, getPrestigeName, getTextColor } from "@/lib/hypixel/bedwars/bedwars"
import { getBWLevelForExp } from "@/lib/hypixel/bedwars/level"
import { cn } from "@/lib/utils"
@@ -13,11 +14,16 @@ export function BedwarsLevel({ xp }: { xp: number }) {
return <Multicolored val={val} color={color} />
}
export function BedwarsProgress({ level, percent }: { level: number, percent: number }) {
export function BedwarsProgress({ level, percent, currentXp, ceilingXp }: { level: number, percent: number, currentXp: number, ceilingXp: number }) {
return (
<div className="flex items-center mb-10">
<LevelNumber level={level} className="mr-2" />
<Progress level={level} percent={percent} />
<Progress
level={level}
percent={percent}
tooltipId="bedwars-progress"
tooltipContent={`${formatNumber(currentXp)}/${formatNumber(ceilingXp)} XP`}
/>
<LevelNumber level={level + 1} className="ml-2" />
</div>
)
@@ -48,7 +54,7 @@ export function BedWarsPrestige({ level }: { level: number }) {
function LevelNumber({ level, className }: { level: number, className?: string }) {
if (level >= 1000 && level < 1100) {
return (
<div
<p
className={className}
style={{
backgroundImage: "linear-gradient(to left,#a0a,#f5f,#5ff,#5f5,#ff5,#fa0,#f55)",
@@ -57,17 +63,17 @@ function LevelNumber({ level, className }: { level: number, className?: string }
}}
>
{level}
</div>
</p>
)
}
return <div className={cn(`text-mc-${getTextColor(level)}`, className)}>{level}</div>
return <p className={cn(`text-mc-${getTextColor(level)}`, className)}>{level}</p>
}
function Progress({ level, percent }: { level: number, percent: number }) {
function Progress({ level, percent, tooltipId, tooltipContent }: { level: number, percent: number, tooltipId: string, tooltipContent: string }) {
if (level >= 1000 && level < 1100) {
return <GenericProgress percent={percent} rainbow={true} />
return <GenericProgress percent={percent} rainbow={true} tooltipId={tooltipId} tooltipContent={tooltipContent} />
}
return <GenericProgress percent={percent} className={`bg-mc-${getTextColor(level)}`} />
return <GenericProgress percent={percent} className={`bg-mc-${getTextColor(level)}`} tooltipId={tooltipId} tooltipContent={tooltipContent} />
}