diff --git a/package-lock.json b/package-lock.json index 9aaeebd8c..6f95f3f84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "@datastructures-js/priority-queue": "^6.3.1", "@types/express": "^4.17.21", "@types/google-protobuf": "^3.15.12", + "@types/hammerjs": "^2.0.45", "@types/jimp": "^0.2.28", "@types/msgpack5": "^3.4.6", "@types/raphael": "^2.3.9", @@ -19,6 +20,7 @@ "express": "^4.19.2", "google-auth-library": "^9.14.0", "googleapis": "^143.0.0", + "hammerjs": "^2.0.8", "jimp": "^0.22.12", "msgpack5": "^6.0.2", "node-addon-api": "^8.1.0", @@ -4265,6 +4267,12 @@ "@types/node": "*" } }, + "node_modules/@types/hammerjs": { + "version": "2.0.45", + "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.45.tgz", + "integrity": "sha512-qkcUlZmX6c4J8q45taBKTL3p+LbITgyx7qhlPYOdOHZB7B31K0mXbP5YA7i7SgDeEGuI9MnumiKPEMrxg8j3KQ==", + "license": "MIT" + }, "node_modules/@types/html-minifier-terser": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", @@ -7972,6 +7980,15 @@ "node": ">=14.0.0" } }, + "node_modules/hammerjs": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", + "integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==", + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/handle-thing": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", diff --git a/package.json b/package.json index 54cd277fa..8b3daf665 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "@datastructures-js/priority-queue": "^6.3.1", "@types/express": "^4.17.21", "@types/google-protobuf": "^3.15.12", + "@types/hammerjs": "^2.0.45", "@types/jimp": "^0.2.28", "@types/msgpack5": "^3.4.6", "@types/raphael": "^2.3.9", @@ -64,6 +65,7 @@ "express": "^4.19.2", "google-auth-library": "^9.14.0", "googleapis": "^143.0.0", + "hammerjs": "^2.0.8", "jimp": "^0.22.12", "msgpack5": "^6.0.2", "node-addon-api": "^8.1.0", diff --git a/resources/images/DonateIconWhite.png b/resources/images/DonateIconWhite.png new file mode 100644 index 000000000..d84f16c07 Binary files /dev/null and b/resources/images/DonateIconWhite.png differ diff --git a/src/client/InputHandler.ts b/src/client/InputHandler.ts index 37e8e4c93..dbddf19b2 100644 --- a/src/client/InputHandler.ts +++ b/src/client/InputHandler.ts @@ -1,5 +1,5 @@ import {EventBus, GameEvent} from "../core/EventBus"; -import {Cell} from "../core/game/Game"; + export class MouseUpEvent implements GameEvent { constructor( diff --git a/src/client/graphics/layers/RadialMenu.ts b/src/client/graphics/layers/RadialMenu.ts index 7f19f201e..0bd58e9db 100644 --- a/src/client/graphics/layers/RadialMenu.ts +++ b/src/client/graphics/layers/RadialMenu.ts @@ -5,7 +5,6 @@ import {and, bfs, dist, manhattanDist, manhattanDistWrapped, sourceDstOceanShore import {ContextMenuEvent, MouseUpEvent} from "../../InputHandler"; import {SendAllianceRequestIntentEvent, SendAttackIntentEvent, SendBoatAttackIntentEvent, SendBreakAllianceIntentEvent, SendEmojiIntentEvent, SendSpawnIntentEvent, SendTargetPlayerIntentEvent} from "../../Transport"; import {TransformHandler} from "../TransformHandler"; -import {MessageType} from "./EventsDisplay"; import {Layer} from "./Layer"; import * as d3 from 'd3'; import traitorIcon from '../../../../resources/images/TraitorIconWhite.png';