merge setPosition and focusOn into setViewport

front/src/Api/Events/CameraFocusOnEvent.ts

@@ -1,15 +0,0 @@
-import * as tg from "generic-type-guard";
-
-export const isCameraFocusOnEvent = new tg.IsInterface()
-    .withProperties({
-        x: tg.isNumber,
-        y: tg.isNumber,
-        width: tg.isNumber,
-        height: tg.isNumber,
-        smooth: tg.isBoolean,
-    })
-    .get();
-/**
- * A message sent from the iFrame to the game to set the camera focus on certain place.
- */
-export type CameraFocusOnEvent = tg.GuardedType<typeof isCameraFocusOnEvent>;

front/src/Api/Events/CameraSetViewportEvent.ts

@@ -1,15 +1,16 @@
 import * as tg from "generic-type-guard";
 
-export const isCameraSetPositionEvent = new tg.IsInterface()
+export const isCameraSetViewportEvent = new tg.IsInterface()
     .withProperties({
         x: tg.isNumber,
         y: tg.isNumber,
         width: tg.isNumber,
         height: tg.isNumber,
+        lock: tg.isBoolean,
         smooth: tg.isBoolean,
     })
     .get();
 /**
  * A message sent from the iFrame to the game to change the camera position.
  */
-export type CameraSetPositionEvent = tg.GuardedType<typeof isCameraSetPositionEvent>;
+export type CameraSetViewportEvent = tg.GuardedType<typeof isCameraSetViewportEvent>;

front/src/Api/Events/IframeEvent.ts

@@ -31,8 +31,7 @@ import type { ChangeLayerEvent } from "./ChangeLayerEvent";
 import { isPlayerPosition } from "./PlayerPosition";
 import type { WasCameraUpdatedEvent } from "./WasCameraUpdatedEvent";
 import type { ChangeZoneEvent } from "./ChangeZoneEvent";
-import type { CameraSetPositionEvent } from "./CameraSetPositionEvent";
-import type { CameraFocusOnEvent } from "./CameraFocusOnEvent";
+import type { CameraSetViewportEvent } from "./CameraSetViewportEvent";
 import type { CameraFollowPlayerEvent } from "./CameraFollowPlayerEvent";
 import { isColorEvent } from "./ColorEvent";
 
@@ -46,9 +45,8 @@ export interface TypedMessageEvent<T> extends MessageEvent {
 export type IframeEventMap = {
     loadPage: LoadPageEvent;
     chat: ChatEvent;
-    cameraFocusOn: CameraFocusOnEvent;
     cameraFollowPlayer: CameraFollowPlayerEvent;
-    cameraSetPosition: CameraSetPositionEvent;
+    cameraSetViewport: CameraSetViewportEvent;
     openPopup: OpenPopupEvent;
     closePopup: ClosePopupEvent;
     openTab: OpenTabEvent;