From 3ada0d577449ab3ae68c49573d4260a09f3195df Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@googlemail.com>
Date: Mon, 7 Dec 2020 18:30:33 +0100
Subject: [PATCH] Allow to cycle variants backwards with SHIFT + T, other fixes
 and misc stuff

---
 res/ui/icons/unpin_shape.png                   | Bin 0 -> 731 bytes
 shapez.code-workspace                          |   7 ++++++-
 src/css/ingame_hud/pinned_shapes.scss          |   2 +-
 src/js/changelog.js                            |   3 +++
 src/js/game/hud/parts/building_placer_logic.js |   8 +++++++-
 5 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 res/ui/icons/unpin_shape.png

diff --git a/res/ui/icons/unpin_shape.png b/res/ui/icons/unpin_shape.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1918778bdd805b6267af7e43070f7dd3bbd1cb2
GIT binary patch
literal 731
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$Sc;uILpV4%IBGajIv5xj
zI14-?iy0W0)IpeWpHK(~0|SF(iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$
zQVa}C5uPrNAr*7(&fe=M?I_~bU%~F=b;6iMvy#EZCEI-Aa>h?48lqm_tClqAX-?LA
z-=NVf;3Zm@Y<={DXhVHkS$f+0yUMvwBi|I~bl=?_$FYaOjw$^>{sV~$-}(r4zlP$b
z$BY}+u*WkkKk(#a88eU8{tH4p4bk&{&t=kPn7_<s#aq7nf^019k#+41;>BVWeH%RL
zoPKx}Y)+VXoWt;w@B^*~=|`OW1(TktAK-8BO%U1H{FOuVlX8Ny^*hGLCuH9@B=XL7
zX*+VdpYvS*4Mn>{_77@3XS)R5`)T+g@tXW63B}oaK8Psp-t$3V;fy^SWESq&<I%g}
z?w3xX6>9oAt}FEPbzENf#Fa=cEUvuh%3}O!Q5s9}r$ufon?Ef|X$krH_nH~6rr^Qe
zJtrg&&fRlD@Zj1#8Nvtm?#U2ZX#Pnlbx+y<4M$JeOD9LFKAn7FcKJWeok}~Vi03Nr
zm?rM4{KYA5iQ5Xb{UMJ%8|+)O4LA01><@mys`>x<b6K68OIFtCD{YxtE~_|w&uI?l
zOMLmke6w}qrq;Pk7MA8#{;spda&@u1;&IKjw>d1&Kfmj$VR)uMc;OS3<25Z($vT?_
zv(9}u<N6}0Aydt1`sLf_lp`c!%f${h?O7praMGR?Vh0!P(U3d1X^)23!R9?D<PJ{W
zb3*Lk;yoF%2RHA@ka?(k`TgqIs{5l4FH_uo#C-?rJ%*b8I|p~|@#y@(duVNP?L_g7
zg8!U$<Xu;<6cm0a^x*Rx*0`rf7jd{VWc%!|y|#PL4AF;75my(59|(W&EAgZLgV?9y
mQIm9=F3))IqxHd=dWQMNZ2_|lSr`}?7(8A5T-G@yGywql_BtE@

literal 0
HcmV?d00001

diff --git a/shapez.code-workspace b/shapez.code-workspace
index e8e7e5b3..8cd13e00 100644
--- a/shapez.code-workspace
+++ b/shapez.code-workspace
@@ -15,6 +15,11 @@
 		"vetur.format.defaultFormatter.ts": "vscode-typescript",
 		"editor.defaultFormatter": "esbenp.prettier-vscode",
 		"editor.formatOnSave": true,
-		"files.trimTrailingWhitespace": true
+		"files.trimTrailingWhitespace": true,
+		"workbench.colorCustomizations": {
+			"activityBar.background": "#163328",
+			"titleBar.activeBackground": "#1F4738",
+			"titleBar.activeForeground": "#F7FBFA"
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/css/ingame_hud/pinned_shapes.scss b/src/css/ingame_hud/pinned_shapes.scss
index 6f44522b..c9a39536 100644
--- a/src/css/ingame_hud/pinned_shapes.scss
+++ b/src/css/ingame_hud/pinned_shapes.scss
@@ -103,7 +103,7 @@
 
             & {
                 /* @load-async */
-                background: uiResource("icons/pin.png") center center / 95% no-repeat;
+                background: uiResource("icons/unpin_shape.png") center center / 80% no-repeat;
             }
         }
 
diff --git a/src/js/changelog.js b/src/js/changelog.js
index 0354ec27..c7b142ba 100644
--- a/src/js/changelog.js
+++ b/src/js/changelog.js
@@ -6,7 +6,10 @@ export const CHANGELOG = [
             "Added the ability to edit constant signals by left clicking them",
             "You can now add markers in the wire layer (partially by daanbreur)",
             "Allow to cycle backwards in the toolbar with SHIFT + Tab (idea by emeraldblock)",
+            "Allow to cycle variants backwards with SHIFT + T",
             "Upgrade numbers now use roman numerals until tier 50 (by LeopoldTal)",
+            "Add button to unpin shapes from the left side (by artemisSystem)",
+            "Updated translations (Thanks to all contributors!)",
         ],
     },
     {
diff --git a/src/js/game/hud/parts/building_placer_logic.js b/src/js/game/hud/parts/building_placer_logic.js
index 4f3a0570..9007511b 100644
--- a/src/js/game/hud/parts/building_placer_logic.js
+++ b/src/js/game/hud/parts/building_placer_logic.js
@@ -14,6 +14,7 @@ import { MetaMinerBuilding, enumMinerVariants } from "../../buildings/miner";
 import { enumHubGoalRewards } from "../../tutorial_goals";
 import { getBuildingDataFromCode, getCodeFromBuildingData } from "../../building_codes";
 import { MetaHubBuilding } from "../../buildings/hub";
+import { safeModulo } from "../../../core/utils";
 
 /**
  * Contains all logic for the building placer - this doesn't include the rendering
@@ -467,7 +468,12 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart {
                 index = 0;
                 console.warn("Invalid variant selected:", this.currentVariant.get());
             }
-            const newIndex = (index + 1) % availableVariants.length;
+            const direction = this.root.keyMapper.getBinding(KEYMAPPINGS.placement.rotateInverseModifier)
+                .pressed
+                ? -1
+                : 1;
+
+            const newIndex = safeModulo(index + direction, availableVariants.length);
             const newVariant = availableVariants[newIndex];
             this.setVariant(newVariant);
         }