Add speedrun target

Author: leaftail1880

src/lib/database/scoreboard.ts

@@ -2,8 +2,6 @@ import { Entity, Player, ScoreboardObjective, ScoreNames, world } from '@minecra
 import { expand } from 'lib/extensions/extend'
 import { capitalize } from 'lib/util'
 
-type LushWayGameModes = 'anarchy'
-
 declare module '@minecraft/server' {
   namespace ScoreNames {
     type Stat =
@@ -16,11 +14,11 @@ declare module '@minecraft/server' {
       | 'kills'
       | 'deaths'
 
-    type OnlineTime = `${'total' | LushWayGameModes}OnlineTime`
+    type GameModes = 'anarchy'
 
-    type Date = `${'lastSeen' | 'join'}Date`
+    type OnlineTime = `${'total' | GameModes}OnlineTime`
 
-    type GameModes = 'anarchy'
+    type Date = `${'lastSeen' | 'join'}Date`
 
     type GameModesStat = `${GameModes}${Capitalize<Stat | Date>}`
 
@@ -42,7 +40,6 @@ export const scoreboardDisplayNames: Record<import('@minecraft/server').ScoreNam
   deaths: 'Смертей',
   raid: 'Рейд-блок',
   totalOnlineTime: 'Онлайн всего',
-  anarchyOnlineTime: 'Онлайн на анархии',
   blocksPlaced: 'Блоков поставлено',
   blocksBroken: 'Блоков сломано',
   fireworksLaunched: 'Фейрверков запущено',
@@ -52,6 +49,7 @@ export const scoreboardDisplayNames: Record<import('@minecraft/server').ScoreNam
   joinTimes: 'Всего входов на сервер',
   joinDate: 'Время первого входа',
 
+  anarchyOnlineTime: 'Онлайн на анархии',
   anarchyBlocksPlaced: 'Блоков поставлено',
   anarchyBlocksBroken: 'Блоков сломано',
   anarchyFireworksLaunched: 'Фейрверков запущено',
@@ -79,12 +77,12 @@ const statScores: Record<ScoreNames.Stat, string> = {
   deaths: '',
 }
 
-const scorebaordStatNames = Object.keys(statScores)
+const scoreboardStatNames = Object.keys(statScores)
 export const scoreboardObjectiveNames = {
-  stats: scorebaordStatNames,
-  gameModeStats: scorebaordStatNames
+  stats: scoreboardStatNames,
+  gameModeStats: scoreboardStatNames
     .map(e => `anarchy${capitalize(e)}`)
-    .concat(scorebaordStatNames) as ScoreNames.GameModesStat[],
+    .concat(scoreboardStatNames) as ScoreNames.GameModesStat[],
 }
 
 const untypedDisplayNames: Record<string, string> = scoreboardDisplayNames
@@ -107,6 +105,10 @@ Reflect.defineProperty(Player.prototype, 'scores', {
 })
 
 export class ScoreboardDB {
+  static defineName(id: string, name: string) {
+    untypedDisplayNames[id] = name
+  }
+
   static getOrCreateProxyFor(playerId: string) {
     const scoreboardPlayer = players[playerId]
     if (scoreboardPlayer) {
@@ -141,13 +143,14 @@ export class ScoreboardDB {
     }
   }
 
-  static objectives: Record<string, ScoreboardObjective> = {}
+  private static objectives = new Map<string, ScoreboardObjective>()
 
-  static objective(name: string, displayName = name) {
-    if (this.objectives[name]) return this.objectives[name]
-
-    const objective = (this.objectives[name] =
-      world.scoreboard.getObjective(name) ?? world.scoreboard.addObjective(name, displayName))
+  static objective(id: string, displayName = id) {
+    let objective = this.objectives.get(id)
+    if (!objective) {
+      objective = world.scoreboard.getObjective(id) ?? world.scoreboard.addObjective(id, displayName)
+      this.objectives.set(id, objective)
+    }
 
     return objective
   }
@@ -163,28 +166,16 @@ export class ScoreboardDB {
     this.scoreboard = ScoreboardDB.objective(name, displayName)
   }
 
-  /**
-   * @param {Entity | string} id
-   * @param {number} value
-   */
   set(id: Entity | string, value: number) {
     if (typeof id !== 'string') id = id.id
     this.scoreboard.setScore(id, value)
   }
 
-  /**
-   * @param {Entity | string} id
-   * @param {number} value
-   */
   add(id: Entity | string, value: number) {
     if (typeof id !== 'string') id = id.id
     this.scoreboard.setScore(id, this.get(id) + value)
   }
 
-  /**
-   * @param {Entity | string} id
-   * @returns {number}
-   */
   get(id: Entity | string): number {
     if (typeof id !== 'string') id = id.id
     try {
@@ -193,21 +184,4 @@ export class ScoreboardDB {
       return 0
     }
   }
-
-  reset() {
-    this.scoreboard.getParticipants().forEach(e => this.scoreboard.removeParticipant(e))
-  }
 }
-
-/*
-const objective = new ScoreboardDB('objectiveName', 'display name')
-
-const score = objective.get(player)
-objective.set(player, 1)
-objective.add(player, 1)
-
-objective.nameSet('custom name', 1)
-objective.nameGet('custom name')
-
-objective.reset()
-*/

src/lib/rpg/leaderboard.ts

@@ -1,4 +1,4 @@
-import { Entity, Player, ScoreboardObjective, system, world } from '@minecraft/server'
+import { Entity, Player, ScoreboardObjective, ScoreboardScoreInfo, system, world } from '@minecraft/server'
 import { CustomEntityTypes } from 'lib/assets/custom-entity-types'
 import { t } from 'lib/text'
 import { Vec } from 'lib/vector'
@@ -12,6 +12,9 @@ export interface LeaderboardInfo {
   dimension: DimensionType
 }
 
+const biggest = (a: ScoreboardScoreInfo, b: ScoreboardScoreInfo) => b.score - a.score
+const smallest = (a: ScoreboardScoreInfo, b: ScoreboardScoreInfo) => a.score - b.score
+
 export class Leaderboard {
   static db = table<LeaderboardInfo>('leaderboard')
 
@@ -20,11 +23,12 @@ export class Leaderboard {
   static entityId = CustomEntityTypes.FloatingText
 
   static parseCustomScore(scoreboardId: string, score: number, convertToMetricNumbers = false) {
-    // TODO Localize somehow?
     if (scoreboardId.endsWith('Time')) {
-      return t.time`${score}`
+      return t.timeHHMMSS(score * 2.5)
     } else if (scoreboardId.endsWith('Date')) {
       return new Date(score * 1000).format()
+    } else if (scoreboardId.endsWith('SpeedRun')) {
+      return t.timeHHMMSS(score)
     }
 
     if (convertToMetricNumbers) {
@@ -92,10 +96,13 @@ export class Leaderboard {
   }
 
   updateLeaderboard() {
+    if (!this.entity.isValid) return
+
     type Nullable<T> = T | null
 
     const scoreboard = this.scoreboard
     const dname = scoreboard.displayName
+    const id = this.scoreboard.id
     const name = dname.charAt(0).toUpperCase() + dname.slice(1)
     const style =
       (Leaderboard.styles[this.info.style] as Nullable<ValueOf<typeof Leaderboard.styles>>) ?? Leaderboard.styles.gray
@@ -104,11 +111,9 @@ export class Leaderboard {
     let leaderboard = ``
     for (const [i, scoreInfo] of scoreboard
       .getScores()
-
-      .sort((a, b) => b.score - a.score)
-
-      .filter((_, i) => i < 10)
+      .sort(id.endsWith('SpeedRun') ? smallest : biggest)
       .entries()) {
+      if (i >= 10) continue
       const { pos: t, nick: n, score: s } = style
 
       const name =
@@ -117,10 +122,10 @@ export class Leaderboard {
 
       leaderboard += `§ы§${t}#${i + 1}§r `
       leaderboard += `§${n}${name}§r `
-      leaderboard += `§${s}${Leaderboard.parseCustomScore(this.scoreboard.id, scoreInfo.score, true)}§r\n`
+      leaderboard += `§${s}${Leaderboard.parseCustomScore(id, scoreInfo.score, true)}§r\n`
     }
 
-    if (this.entity.isValid) this.entity.nameTag = `§ы§l§${style.objName}${name}\n§ы§l${filler}§r\n${leaderboard}`
+    this.entity.nameTag = `§ы§l§${style.objName}${name}\n§ы§l${filler}§r\n${leaderboard}`
   }
 }
 
@@ -130,10 +135,8 @@ system.runInterval(
       if (typeof leaderboard === 'undefined') continue
       const info = Leaderboard.all.get(id)
 
-      if (info) {
-        if (info.entity.isValid) {
-          info.updateLeaderboard()
-        }
+      if (info?.entity) {
+        if (info.entity.isValid) info.updateLeaderboard()
       } else {
         const entity = world[leaderboard.dimension]
           .getEntities({ location: leaderboard.location, tags: [Leaderboard.tag], type: Leaderboard.entityId })

src/lib/text.ts

@@ -176,10 +176,9 @@ function createNum(options: ColorOptions): (text: TSA, n: number, plurals: Plura
   })
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-parameters
-function createOverload<T extends (text: TSA, ...args: any[]) => Text, O extends (t: T, ...args: any[]) => Text>(
+function createOverload<T extends (text: TSA, ...args: any[]) => Text>(
   tsa: T,
-  overload: O,
+  overload: (t: T, ...args: any[]) => Text,
 ) {
   return (...args: unknown[]) => {
     if (isTSA(args[0])) return tsa(args[0], ...args.slice(1))

src/modules/survival/import.ts

@@ -4,13 +4,14 @@ import '../places/import'
 import '../quests/index'
 import './stats'
 
+import './cleanup'
 import './death-quest-and-gravestone'
 import './menu'
 import './random-teleport'
 import './realtime'
-import './sidebar'
-import './cleanup'
 import './recurring-events'
+import './sidebar'
+import './speedrun/target'
 
 import type { VectorInDimension } from 'lib/utils/point'
 

src/modules/survival/speedrun/target.ts

@@ -0,0 +1,82 @@
+import { Player } from '@minecraft/server'
+import { InventoryInterval, ScoreboardDB } from 'lib'
+import { form } from 'lib/form/new'
+import { t } from 'lib/text'
+import { BaseItem } from 'modules/places/base/base'
+
+export enum SpeedRunTarget {
+  GetBaseItem = 'GetBaseItem',
+  FullNetheriteArmor = 'FullNetheriteArmor',
+  AllQuests = 'AllQuests',
+  AllAchievements = 'AllAchievements',
+  MillionOfMoney = 'MillionOfMoney',
+}
+
+const speedRunNames: Record<SpeedRunTarget, string> = {
+  [SpeedRunTarget.AllAchievements]: 'Все достижения',
+  [SpeedRunTarget.GetBaseItem]: 'Получить базу',
+  [SpeedRunTarget.AllQuests]: 'Все задания',
+  [SpeedRunTarget.MillionOfMoney]: '1.000.000 монет',
+  [SpeedRunTarget.FullNetheriteArmor]: 'Полная незеритовая броня',
+}
+
+for (const [target, name] of Object.entries(speedRunNames)) ScoreboardDB.defineName(target, name)
+
+function finishSpeedRun(player: Player, target: SpeedRunTarget) {
+  if (!player.database.speedrunTarget) return
+
+  player.database.speedrunTarget.finished = true
+  const start = player.scores.anarchyOnlineTime * 2.5 // ms
+  const took = Date.now() - start
+  const previous = (player.scores as Record<string, number>)[target] ?? 0
+
+  const name = speedRunNames[target]
+  if (previous === 0 || took < previous) {
+    ;(player.scores as Record<string, number>)[target] = took
+    if (previous === 0) {
+      player.success(t`Ваш первый рекорд ${name} поставлен! Это заняло ${t.timeHHMMSS(took)}`)
+    } else {
+      player.success(t`Вы побили ваш предыдущий рекорд ${name}! ${t.timeHHMMSS(took)} -> ${t.timeHHMMSS(previous)}`)
+    }
+  } else {
+    player.fail(
+      t`Вы не смогли побить ваш предыдущий рекорд ${name}! ${t.timeHHMMSS(took)} -> ${t.timeHHMMSS(previous)}`,
+    )
+  }
+}
+
+function isSpeedRunningFor(player: Player, target: SpeedRunTarget) {
+  return player.database.speedrunTarget?.target === target && !player.database.speedrunTarget.finished
+}
+
+declare module '@minecraft/server' {
+  interface PlayerDatabase {
+    speedrunTarget?: {
+      target: string
+      finished: boolean
+    }
+  }
+}
+
+const baseTypeId = BaseItem.itemStack.typeId
+InventoryInterval.slots.subscribe(({ player, slot }) => {
+  if (!isSpeedRunningFor(player, SpeedRunTarget.GetBaseItem)) return
+  if (slot.isValid && slot.typeId === baseTypeId && BaseItem.isItem(slot.getItem())) {
+    finishSpeedRun(player, SpeedRunTarget.GetBaseItem)
+  }
+})
+
+const speedrunForm = form((f, player) => {
+  f.title('Speedrun')
+  for (const [target, name] of Object.entries(speedRunNames)) {
+    f.button(name, () => {
+      player.database.speedrunTarget = {
+        target,
+        finished: false,
+      }
+      player.info(t`Спидран '${name}' начат. Для сброса времени воспользуйтесь .wipe`)
+    })
+  }
+})
+
+new Command('target').setAliases('speedrun').executes(speedrunForm.command)