diff --git a/res/ui/icons/waypoint_wires.png b/res/ui/icons/waypoint_wires.png new file mode 100644 index 00000000..a6d3fd28 Binary files /dev/null and b/res/ui/icons/waypoint_wires.png differ diff --git a/res_raw/sprites/misc/waypoint_wires.png b/res_raw/sprites/misc/waypoint_wires.png new file mode 100644 index 00000000..a6d3fd28 Binary files /dev/null and b/res_raw/sprites/misc/waypoint_wires.png differ diff --git a/src/css/ingame_hud/waypoints.scss b/src/css/ingame_hud/waypoints.scss index d30c5120..e5a38705 100644 --- a/src/css/ingame_hud/waypoints.scss +++ b/src/css/ingame_hud/waypoints.scss @@ -61,6 +61,12 @@ /* @load-async */ background: uiResource("icons/waypoint.png") left 50% / #{D(8px)} no-repeat; } + + &.layer--wires { + /* @load-async */ + background-image: uiResource("icons/waypoint_wires.png"); + } + opacity: 0.7; @include S(margin-bottom, 1px); font-weight: bold; diff --git a/src/js/changelog.js b/src/js/changelog.js index 6cc50993..b13ccf31 100644 --- a/src/js/changelog.js +++ b/src/js/changelog.js @@ -2,7 +2,10 @@ export const CHANGELOG = [ { version: "1.2.2", date: "07.12.2020", - entries: ["Added the ability to edit constant signals by left clicking them"], + entries: [ + "Added the ability to edit constant signals by left clicking them", + "You can now add markers in the wire layer (partially by daanbreur)", + ], }, { version: "1.2.1", diff --git a/src/js/game/hud/parts/waypoints.js b/src/js/game/hud/parts/waypoints.js index c0f94271..b16bfa9e 100644 --- a/src/js/game/hud/parts/waypoints.js +++ b/src/js/game/hud/parts/waypoints.js @@ -20,7 +20,6 @@ import { BaseItem } from "../../base_item"; import { MetaHubBuilding } from "../../buildings/hub"; import { enumMouseButton } from "../../camera"; import { KEYMAPPINGS } from "../../key_action_mapper"; -import { layers } from "../../root"; import { ShapeDefinition } from "../../shape_definition"; import { BaseHUDPart } from "../base_hud_part"; import { DynamicDomAttach } from "../dynamic_dom_attach"; @@ -92,7 +91,12 @@ export class HUDWaypoints extends BaseHUDPart { */ initialize() { // Cache the sprite for the waypoints - this.waypointSprite = Loader.getSprite("sprites/misc/waypoint.png"); + + this.waypointSprites = { + regular: Loader.getSprite("sprites/misc/waypoint.png"), + wires: Loader.getSprite("sprites/misc/waypoint_wires.png"), + }; + this.directionIndicatorSprite = Loader.getSprite("sprites/misc/hub_direction_indicator.png"); /** @type {Array} @@ -192,7 +196,10 @@ export class HUDWaypoints extends BaseHUDPart { const waypoint = this.waypoints[i]; const label = this.getWaypointLabel(waypoint); - const element = makeDiv(this.waypointsListElement, null, ["waypoint"]); + const element = makeDiv(this.waypointsListElement, null, [ + "waypoint", + "layer--" + waypoint.layer, + ]); if (ShapeDefinition.isValidShortKey(label)) { const canvas = this.getWaypointCanvas(waypoint); @@ -544,7 +551,7 @@ export class HUDWaypoints extends BaseHUDPart { const iconOpacity = 1 - this.currentCompassOpacity; if (iconOpacity > 0.01) { context.globalAlpha = iconOpacity; - this.waypointSprite.drawCentered(context, dims / 2, dims / 2, dims * 0.7); + this.waypointSprites.regular.drawCentered(context, dims / 2, dims / 2, dims * 0.7); context.globalAlpha = 1; } } @@ -623,11 +630,11 @@ export class HUDWaypoints extends BaseHUDPart { } // Render the small icon on the left - this.waypointSprite.drawCentered( + this.waypointSprites[waypoint.layer].drawCentered( parameters.context, bounds.x + contentPaddingX, bounds.y + bounds.h / 2, - bounds.h * 0.7 + bounds.h * 0.6 ); }