Add wiggle wiggle to portal

Author: leaftail1880

src/lib/location.ts

@@ -30,10 +30,11 @@ class Location<T extends Vector3> {
    */
   static creator<V extends Vector3, L extends typeof Location<V>>(this: L) {
     /** @param group - Location group */
-    return (place: Place, fallback?: V) => {
-      const location = new this(place.group.id, place.shortId, place.group.dimensionType, fallback)
+    return (place: Place, fallback?: V, floor = false) => {
+      const location = new this(place.group.id, place.shortId, place.group.dimensionType, fallback, floor)
 
-      ;(Settings.worldMap[place.group.id] ??= {})[place.shortId] = {
+      const wm = (Settings.worldMap[place.group.id] ??= {})
+      wm[place.shortId] = {
         name: place.name,
         description: location.format,
         value: fallback ? Object.values(fallback).join(' ').trim() : '',
@@ -42,6 +43,12 @@ class Location<T extends Vector3> {
 
       location.load()
       location.firstLoad = true
+      if (floor && !Vec.equals(location.location, Vec.zero)) {
+        Settings.parseConfig(Settings.worldDatabase, place.group.id, wm)[place.shortId] = Vec.string(
+          location.location,
+          false,
+        )
+      }
 
       return location.safe
     }
@@ -74,6 +81,7 @@ class Location<T extends Vector3> {
     protected name: string,
     readonly dimensionType: DimensionType,
     protected fallback?: T,
+    protected readonly floor = false,
   ) {}
 
   private load(throws = false) {
@@ -90,15 +98,20 @@ class Location<T extends Vector3> {
       else return console.warn(error)
     }
 
-    for (const [i, key] of Object.keys(this.locationFormat).entries()) {
+    const loc = Object.assign({}, this.locationFormat)
+    for (const [i, key] of Object.keys(loc).entries()) {
       const n = input[i]
       if (typeof n === 'undefined') throw new TypeError(`I out of bounds: ${i}`)
-      ;(this.locationFormat[key as keyof T] as number) = n
+      ;(loc[key as keyof T] as number) = n
     }
-    this.updateLocation(this.locationFormat)
+    this.updateLocation(loc)
   }
 
   private updateLocation(location: T) {
+    if (this.floor) {
+      const { x, y, z } = Vec.floor(location)
+      location = { ...location, x, y, z }
+    }
     this.location = location
     EventLoaderWithArg.load(this.onLoad, this.safe as ValidLocation<T>)
     this.firstLoad = false

src/lib/vector.ts

@@ -86,6 +86,38 @@ export class VecXZ {
     /** Z component of this vector. */
     public z: number,
   ) {}
+
+  /** Returns the length of this vector. */
+  length() {
+    return Math.hypot(this.x, this.z)
+  }
+
+  /** Returns this vector as a normalized vector. */
+  normalized() {
+    const magnitude = this.length()
+    if (magnitude === 0) return this
+
+    const directionX = this.x / magnitude
+    const directionZ = this.z / magnitude
+
+    return new VecXZ(directionX, directionZ)
+  }
+
+  add(a: VectorXZ) {
+    return VecXZ.add(this, a)
+  }
+
+  substract(a: VectorXZ) {
+    return VecXZ.subtract(this, a)
+  }
+
+  multiply(a: number) {
+    return VecXZ.multiply(this, a)
+  }
+
+  multiplyVec(a: VectorXZ) {
+    return VecXZ.multiplyVec(this, a)
+  }
 }
 
 export class Vec {

src/modules/places/lib/safe-place.ts

@@ -10,6 +10,7 @@ import {
   locationWithRotation,
   Portal,
   SafeAreaRegion,
+  Vec,
   Vector3Radius,
 } from 'lib'
 import { Sounds } from 'lib/assets/custom-sounds'
@@ -29,9 +30,9 @@ export class SafePlace {
 
   portalTeleportsTo = locationWithRotation(this.group.place('portal teleports to').name('портал телепортирует на'))
 
-  private portalFrom = location(this.group.place('portal from').name('портал от'))
+  private portalFrom = location(this.group.place('portal from').name('портал от'), undefined, true)
 
-  private portalTo = location(this.group.place('portal to').name('портал до'))
+  private portalTo = location(this.group.place('portal to').name('портал до'), undefined, true)
 
   safeArea?: SafeAreaRegion
 
@@ -61,7 +62,9 @@ export class SafePlace {
   }
 
   private createPortal(from: Vector3, to: Vector3) {
-    new Portal(this.group.id, from, to, player => {
+    const start = Vec.min(from, to)
+    const end = Vec.max(from, to)
+    new Portal(this.group.id, start, end, player => {
       if (!Portal.canTeleport(player)) return
 
       player.database.unlockedPortals ??= []
@@ -70,7 +73,7 @@ export class SafePlace {
         player.database.unlockedPortals.push(this.groupId)
       }
 
-      portalMenuOnce(player, undefined, this.group)
+      portalMenuOnce(player, undefined, this.group, start, end)
     })
   }
 
@@ -110,7 +113,13 @@ system.delay(() => {
   }, ActionGuardOrder.Feature)
 })
 
-const portalMenuOnce = debounceMenu(function portalMenu(player: Player, message?: MaybeRawText, group?: Group) {
+const portalMenuOnce = debounceMenu(function portalMenu(
+  player: Player,
+  message?: MaybeRawText,
+  group?: Group,
+  from?: Vector3,
+  to?: Vector3,
+) {
   return new ArrayForm(
     'Перемещение...',
     SafePlace.places
@@ -120,7 +129,7 @@ const portalMenuOnce = debounceMenu(function portalMenu(player: Player, message?
     .description(message)
     .button(place => {
       const [name, , callback] = Product.create()
-        .form(message => portalMenu(player, message))
+        .form(message => portalMenu(player, message, group, from, to))
         .player(player)
         .name(place.group.name ?? 'Unknown')
         .cost(new MoneyCost(1000))
@@ -136,6 +145,14 @@ const portalMenuOnce = debounceMenu(function portalMenu(player: Player, message?
       return [name, callback]
     })
     .show(player)
+    .then(success => {
+      if (!success && from && to) {
+        const direction = from.x === to.x ? 'x' : 'z'
+        const distance = player.location[direction] - from[direction]
+        player.applyKnockback({ x: 0, z: 0, [direction]: distance * 5 }, 0.5)
+      }
+      return success
+    })
 })
 
 new Command('portals')