From c434f7a59f5a46081c8d72717206541675e32c9d Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 11 Jun 2020 11:51:24 +0200 Subject: [PATCH] Multiple fixes (see changelog) --- res/ui/icons/blueprint_marker_inverted.png | Bin 0 -> 2158 bytes res/ui/icons/current_goal_marker_inverted.png | Bin 0 -> 2224 bytes src/css/ingame_hud/keybindings_overlay.scss | 13 +++++- src/css/ingame_hud/pinned_shapes.scss | 43 ++++++++++++------ src/css/ingame_hud/unlock_notification.scss | 4 +- src/js/changelog.js | 4 ++ src/js/core/config.js | 6 +-- src/js/game/hud/parts/buildings_toolbar.js | 5 ++ src/js/game/hud/parts/keybinding_overlay.js | 26 +++++++++-- translations/base-en.yaml | 4 +- 10 files changed, 79 insertions(+), 26 deletions(-) create mode 100644 res/ui/icons/blueprint_marker_inverted.png create mode 100644 res/ui/icons/current_goal_marker_inverted.png diff --git a/res/ui/icons/blueprint_marker_inverted.png b/res/ui/icons/blueprint_marker_inverted.png new file mode 100644 index 0000000000000000000000000000000000000000..79140f195b2fa42a03f4d2828449cc2662c9f8bb GIT binary patch literal 2158 zcmbVOeM}Q)9Ip5=Q86Q8%rxqGAZYY@A8n7`&8pCXpcD}r(Zx-!cW=u<+pE2!9~c33 zY;zLvBj_JWbSiTjo0<(r%y1HQZVqFd=)`Z-O=sM6k-1F+%ib%c!$qChC3pAU`#$gU zdww79FSjNycTU`}vBNYPOUiAzGuEF)Qfh_)?%CcHk5}CiMOnhfzcnOlYCON?5&S zP%LJZ`#?c?u8l7*#=WyF4-*G@)T$7LL_v97VzqrPPF`sRofn z);z>4`2b?j(il(b4M-}ZC25_WVWuM#K^k$wh?6>uq**<|QWO%oP-x93IM{qkX2cf! zGNHwa;$?9>5C~`kI<4e$;v~Z`I6>hQg+T-+hdc@w#5{6hAA<$RyifEhqU1qTM$Rsk zDJB#u?RCNJjnaDLNSI*2@F3^KNiCte6b1@>6z47Txx&T;9tSSq1|CI*STc(B7E6jG z7fa8ejxIl80EX6TjoNss7PmWULRK>T(2Ynyo{E-jAuqu5fh?8zc#z?TG80vAysX&= zI7RZ=B+1p6sJuSOh}oOK zdIC!|r0OtUujep^wv!mga5{>hIbAAE^|8(OiSSHvuKuj5DgiQ50;M-PcmWDB8Zg4H z*JE~);xL_q5lFkN8M#CxTt6(wtLMUm@@hc<0gX(H zPl?A1S&r-v6az^5oGR(HE=vw2!1+L$6UOdE3K4&newp(>U;T?^vsYGs^-nF_|EWF_ z9KM+II00<6II8-Ct4*mlHTb`?7GCSu!1~~@E2_h2JBA<8h7LTC+6UY9?o-`oG@6*P z*_JfhqNBfTIaHdkAmOV@r{9^ho2a(7W;S*Vx_n`@b5r%ul?k-?`MfQ2Asw>kH z+SX?_?Qg2<_%p32rE}f;?dj>WR~03$%$j-f_C`pUxNO-o}p|CIRd z_`u1r4Rgz4kr77+oCgc3?UvPt_Ov?-x?7e^SiU*4^XA3J$9FDe^4`Av>4=)5n4Y#3 zan~=eyQ&}4J@;X9Rr}1``F9_dcYijji)kFVd)$JvEmt>Gbsn8W6|4{|jwo|tZgn)9 z+phmrv;CBR;*oowbeG&{s4<#q<5ni$Axx%tf-Ka&w07~$UEhB@e1GY|_?PMS5<}|b zhJ~}(MOcW>a8+VNv*_{ATcd%byNO3kR0)4PT#mF}MQ`fHAJuQWF9d+SDz&f1w@ zF*qGKn)`*$ZOV!7wmc%_ojD6XK6b0B zXIt0dYZosr{>IYzpsr*}%7@%*D-&nrT;fMv*kzo0HaR)juc^>Xyn3eYK-UJH`bUtR Lk!#tTUbO0Ok?R1H literal 0 HcmV?d00001 diff --git a/res/ui/icons/current_goal_marker_inverted.png b/res/ui/icons/current_goal_marker_inverted.png new file mode 100644 index 0000000000000000000000000000000000000000..327ce170c10175892e3f7afbfaf2c677d4ea6b91 GIT binary patch literal 2224 zcmbVO32+lt7!H?0DV z=`{v~!F77bNNR9{R!5QpAOgcpC}u)&ErJ^;9YzrZ6uDrTO<+Bg(>f%=C4ZS=pCpAS z6fGzy&=hDjyx>J~k|a@#KnVho5r|kAl;|)L6qA}PSb@k0Tu9>hAf#BN-F%*8hGnIV zE(AhRvq3QuCOKeem=2-122)&W0J2OJ7s?a-4dg6?0zU|Vpd`vzJc2%t_N@_7OSZ27XxB*mK$Wf1@^@q&xz z{Y{C=YLX0DEJ|WXsP8B)$nphZzh--Ym6m`RCNKg+Fg=3nTsT4LiT)TtVOS&1!LyvF zusP0v;J6FNDczGexn5XWqW>MqGL(lG0<`QZ7ofcW4F$b06b&F{;r+ZIQ_7;W&FAeF zOP0WUIKR9gI)|n~cALe3lLiAqXz&K14hLlqiV_`UfZb|_<*;Ztj-?E&&g5o1CPeEo z>JbL$aKw#~I6@i$z-XZL(4@X;zm;e5l;kV>8_xmDGqR1pi=H|39QZS1KE2HJAR+di|f$BVl2DbkGar-ipGC zGpN#q8k2(lJzouL%{o>STyBHPFxr3Rk7x%6LD{q*_h(!E8M*DZoM^WWcIE87vB;d+ ziH<)otr~4PBmo&P2Yn-^Dw~YExz=zyDRDj0r&HMniS?>32|C?`ImPPl(%iM}i}zoM zIl416yW8C5*n~8wcWJt5M@^6R@mp(lZf_k_CufiYA1{8a)qay&y`ud3s>JJ+*Awnn zv`c*O=;6JwngXH!R93qM`uJ$is*EWwNcGvHZRTmz;-zOwV{=N+*2H%&tEs+t)1!rM zvYRulXv#-zGrM+)Nt##t;a95K+FDP|%$2)mT$+_xd~1;B-f#Er713K=DPYs)&9Tdi zTJ(ieXMLUUd!J=TV%5~x{V~BjDS5+4=EkM(Md-bh6Jph|eLt5c8qISKXFa&RZ9=YZ z+Ulyb@kj5J;0Y&iXZ4AcMJ>mioZ4z(y?T17D`nG~CB~7vihY;Yovx^x5SMmgy81qv zhE?=9(C^(f$2Yav+0&o=vNZ08xV@%%+413ycdl-ujfJiDSPKmxd41~**M9U}Re#&V zx!KgImrG6Gzmj1)^wyGmIuwY@xTxLIS;J$8)KpByXLT_{w&eb#3RH;IpLX8XZuQa< z^)JI?>D=P;V-}pddL?6Qi^@|+zI^qt*V#2?{wUR@I`Z0)euEF}Y29XF*^K#bw~d8g zda!Za-SHtranslation guide!", "Update stacker artwork to clarify how it works", + "Update keybinding hints on the top left to be more accurate", + "Make it more clear when blueprints are unlocked when trying to use them", + "Fix pinned shape icons not being visible in dark mode", + "Fix being able to select buildings via hotkeys in map overview mode", "Make shapes unpinnable in the upgrades tab (By hexy)", ], }, diff --git a/src/js/core/config.js b/src/js/core/config.js index 540bccfd..1fad8e2e 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -92,9 +92,9 @@ export const globalConfig = { // disableZoomLimits: true, // showChunkBorders: true, // rewardsInstant: true, - allBuildingsUnlocked: true, - blueprintsNoCost: true, - upgradesNoCost: true, + // allBuildingsUnlocked: true, + // blueprintsNoCost: true, + // upgradesNoCost: true, // disableUnlockDialog: true, // disableLogicTicks: true, // testClipping: true, diff --git a/src/js/game/hud/parts/buildings_toolbar.js b/src/js/game/hud/parts/buildings_toolbar.js index 691185c9..305d3eee 100644 --- a/src/js/game/hud/parts/buildings_toolbar.js +++ b/src/js/game/hud/parts/buildings_toolbar.js @@ -151,6 +151,11 @@ export class HUDBuildingsToolbar extends BaseHUDPart { return; } + if (this.root.camera.getIsMapOverlayActive()) { + this.root.soundProxy.playUiError(); + return; + } + // Allow clicking an item again to deselect it for (const buildingId in this.buildingHandles) { const handle = this.buildingHandles[buildingId]; diff --git a/src/js/game/hud/parts/keybinding_overlay.js b/src/js/game/hud/parts/keybinding_overlay.js index 05455065..25774305 100644 --- a/src/js/game/hud/parts/keybinding_overlay.js +++ b/src/js/game/hud/parts/keybinding_overlay.js @@ -2,6 +2,7 @@ import { makeDiv } from "../../../core/utils"; import { T } from "../../../translations"; import { getStringForKeyCode, KEYMAPPINGS } from "../../key_action_mapper"; import { BaseHUDPart } from "../base_hud_part"; +import { TrackedState } from "../../../core/tracked_state"; export class HUDKeybindingOverlay extends BaseHUDPart { initialize() { @@ -9,6 +10,8 @@ export class HUDKeybindingOverlay extends BaseHUDPart { this.onSelectedBuildingForPlacementChanged, this ); + + this.trackedMapOverviewActive = new TrackedState(this.applyCssClasses, this); } createElements(parent) { @@ -35,10 +38,16 @@ export class HUDKeybindingOverlay extends BaseHUDPart { -
+
+ +
+ + +
+
${getKeycode( @@ -65,12 +74,17 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
+ ` + + (this.root.app.settings.getAllSettings().alwaysMultiplace + ? "" + : `
${getKeycode( KEYMAPPINGS.placementModifiers.placeMultiple )} -
+
`) + + ` ` ); } @@ -79,5 +93,11 @@ export class HUDKeybindingOverlay extends BaseHUDPart { this.element.classList.toggle("placementActive", !!selectedMetaBuilding); } - update() {} + applyCssClasses() { + this.element.classList.toggle("mapOverviewActive", this.root.camera.getIsMapOverlayActive()); + } + + update() { + this.trackedMapOverviewActive.set(this.root.camera.getIsMapOverlayActive()); + } } diff --git a/translations/base-en.yaml b/translations/base-en.yaml index 7f529537..bfc0f3c5 100644 --- a/translations/base-en.yaml +++ b/translations/base-en.yaml @@ -253,14 +253,14 @@ dialogs: blueprintsNotUnlocked: title: Not unlocked yet desc: >- - Blueprints have not been unlocked yet! Complete more levels to unlock them. + Complete level 12 to unlock Blueprints! keybindingsIntroduction: title: Useful keybindings desc: >- This game has a lot of keybindings which make it easier to build big factories. Here are a few, but be sure to check out the keybindings!

- CTRL + Drag: Select area to copy / delete.
+ CTRL + Drag: Select area to delete.
SHIFT: Hold to place multiple of one building.
ALT: Invert orientation of placed belts.