Fix sprite builder

Fixes sprite builder to not rely on sprite.ts that is generating

gulpfile.js

@@ -321,14 +321,8 @@ const setProd = cb => {
 	cb();
 };
 
-const warnAboutTscBeingDumb = cb => {
-	console.log("You're probably about to see some warnings from tsc about not being able to find certain files.");
-	console.log("Don't worry about these. It's a known issue regarding circular build dependencies. The build should continue despite these errors.");
-	cb();
-};
-
 const empty = cb => cb();
-const tsTools = gulp.series(warnAboutTscBeingDumb, npmScript('ts-tools'));
+const tsTools = gulp.series(npmScript('ts-tools'));
 const spritesTask = argv.sprites ? sprites : empty;
 const buildSprites = gulp.series(tsTools, sprites);
 

src/ts/client/game.ts

@@ -2,10 +2,10 @@ import { Injectable, NgZone } from '@angular/core';
 import { Subject, BehaviorSubject } from 'rxjs';
 import { debounce } from 'lodash';
 import {
-	EntityState, Pony, Notification, TileType, Action, IServerActions, Season, WorldState, Holiday,
+	EntityState, Pony, Notification, TileType, Action, IServerActions, WorldState,
 	TileSets, ChatMessage, PartyInfo, Entity, DrawOptions, Engine, defaultDrawOptions, PonyStateFlags,
 	DoAction, ChatType, WorldStateFlags, DebugFlags, MessageType, AccountSettings, Matrix4,
-	FakeEntity, SelectFlags, WorldMap, MapType, MapFlags, EntityFlags, houseTiles, isValidTile, GraphicsQuality
+	FakeEntity, SelectFlags, WorldMap, EntityFlags, houseTiles, isValidTile, GraphicsQuality
 } from '../common/interfaces';
 import {
 	clamp, lengthOfXY, setFlag, hasFlag, boundsIntersect, point, toInt, lerpColor, distanceXY
@@ -72,6 +72,7 @@ import { Model } from '../components/services/model';
 import { filterEntityName } from './handlers';
 import { isOutsideMap } from '../common/collision';
 import { loadAndInitSpriteSheets } from './loadSprites';
+import { Holiday, MapFlags, MapType, Season } from '../common/commonInterfaces';
 
 interface Minimap {
 	width: number;

src/ts/client/ponyDraw.ts

@@ -18,7 +18,8 @@ import {
 } from '../common/ponyUtils';
 import { HEAD_ACCESSORY_OFFSETS, EAR_ACCESSORY_OFFSETS, EXTRA_ACCESSORY_OFFSETS } from '../common/offsets';
 import { createMat2D, identityMat2D, translateMat2D, copyMat2D, rotateMat2D, scaleMat2D } from '../common/mat2d';
-import { darkenForOutline } from '../common/ponyInfo';
+import { darkenForOutline } from '../common/color';
+
 
 type Batch = PaletteSpriteBatch;
 type Info = Readonly<PalettePonyInfo>;

src/ts/client/spriteAnimations.ts

@@ -1,7 +1,5 @@
 import * as sprites from '../generated/sprites';
-import { SpriteAnimation } from '../common/animationPlayer';
+import { AnimatedRenderable, Sprite, SpriteAnimation } from '../common/interfaces';
-import { AnimatedRenderable } from '../common/mixins';
-import { Sprite } from '../common/interfaces';
 
 export const zzzAnimation1 = createSpriteAnimation(
 	sprites.emote_sleep1, 8, 8, 4, 7, true, sprites.emote_sleep1_flip.frames);

src/ts/client/worldMap.ts

@@ -1,6 +1,6 @@
 import {
 	Entity, Point, TileType, Rect, MapInfo, Camera, Region, MapState, defaultMapState, Pony,
-	MapType, EntityFlags, WorldMap, Weather, EntityState, MapFlags,
+	EntityFlags, WorldMap, EntityState,
 } from '../common/interfaces';
 import { contains, removeItem, boundsIntersect, array, pushUniq, containsPoint, removeItemFast } from '../common/utils';
 import { isBoundsVisible, } from '../common/camera';
@@ -22,6 +22,7 @@ import { PaletteManager } from '../graphics/paletteManager';
 import { timeEnd, timeStart } from '../common/timing';
 import { playEffect } from './handlers';
 import { isFlyingDown } from '../common/ponyStates';
+import { MapFlags, MapType, Weather } from '../common/commonInterfaces';
 
 const defaultMapInfo: MapInfo = {
 	type: MapType.None,

src/ts/common/animationPlayer.ts

@@ -1,36 +1,9 @@
 import { sample } from 'lodash';
-import { Sprite, Palette, PaletteSpriteBatch } from './interfaces';
+import { AnimationPhase, AnimationPlayer, Palette, PaletteSpriteBatch, SpriteAnimation } from './interfaces';
 import { drawSpriteCropped } from '../graphics/graphicsUtils';
 import { includes } from './utils';
 import { WHITE } from './colors';
 
-const enum AnimationPhase {
-	Starting,
-	Playing,
-	Ending,
-}
-
-export interface SpriteAnimation {
-	loop: boolean;
-	start: number;
-	middle: number;
-	end: number;
-	fps: number;
-	palette: Uint32Array;
-	frames: Sprite[];
-	flipFrames?: Sprite[];
-}
-
-export interface AnimationPlayer {
-	nextAnimation: SpriteAnimation | undefined;
-	currentAnimation: SpriteAnimation | undefined;
-	time: number;
-	frame: number;
-	phase: AnimationPhase;
-	dirty: boolean;
-	palette: Palette;
-}
-
 export function createAnimationPlayer(palette: Palette): AnimationPlayer {
 	return {
 		nextAnimation: undefined,

src/ts/common/color.ts

@@ -533,3 +533,12 @@ export function rgb2hsl(rgb: RGB): HSL {
 export function hsl2CSS(hsl: HSL) {
 	return `hsl(${hsl.h},${hsl.s}%,${hsl.l}%)`;
 }
+
+export function darkenForOutline(color: number) {
+	const mult = (159 / 255);
+	const r = (mult * getR(color)) | 0;
+	const g = (mult * getG(color)) | 0;
+	const b = (mult * getB(color)) | 0;
+	const a = getAlpha(color);
+	return colorFromRGBA(r, g, b, a);
+}

src/ts/common/colors.ts

@@ -1,7 +1,7 @@
-import { MessageType, Season, TileType } from './interfaces';
+import { MessageType, TileType } from './interfaces';
-import { colorFromHSVA, colorToHexRGB, parseColorFast, colorToHSVA, withAlphaFloat } from './color';
+import { colorFromHSVA, colorToHexRGB, parseColorFast, colorToHSVA, withAlphaFloat, darkenForOutline } from './color';
 import { invalidEnum, invalidEnumReturn } from './utils';
-import { darkenForOutline } from './ponyInfo';
+import { Season } from './commonInterfaces';
 
 // basic
 

src/ts/common/commonInterfaces.ts

@@ -0,0 +1,34 @@
+export const enum Season {
+    Summer = 1,
+    Autumn = 2,
+    Winter = 4,
+    Spring = 8,
+}
+
+export const enum Holiday {
+    None,
+    Christmas,
+    Halloween,
+    StPatricks,
+    Easter,
+}
+
+export const enum Weather {
+    None,
+    Rain,
+}
+
+export const enum MapType {
+    None,
+    Island,
+    House,
+    Cave,
+}
+
+export const enum MapFlags {
+    None = 0,
+    EditableWalls = 1,
+    EditableEntities = 2,
+    EditableTiles = 4,
+    EdibleGrass = 8,
+}

src/ts/common/constants.ts

@@ -1,4 +1,4 @@
-import { Season, Holiday } from './interfaces';
+import { Holiday, Season } from './commonInterfaces';
 
 export const SEASON: Season = Season.Spring;
 export const HOLIDAY: Holiday = Holiday.None;

src/ts/common/entities.ts

@@ -2,13 +2,14 @@ import { compact } from 'lodash';
 import * as sprites from '../generated/sprites';
 import {
 	Entity, PaletteManager, Rect, ServerFlags, PaletteRenderable, ColorShadow, EntityDescriptor, EntityOptions,
-	CreateEntityMethod, CreateEntity, EntityFlags, MixinEntity, EntityWorldState, defaultWorldState, ColorExtra, InteractAction
+	CreateEntityMethod, CreateEntity, EntityFlags, MixinEntity, EntityWorldState, defaultWorldState, ColorExtra, InteractAction,
+	AnimatedRenderable1,
+	AnimatedRenderable
 } from './interfaces';
 import { tileWidth, tileHeight, ENTITY_TYPE_LIMIT, WATER_FPS, PONY_TYPE, WATER_HEIGHT } from './constants';
 import { CLOUD_SHADOW_COLOR, WHITE } from './colors';
 import {
-	mixDrawSpider, setPaletteManager, AnimatedRenderable,
+	mixDrawSpider, setPaletteManager, collider, taperColliderSW, taperColliderNE, taperColliderSE,
-	AnimatedRenderable1, collider, taperColliderSW, taperColliderNE, taperColliderSE,
 	taperColliderNW, skewColliderNE, ponyColliders, ponyCollidersBounds, mixTrigger, mixDraw, mixInteract,
 	mixPickable, mixMinimap, mixColliderRect, mixColliderRounded, mixLight, mixLightSprite, mixColliders,
 	mixDrawShadow, mixAnimation, mixBobbing, mixDrawWall, mixDrawRain, mixDrawSeasonal, mixDrawWindow,

src/ts/common/interfaces.ts

@@ -1,7 +1,7 @@
 import { Texture2D } from '../graphics/webgl/texture2d';
 import { WHITE, SHADOW_COLOR } from './colors';
-import { AnimationPlayer } from './animationPlayer';
 import { Animator } from './animator';
+import { Holiday, MapFlags, MapType, Season, Weather } from './commonInterfaces';
 
 export type Log = (...args: any[]) => void;
 export type Apply = (func: () => void) => void;
@@ -12,41 +12,6 @@ export interface Dict<T> {
 	[key: string]: T;
 }
 
-export const enum Season {
-	Summer = 1,
-	Autumn = 2,
-	Winter = 4,
-	Spring = 8,
-}
-
-export const enum Holiday {
-	None,
-	Christmas,
-	Halloween,
-	StPatricks,
-	Easter,
-}
-
-export const enum Weather {
-	None,
-	Rain,
-}
-
-export const enum MapType {
-	None,
-	Island,
-	House,
-	Cave,
-}
-
-export const enum MapFlags {
-	None = 0,
-	EditableWalls = 1,
-	EditableEntities = 2,
-	EditableTiles = 4,
-	EdibleGrass = 8,
-}
-
 export const enum NotificationFlags {
 	None = 0,
 	Ok = 1,
@@ -1872,3 +1837,46 @@ if (typeof window !== 'undefined') {
 }
 
 export type PrimitiveValues = string | number | symbol | boolean;
+
+export interface Renderable {
+	color?: Sprite;
+	shadow?: Sprite;
+}
+
+export interface AnimatedRenderable {
+	frames: Sprite[];
+	shadow?: Sprite;
+	palette: Uint32Array;
+}
+
+export interface AnimatedRenderable1 {
+	frames: (Sprite | undefined)[];
+}
+
+export const enum AnimationPhase {
+	Starting,
+	Playing,
+	Ending,
+}
+
+export interface SpriteAnimation {
+	loop: boolean;
+	start: number;
+	middle: number;
+	end: number;
+	fps: number;
+	palette: Uint32Array;
+	frames: Sprite[];
+	flipFrames?: Sprite[];
+}
+
+export interface AnimationPlayer {
+	nextAnimation: SpriteAnimation | undefined;
+	currentAnimation: SpriteAnimation | undefined;
+	time: number;
+	frame: number;
+	phase: AnimationPhase;
+	dirty: boolean;
+	palette: Palette;
+}
+

src/ts/common/mixins.ts

@@ -3,7 +3,7 @@ import * as sprites from '../generated/sprites';
 import {
 	EntityPart, Sprite, Rect, SpriteBatch, PaletteManager, Palette, PaletteRenderable, PaletteSpriteBatch,
 	DrawOptions, getAnimationFromEntityState, EntityState, SignEntityOptions, EntityFlags, Collider, MixinEntity,
-	Season,
+	AnimatedRenderable1, Renderable, AnimatedRenderable,
 } from './interfaces';
 import { at, att, hasFlag, invalidEnum } from './utils';
 import { WHITE, BLACK, RED } from './colors';
@@ -12,21 +12,7 @@ import { rect, addRects, addRect } from './rect';
 import { SECOND, LIGHT_VOLUME_SCALE } from './constants';
 import { mockPaletteManager } from './ponyInfo';
 import { releasePalette } from '../graphics/paletteManager';
-
+import { Season } from './commonInterfaces';
-interface Renderable {
-	color?: Sprite;
-	shadow?: Sprite;
-}
-
-export interface AnimatedRenderable {
-	frames: Sprite[];
-	shadow?: Sprite;
-	palette: Uint32Array;
-}
-
-export interface AnimatedRenderable1 {
-	frames: (Sprite | undefined)[];
-}
 
 const predefinedSteps = [
 	[],

src/ts/common/ponyInfo.ts

@@ -6,7 +6,7 @@ import {
 } from './interfaces';
 import { toInt, array, includes, att } from './utils';
 import { CM_SIZE } from './constants';
-import { parseColorFast, getR, getAlpha, colorFromRGBA, getG, getB, colorToHexRGB } from './color';
+import { parseColorFast, colorToHexRGB, darkenForOutline } from './color';
 import { BLACK, fillToOutline, fillToOutlineColor, WHITE, TRANSPARENT, fillToOutlineWithDarken } from './colors';
 import {
 	mergedManes, mergedBackManes, mergedFacialHair, mergedEarAccessories, mergedChestAccessories,
@@ -344,15 +344,6 @@ export function toColorList(colors: (string | undefined)[]): Uint32Array {
 	return result;
 }
 
-export function darkenForOutline(color: number) {
-	const mult = (159 / 255);
-	const r = (mult * getR(color)) | 0;
-	const g = (mult * getG(color)) | 0;
-	const b = (mult * getB(color)) | 0;
-	const a = getAlpha(color);
-	return colorFromRGBA(r, g, b, a);
-}
-
 function getColorsGeneric(
 	fillColors: Arr<string>, outlineColors: Arr<string>, defaultColor: string, length: number, darken: boolean
 ): string[] {

src/ts/common/tileUtils.ts

@@ -1,6 +1,6 @@
 import {
-	PaletteManager, Season, TileSets, Region, TileType, Camera, PaletteSpriteBatch, DrawOptions, WorldMap, IMap,
+	PaletteManager,TileSets, Region, TileType, Camera, PaletteSpriteBatch, DrawOptions, WorldMap, IMap,
-	Sprite, MapType,
+	Sprite,
 	canWalk
 } from './interfaces';
 import * as sprites from '../generated/sprites';
@@ -13,6 +13,7 @@ import { releasePalette } from '../graphics/paletteManager';
 import { drawPixelText } from '../graphics/graphicsUtils';
 import { toScreenX, toScreenY, toWorldZ } from './positionUtils';
 import { setColliderDirty } from './collision';
+import { MapType, Season } from './commonInterfaces';
 
 const TILE_COUNTS = [[0, 4], [2, 3], [4, 3], [6, 3], [8, 3], [13, 3], [14, 3], [47, 4]];
 export const TILE_COUNT_MAP: number[] = [];

src/ts/common/timeUtils.ts

@@ -1,7 +1,8 @@
 import { lerpColors, withAlphaFloat } from './color';
 import { WHITE, SHADOW_COLOR, BLACK } from './colors';
+import { Season } from './commonInterfaces';
 import { MINUTE } from './constants';
-import { Season } from './interfaces';
+
 
 const DAY_START = 4.75; // 04:45
 const DAY_END = 20.25; // 20:15

src/ts/common/utils.ts

@@ -1,8 +1,9 @@
 import { HttpErrorResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { Point, Rect, Entity, Dict, Holiday, Season, PrimitiveValues } from './interfaces';
+import { Point, Rect, Entity, Dict, PrimitiveValues } from './interfaces';
 import { tileWidth, tileHeight, SECOND, MINUTE, HOUR, DAY } from './constants';
 import { ACCESS_ERROR, NOT_FOUND_ERROR, OFFLINE_ERROR, PROTECTION_ERROR } from './errors';
+import { Season, Holiday } from './commonInterfaces';
 
 // enum
 

src/ts/components/services/audio.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 import { Howl } from 'howler';
 import { random, sample } from 'lodash';
-import { Season, Holiday, MapType } from '../../common/interfaces';
 import { getUrl } from '../../client/rev';
+import { Holiday, MapType, Season } from '../../common/commonInterfaces';
 
 interface Track {
 	name: string;

src/ts/components/tools/tools-map/tools-map.ts

@@ -5,7 +5,7 @@ import { tileHeight, tileWidth, REGION_SIZE } from '../../../common/constants';
 import { faHome } from '../../../client/icons';
 import { updateMap, createWorldMap, setRegion } from '../../../client/worldMap';
 import {
-	Season, DrawOptions, defaultDrawOptions, EntityFlags, Entity, WorldMap, MapType, MapFlags
+	DrawOptions, defaultDrawOptions, EntityFlags, Entity, WorldMap,
 } from '../../../common/interfaces';
 import { drawCanvas } from '../../../graphics/contextSpriteBatch';
 import { paletteSpriteSheet } from '../../../generated/sprites';
@@ -25,6 +25,7 @@ import { StorageService } from '../../services/storageService';
 import { getTileColor } from '../../../common/colors';
 import { colorToCSS } from '../../../common/color';
 import { loadAndInitSpriteSheets } from '../../../client/loadSprites';
+import { MapFlags, MapType, Season } from '../../../common/commonInterfaces';
 
 export interface ToolsMapOtherInfo {
 	season: Season;

src/ts/server/commands.ts

@@ -1,6 +1,6 @@
 import { range, compact, escapeRegExp } from 'lodash';
 import {
-	MessageType, ChatType, Expression, Eye, Muzzle, Action, Weather, toAnnouncementMessageType,
+	MessageType, ChatType, Expression, Eye, Muzzle, Action, toAnnouncementMessageType,
 } from '../common/interfaces';
 import { hasRole } from '../common/accountUtils';
 import { butterfly, bat, firefly, cloud, getEntityType, getEntityTypeName } from '../common/entities';
@@ -34,6 +34,7 @@ import { writeFileAsync } from 'fs';
 import { Account } from './db';
 import { defaultHouseSave, removeToolbox, restoreToolbox } from './maps/houseMap';
 import { getRegionGlobal } from '../common/region';
+import { Weather } from '../common/commonInterfaces';
 
 export interface CommandContext {
 	world: World;

src/ts/server/maps/caveMap.ts

@@ -4,13 +4,14 @@ import { ServerMap, MapUsage, ServerEntity } from '../serverInterfaces';
 import { World, goToMap } from '../world';
 import { addSpawnPointIndicators } from '../mapUtils';
 import { createServerMap, deserializeMap } from '../serverMap';
-import { TileType, MapType } from '../../common/interfaces';
+import { TileType } from '../../common/interfaces';
 import { rect } from '../../common/rect';
 import { TorchController, FlyingCritterController } from '../controllers';
 import * as entities from '../../common/entities';
 import { WallController } from '../controllers/wallController';
 import { createBoxOfLanterns, give } from '../controllerUtils';
 import { holdItem } from '../playerUtils';
+import { MapType } from '../../common/commonInterfaces';
 
 const mapData = JSON.parse(fs.readFileSync(pathTo('src', 'maps', 'cave.json'), 'utf8'));
 

src/ts/server/maps/customMap.ts

@@ -1,12 +1,13 @@
 import * as fs from 'fs';
 import * as entities from '../../common/entities';
 import { rect } from '../../common/rect';
-import { TileType, MapType } from '../../common/interfaces';
+import { TileType } from '../../common/interfaces';
 import { createServerMap, deserializeMap } from '../serverMap';
 import { World, goToMap } from '../world';
 import { createSign } from '../controllerUtils';
 import { ServerEntity } from '../serverInterfaces';
 import { pathTo } from '../paths';
+import { MapType } from '../../common/commonInterfaces';
 
 // load tile data
 // To customize the map use in-game editor tools to change tiles, then use `/savemap custom` command,

src/ts/server/maps/houseMap.ts

@@ -3,12 +3,13 @@ import { rect } from '../../common/rect';
 import { ServerMap, MapUsage, ServerEntity } from '../serverInterfaces';
 import { World, goToMap } from '../world';
 import { addSpawnPointIndicators } from '../mapUtils';
-import { TileType, MapType, MapFlags, EntityState } from '../../common/interfaces';
+import { TileType, EntityState } from '../../common/interfaces';
 import { createServerMap, setTile, MapData, saveMap } from '../serverMap';
 import { WallController } from '../controllers';
 import { resetRegionUpdates } from '../serverRegion';
 import { tileHeight, HOUSE_ENTITY_LIMIT } from '../../common/constants';
 import { getTile } from '../../common/tileUtils';
+import { MapFlags, MapType } from '../../common/commonInterfaces';
 
 export let defaultHouseSave: MapData | undefined = undefined;
 

src/ts/server/maps/islandMap.ts

@@ -8,7 +8,7 @@ import {
 	addSpawnPointIndicators, generateTileIndicesAndColliders, removePonies, worldForTemplates, createBunny
 } from '../mapUtils';
 import { serverMapInstanceFromTemplate, createServerMap, copyMapTiles, deserializeMap } from '../serverMap';
-import { TileType, MapType, Season } from '../../common/interfaces';
+import { TileType } from '../../common/interfaces';
 import { rect } from '../../common/rect';
 import { createAddLight, createSignWithText, createWoodenFenceMaker, createBoxOfLanterns } from '../controllerUtils';
 import { setEntityName, updateEntityOptions } from '../entityUtils';
@@ -17,6 +17,7 @@ import { tileWidth, tileHeight } from '../../common/constants';
 import { TorchController, UpdateController } from '../controllers';
 import { resetRegionUpdates } from '../serverRegion';
 import { point } from '../../common/utils';
+import { MapType, Season } from '../../common/commonInterfaces';
 
 const islandMapData = JSON.parse(fs.readFileSync(pathTo('src', 'maps', 'island.json'), 'utf8'));
 

src/ts/server/maps/mainMap.ts

@@ -3,7 +3,7 @@ import { sample, random } from 'lodash';
 import { pathTo } from '../paths';
 import { World, goToMap } from '../world';
 import { createServerMap, deserializeMap, snapshotTiles, setTile, lockTile, lockTiles } from '../serverMap';
-import { TileType, Season, MapType, Holiday, MessageType, ServerFlags, MapFlags } from '../../common/interfaces';
+import { TileType, MessageType, ServerFlags } from '../../common/interfaces';
 import { rect } from '../../common/rect';
 import * as entities from '../../common/entities';
 import {
@@ -27,6 +27,7 @@ import { toWorldX } from '../../common/positionUtils';
 import { deserializeTiles } from '../../common/compress';
 import * as ctrl from '../controllers';
 import { isNightTime, isDayTime } from '../../common/timeUtils';
+import { Holiday, MapFlags, MapType, Season } from '../../common/commonInterfaces';
 
 const mainMapData = JSON.parse(fs.readFileSync(pathTo('src', 'maps', 'main.json'), 'utf8'));
 const mainMapTiles = deserializeTiles(mainMapData.tiles);

src/ts/server/maps/paletteMap.ts

@@ -1,12 +1,13 @@
 import * as entities from '../../common/entities';
 import { rect } from '../../common/rect';
-import { TileType, MapType } from '../../common/interfaces';
+import { TileType } from '../../common/interfaces';
 import { createServerMap } from '../serverMap';
 import { World, goToMap } from '../world';
 import { allEntities } from '../api/account';
 import { createSign } from '../controllerUtils';
 import { ServerEntity } from '../serverInterfaces';
 import { setEntityName } from '../entityUtils';
+import { MapType } from '../../common/commonInterfaces';
 
 export function createPaletteMap(world: World) {
 	const map = createServerMap('palette', MapType.None, 10, 10, TileType.Grass);

src/ts/server/serverActions.ts

@@ -2,7 +2,7 @@ import { Socket, Method, SocketServer, Bin, getMethods } from 'ag-sockets';
 import {
 	PlayerAction, ModAction, ChatType, PonyData, IServerActions, TileType, Action, EditorAction, Entity,
 	EntityOrPonyOptions, LeaveReason, SupporterInvite, InfoFlags, AccountSettings, FriendStatusFlags,
-	SelectFlags, UpdateFlags, isValidModTile, isValidTile, MapFlags, EntityState, houseTiles
+	SelectFlags, UpdateFlags, isValidModTile, isValidTile, EntityState, houseTiles
 } from '../common/interfaces';
 import { CharacterState, ServerConfig } from '../common/adminInterfaces';
 import { PARTY_LIMIT, OFFLINE_PONY, TILE_CHANGE_RANGE, MIN_HIDE_TIME, MAX_HIDE_TIME, PONY_TYPE } from '../common/constants';
@@ -37,6 +37,7 @@ import { isOutsideMap } from '../common/collision';
 import { createAnEntity } from '../common/entities';
 import { mockPaletteManager } from '../common/ponyInfo';
 import { getTile } from '../common/tileUtils';
+import { MapFlags } from '../common/commonInterfaces';
 
 interface AddedEntity {
 	name: string;

src/ts/server/serverInterfaces.ts

@@ -1,11 +1,12 @@
 import { ClientExtensions, BinaryWriter } from 'ag-sockets';
 import {
 	Entity, ServerFlags, AccountSettings, NotificationFlags, Expression, Camera, SayData, Region, TileUpdate,
-	Rect, IMap, MapType, TileType, MapState, UpdateFlags, Action, EntityOrPonyOptions, EntityPlayerState, MapFlags
+	Rect, IMap, TileType, MapState, UpdateFlags, Action, EntityOrPonyOptions, EntityPlayerState,
 } from '../common/interfaces';
 import { IAccount, ICharacter, UpdateAccount } from './db';
 import { AccountUpdate, CharacterState, GameServerSettings, Suspicious } from '../common/adminInterfaces';
 import { ClientActionsTemplate } from '../common/clientActionsTemplte';
+import { MapFlags, MapType } from '../common/commonInterfaces';
 
 export interface EntityUpdate {
 	entity: Entity;

src/ts/server/serverMap.ts

@@ -1,7 +1,7 @@
 import { writeFileAsync, readFileAsync, writeFileSync } from 'fs';
 import { fromByteArray } from 'base64-js';
 import {
-	TileType, MapInfo, MapState, defaultMapState, Rect, MapType, ServerFlags, EntityFlags, MapFlags, EntityState
+	TileType, MapInfo, MapState, defaultMapState, Rect, ServerFlags, EntityFlags, EntityState
 } from '../common/interfaces';
 import { distanceSquaredXY, containsPoint, hasFlag } from '../common/utils';
 import { POSITION_MAX } from '../common/movementUtils';
@@ -20,6 +20,7 @@ import { setEntityName } from './entityUtils';
 import { WallController } from './controllers/wallController';
 import { getTile } from '../common/tileUtils';
 import { getRegion, getRegionGlobal } from '../common/region';
+import { MapFlags, MapType } from '../common/commonInterfaces';
 
 export interface EntityData {
 	type: string;

src/ts/server/world.ts

@@ -1,7 +1,7 @@
 import { getWriterBuffer } from 'ag-sockets';
 import { remove, compact } from 'lodash';
 import {
-	TileType, WorldState, Season, Holiday, WorldStateFlags, LeaveReason, NotificationFlags, UpdateFlags, Action, counterNow,
+	TileType, WorldState, WorldStateFlags, LeaveReason, NotificationFlags, UpdateFlags, Action, counterNow,
 } from '../common/interfaces';
 import { removeItem, distance, clamp, randomPoint, includes, fromNow } from '../common/utils';
 import { HOUR_LENGTH, DAY_LENGTH } from '../common/timeUtils';
@@ -44,6 +44,7 @@ import { createIslandMap } from './maps/islandMap';
 import { createHouseMap } from './maps/houseMap';
 import { updateMainMapSeason } from './maps/mainMap';
 import { updateWorldPerfStats } from './worldPerfStats';
+import { Holiday, Season } from '../common/commonInterfaces';
 
 interface MapSwitch {
 	map: ServerMap;

src/ts/tests/client/clientActions.spec.ts

@@ -5,7 +5,7 @@ import { Subject } from 'rxjs';
 import { expect } from 'chai';
 import { stub, assert, SinonStub } from 'sinon';
 import {
-	MessageType, Action, PartyFlags, NotificationFlags, LeaveReason, TileType, Weather, InfoFlags, Pony
+	MessageType, Action, PartyFlags, NotificationFlags, LeaveReason, TileType, InfoFlags, Pony
 } from '../../common/interfaces';
 import * as handlers from '../../client/handlers';
 import { pony } from '../../common/entities';
@@ -24,6 +24,7 @@ import { addEntity, setRegion, createWorldMap } from '../../client/worldMap';
 import { createServerRegion } from '../../server/serverRegion';
 import { ServerRegion } from '../../server/serverInterfaces';
 import { getTile } from '../../common/tileUtils';
+import { Weather } from '../../common/commonInterfaces';
 
 describe('ClientActions', () => {
 	let zone: NgZone;

src/ts/tests/common/timeUtils.spec.ts

@@ -4,7 +4,7 @@ import {
 	formatHourMinutes, getLightColor, HOUR_LENGTH, isDay, isNight, LightData, createLightData
 } from '../../common/timeUtils';
 import { WHITE } from '../../common/colors';
-import { Season } from '../../common/interfaces';
+import { Season } from '../../common/commonInterfaces';
 
 const LIGHT_DAY = WHITE;
 const LIGHT_NIGHT = 0x2b3374ff;