Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Merge branch 'update-game-tiles' into metadataScriptingApi"

Browse source 
This reverts commit 796a9418d3, reversing
changes made to 3506063e65.
This commit is contained in:
GRL 2021-05-21 16:24:48 +02:00
parent 796a9418d3
commit 1110f4fb7f
6 changed files with 42 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
front/src/Api/Events/IframeEvent.ts
View file

@ -17,7 +17,6 @@ import type { LayerEvent } from './LayerEvent';
import type { SetPropertyEvent } from "./setPropertyEvent";
import type { TagEvent } from "./TagEvent";
import type { TilesetEvent } from "./TilesetEvent";
import type { UpdateTileEvent } from "./UpdateTileEvent";
export interface TypedMessageEvent<T> extends MessageEvent {
data: T
@ -44,8 +43,7 @@ export type IframeEventMap = {
setProperty: SetPropertyEvent
getDataLayer: undefined
getTag: undefined
tilesetEvent: TilesetEvent
updateTileEvent: UpdateTileEvent
tilsetEvent: TilesetEvent
}
export interface IframeEvent<T extends keyof IframeEventMap> {
type: T;

15
front/src/Api/Events/UpdateTileEvent.ts
View file

@ -1,15 +0,0 @@
import * as tg from "generic-type-guard";
export const isUpdateTileEvent = tg.isArray(
new tg.IsInterface().withProperties({
x: tg.isNumber,
y: tg.isNumber,
tile: tg.isUnion(tg.isNumber, tg.isString),
layer: tg.isString
}).get()
);
/**
* A message sent from the game to the iFrame when a user enters or leaves a zone marked with the "zone" property.
*/
export type UpdateTileEvent = tg.GuardedType<typeof isUpdateTileEvent>;

14
front/src/Api/IframeListener.ts
View file

@ -21,7 +21,6 @@ import { isMenuItemRegisterEvent } from './Events/MenuItemRegisterEvent';
import type { MenuItemClickedEvent } from './Events/MenuItemClickedEvent';
import type { TagEvent } from "./Events/TagEvent";
import { isTilesetEvent, TilesetEvent } from "./Events/TilesetEvent";
import { isUpdateTileEvent, UpdateTileEvent } from './Events/UpdateTileEvent';
/**
@ -36,6 +35,12 @@ class IframeListener {
private readonly _openPopupStream: Subject<OpenPopupEvent> = new Subject();
public readonly openPopupStream = this._openPopupStream.asObservable();
private readonly _openTabStream: Subject<OpenTabEvent> = new Subject();
public readonly openTabStream = this._openTabStream.asObservable();
private readonly _goToPageStream: Subject<GoToPageEvent> = new Subject();
public readonly goToPageStream = this._goToPageStream.asObservable();
private readonly _openCoWebSiteStream: Subject<OpenCoWebSiteEvent> = new Subject();
public readonly openCoWebSiteStream = this._openCoWebSiteStream.asObservable();
@ -81,9 +86,6 @@ class IframeListener {
private readonly _tilesetLoaderStream: Subject<TilesetEvent> = new Subject();
public readonly tilesetLoaderStream = this._tilesetLoaderStream.asObservable();
private readonly _updateTileStream: Subject<UpdateTileEvent> = new Subject();
public readonly updateTileStream = this._updateTileStream.asObservable();
private readonly iframes = new Set<HTMLIFrameElement>();
private readonly scripts = new Map<string, HTMLIFrameElement>();
private sendPlayerMove: boolean = false;
@ -154,10 +156,8 @@ class IframeListener {
this._registerMenuCommandStream.next(payload.data.menutItem)
} else if (payload.type == "getTag") {
this._tagListStream.next();
} else if (payload.type == "tilesetEvent" && isTilesetEvent(payload.data)) {
} else if (payload.type == "tilsetEvent" && isTilesetEvent(payload.data)) {
this._tilesetLoaderStream.next(payload.data);
} else if (payload.type == "updateTileEvent" && isUpdateTileEvent(payload.data)) {
this._updateTileStream.next(payload.data)
}
}
}, false);