feat: add recur form

Author: leaftail1880

src/lib/get-fullname.ts

@@ -4,7 +4,7 @@ import { Clan } from './clan/clan'
 import { i18n } from './i18n/text'
 import { getRole, ROLES } from './roles'
 import { EquippmentLevel } from './rpg/equipment-level'
-
+// TODO Rewrite to class// TODO Rewrite to class// TODO Rewrite to class// TODO Rewrite to class// TODO Rewrite to class// TODO Rewrite to class// TODO Rewrite to class// TODO Rewrite to class
 /**
  * Gets displayable the role of this player
  *

src/modules/survival/menu.ts

@@ -1,5 +1,5 @@
 import { Player } from '@minecraft/server'
-import { BUTTON } from 'lib'
+import { BUTTON, doNothing } from 'lib'
 import { achievementsForm, achievementsFormName } from 'lib/achievements/command'
 import { clanMenu } from 'lib/clan/menu'
 import { Core } from 'lib/extensions/core'
@@ -15,6 +15,8 @@ import { baseMenu } from 'modules/places/base/base-menu'
 import { wiki } from 'modules/wiki/wiki'
 import { Anarchy } from '../places/anarchy/anarchy'
 import { Spawn } from '../places/spawn'
+import { speedrunForm } from './speedrun/target'
+import { recurForm } from './recurring-events'
 
 function tp(
   player: Player,
@@ -58,6 +60,14 @@ Menu.form = form((f, { player, self }) => {
     .button(i18n.nocolor`§bВики`, BUTTON.search, wiki.show)
     .button(achievementsFormName(player), 'textures/blocks/gold_block', achievementsForm)
     .button(i18n.nocolor`§7Настройки`, BUTTON.settings, () => playerSettingsMenu(player, self))
+    .button(i18n`Еще`, BUTTON['>'], secondPage)
+})
+
+const secondPage = form(f => {
+  f.title(Core.name, '§c§u§s§r')
+  f.button(i18n`Цели`, BUTTON['?'], speedrunForm)
+  f.button(i18n`Лидеры`, BUTTON['?'], doNothing)
+  f.button(i18n`События`, BUTTON['?'], recurForm)
 })
 
 Join.onMoveAfterJoin.subscribe(({ player, firstJoin }) => {

src/modules/survival/recurring-events.ts

@@ -1,7 +1,10 @@
-import { TicksPerSecond, world } from '@minecraft/server'
+import { Player, TicksPerSecond, world } from '@minecraft/server'
 import { MinecraftEffectTypes, MinecraftEffectTypesUnion } from '@minecraft/vanilla-data'
-import { ms } from 'lib'
+import { doNothing, ms, RoadRegion } from 'lib'
+import { form } from 'lib/form/new'
+import { i18n } from 'lib/i18n/text'
 import { DurationalRecurringEvent } from 'lib/recurring-event'
+import { RegionEvents } from 'lib/region/events'
 import later from 'lib/utils/later'
 
 // TODO Add settings for players to not apply effects on them
@@ -10,30 +13,61 @@ import later from 'lib/utils/later'
 // TODO Add menu to the survival menu
 // TODO Add chat notification
 
-for (const { effectType, startingOn } of [
-  { effectType: 'Haste', startingOn: 1 },
-  { effectType: 'HealthBoost', startingOn: 4 },
-] satisfies {
-  effectType: MinecraftEffectTypesUnion
-  startingOn: number
-}[]) {
-  new DurationalRecurringEvent(
-    `effect${effectType}`,
-    later.parse.recur().every(5).hour().startingOn(startingOn),
-    ms.from('min', 10),
-    () => ({}),
-    (_, ctx) => {
-      ctx.temp.system.runInterval(
-        () => {
-          for (const player of world.getAllPlayers())
-            player.addEffect(MinecraftEffectTypes[effectType], TicksPerSecond * 3, {
-              amplifier: 2,
-              showParticles: false,
-            })
-        },
-        `effect${effectType}`,
-        TicksPerSecond * 2,
-      )
-    },
-  )
+class RecurringEffect {
+  static all: RecurringEffect[] = []
+
+  readonly event: DurationalRecurringEvent
+
+  constructor(
+    readonly effectType: MinecraftEffectTypesUnion,
+    readonly startingOn: number,
+    filter?: (p: Player) => boolean,
+    readonly amplifier = 2,
+  ) {
+    RecurringEffect.all.push(this)
+    this.event = new DurationalRecurringEvent(
+      `effect${effectType}`,
+      later.parse.recur().every(5).hour().startingOn(startingOn),
+      ms.from('min', 10),
+      () => ({}),
+      (_, ctx) => {
+        for (const player of world.getAllPlayers()) {
+          player.success(i18n.success`Событие! ${effectType} силой ${amplifier} на ${10} минут`)
+        }
+        ctx.temp.system.runInterval(
+          () => {
+            for (const player of world.getAllPlayers()) {
+              if (filter && !filter(player)) continue
+
+              player.addEffect(MinecraftEffectTypes[effectType], TicksPerSecond * 3, {
+                amplifier,
+                showParticles: false,
+              })
+            }
+          },
+          `effect${effectType}`,
+          TicksPerSecond * 2,
+        )
+      },
+    )
+  }
 }
+
+new RecurringEffect('Haste', 1)
+new RecurringEffect('HealthBoost', 2)
+new RecurringEffect(
+  'Speed',
+  3,
+  p => RegionEvents.playerInRegionsCache.get(p)?.some(e => e instanceof RoadRegion) ?? false,
+  4,
+)
+
+export const recurForm = form(f => {
+  f.title(i18n`События`)
+  for (const event of RecurringEffect.all) {
+    f.button(
+      event.effectType + ' ' + (event.amplifier + 1) + '\n' + event.event.getNextOccurances(1)[0]?.toHHMM(),
+      doNothing,
+    )
+  }
+})

src/modules/survival/speedrun/target.ts

@@ -2,7 +2,7 @@ import { Player } from '@minecraft/server'
 import { InventoryInterval, ScoreboardDB } from 'lib'
 import { defaultLang } from 'lib/assets/lang'
 import { form } from 'lib/form/new'
-import { i18n } from 'lib/i18n/text'
+import { i18n, i18nShared } from 'lib/i18n/text'
 import { BaseItem } from 'modules/places/base/base'
 
 export enum SpeedRunTarget {
@@ -13,18 +13,18 @@ export enum SpeedRunTarget {
   MillionOfMoney = 'MillionOfMoney',
 }
 
-const speedRunNames: Record<SpeedRunTarget, Text> = {
-  [SpeedRunTarget.AllAchievements]: i18n`Все достижения`,
-  [SpeedRunTarget.GetBaseItem]: i18n`Получить базу`,
-  [SpeedRunTarget.AllQuests]: i18n`Все задания`,
-  [SpeedRunTarget.MillionOfMoney]: i18n`1.000.000 монет`,
-  [SpeedRunTarget.FullNetheriteArmor]: i18n`Полная незеритовая броня`,
+const speedRunNames: Record<SpeedRunTarget, SharedText> = {
+  [SpeedRunTarget.AllAchievements]: i18nShared`Все достижения`,
+  [SpeedRunTarget.GetBaseItem]: i18nShared`Получить базу`,
+  [SpeedRunTarget.AllQuests]: i18nShared`Все задания`,
+  [SpeedRunTarget.MillionOfMoney]: i18nShared`1.000.000 монет`,
+  [SpeedRunTarget.FullNetheriteArmor]: i18nShared`Полная незеритовая броня`,
 }
 
 const objectives: Record<SpeedRunTarget, ScoreboardDB> = Object.fromEntries(
   Object.entriesStringKeys(speedRunNames).map(([target, name]) => {
     const key = `${target[0]?.toLowerCase()}${target.slice(1)}SpeedRun`
-    ScoreboardDB.defineName(key, name.to(defaultLang))
+    ScoreboardDB.defineName(key, name)
     return [target, new ScoreboardDB(key, name.to(defaultLang))]
   }),
 )
@@ -72,7 +72,7 @@ InventoryInterval.slots.subscribe(({ player, slot }) => {
   }
 })
 
-const speedrunForm = form((f, { player }) => {
+export const speedrunForm = form((f, { player }) => {
   f.title('Speedrun')
   f.body(
     i18n`Вы можете выбрать одну из категорий ниже для спидрана. Время считается только когда вы находитесь на анархии, т.е. пока вы оффлайн время не считается. Ваше время на анархии сейчас: ${i18n.hhmmss(player.scores.anarchyOnlineTime * 2.5)}`,