From 10e3361966469e2c7f88d87057c63cd163cf7d19 Mon Sep 17 00:00:00 2001 From: evanpelle Date: Sun, 6 Oct 2024 19:19:21 -0700 Subject: [PATCH] add donate icon --- package-lock.json | 17 +++++++++++++++++ package.json | 2 ++ resources/images/DonateIconWhite.png | Bin 0 -> 7385 bytes src/client/InputHandler.ts | 2 +- src/client/graphics/layers/RadialMenu.ts | 1 - 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 resources/images/DonateIconWhite.png 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 0000000000000000000000000000000000000000..d84f16c0788d8f4b83a985b7e00a7ec8767c72de GIT binary patch literal 7385 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 literal 0 HcmV?d00001 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';