From 722fed9b942939e668b3117fe3a080aed14722b0 Mon Sep 17 00:00:00 2001 From: Max Litruv Boonzaayer Date: Tue, 22 Jul 2025 05:42:26 +1000 Subject: [PATCH] Made costumes work again !build --- main_scenes/main.gd | 14 ++-- ui_scenes/button sprites/checkmark.png | Bin 0 -> 2498 bytes ui_scenes/button sprites/checkmark.png.import | 34 +++++++++ ui_scenes/spriteEditMenu/sprite_viewer.gd | 56 ++++++++++++++- ui_scenes/spriteEditMenu/sprite_viewer.tscn | 68 ++++++++++++++++-- ui_scenes/spriteList/sprite_list_object.gd | 10 +++ 6 files changed, 169 insertions(+), 13 deletions(-) create mode 100644 ui_scenes/button sprites/checkmark.png create mode 100644 ui_scenes/button sprites/checkmark.png.import diff --git a/main_scenes/main.gd b/main_scenes/main.gd index 8078c0d..9b0a6e8 100644 --- a/main_scenes/main.gd +++ b/main_scenes/main.gd @@ -477,9 +477,9 @@ func _on_load_dialog_file_selected(path): if data[item].has("costumeLayers"): sprite.costumeLayers = str_to_var(data[item]["costumeLayers"]).duplicate() - if sprite.costumeLayers.size() < 8: - for i in range(5): - sprite.costumeLayers.append(1) + # Ensure we have exactly 10 costume layers + while sprite.costumeLayers.size() < 10: + sprite.costumeLayers.append(1) if data[item].has("stretchAmount"): sprite.stretchAmount = data[item]["stretchAmount"] @@ -718,9 +718,11 @@ func changeCostumeStreamDeck(id: String): "9":changeCostume(9) "10":changeCostume(10) -func changeCostume(newCostume): +func changeCostume(newCostume, preserve_selection: bool = false): costume = newCostume - Global.heldSprite = null + # Only clear heldSprite for actual costume changes, not layer updates + if not preserve_selection: + Global.heldSprite = null var nodes = get_tree().get_nodes_in_group("saved") for sprite in nodes: if sprite.costumeLayers[newCostume-1] == 1: @@ -743,7 +745,7 @@ func moveSpriteMenu(delta): var size = get_viewport().get_visible_rect().size - var windowLength = 1800 + var windowLength = 2000 $ViewerArrows/Arrows.position.y = size.y - 25 diff --git a/ui_scenes/button sprites/checkmark.png b/ui_scenes/button sprites/checkmark.png new file mode 100644 index 0000000000000000000000000000000000000000..4eddafbb8025108fba9080b4176a397b8def8edd GIT binary patch literal 2498 zcmai0eLPh88b6`(vK4n3WUFbU#K*j0YUUa(hRm8lUW#sLm^0(V%$eq#njuO`*5cy| zX%SsMcJor+vTSXc-prP6SW;qDrZyY0lj@?CduFuM*53QanVH}7{XXC4`906``<+Si z_uah2aJeA>087~3tN`rW7<-oLFTy_8l8U|p0KGaWC#Z}kViKZJRKg&UWHK31=17F4LK1~er<2H35|!$JF&vOMG0KxWh!Jaz#HF86=aMWXk%fuNpyu|m8p>U%l;5daB_lYpcE5P|nd zqd?ESpcu8*Rzg!323y1vf*epRM5CDmiqoHfZ4h5;r_I|nLa}=^od^~~SZL}z6f%!7 z2^**+$~+YMQAks2hCd_+V?$Vw2oxijDwf4;w0SV}U2rx+P%MTa0h`_NY)=mwg-)Y6P>HiLSkoAoFC>U#@lcFKB~zUp z$QvA}lprdV;Y4FNlI5Q4(eIIU@R%mcyQ zv#Z%INPf^7g;oj$^G@_NN-akX^z||>V*Y3>%m z7IXIyD8?=yDR#>^QR5c^z=DGi)|U_Z0RXnyd$P~_=(-uFwygc5c`1Ns2(--@2rRgh`MoaHW23yNd9idqjXZYW7eO4Q)ZWZ3HJn$?c zCM?a$?ruSfGML+LgPu%s?DqewsP6qkM<2S7*EJ`D` zc3)p*`=mWPXGgFglfbB2!_HRP?{ceD+N@<|wRs1gotkN?@rsn63i$cg)Nj^xB@8cA z;u7*X7)ZQB5dbjyRP!tV z3W_WMK-Z4VatpG}PRSYd2?GH|Nz?fL_6y-JcQv76NUjt>LnmH$WE^a@2(b`l9QU*^ zT|OLW>=jdDxaBa;&7|(?LT8-5GsL6Z`_k;IW9Q6wAVlGWbnN8_{Ry4ajug9^CH9Ri zn@F6R#>;`}U{C^&?RO>z^SQT_Kd96L`j;2{vM4GeX_@+vUh3=OEl|epzTg}1NY%5< z!ch~|_Z-o2*6Rss*Kbyj*&B;s&(!Cmwk>6gh?AcFQY`tTE?tuCT7~}4yod2+`-9qS zjwr;3Vmo*Gc=Lh}OY)pv$f~-w;#bjYSj{VrZd*P+@y5aOSvhg4%tkSs+T9ERdlife z5wx!j)|R)eC~h@E1xRe-Co$ie_S3>45B(VXZ%4m$U1DurWmQEt(=EKxvpS?^W$k@a zzvCxtEF4!#Y<81&SZ~U8o!V6yuhaNhXZ^Kxs=yTU&X;}4qOM05EFJMnyWOI0L4EpK(2jq!ghUep}Bb%Ci?J!vnwtC;AO-AjFV>4o~_b*W|6^XmS)VHVpj zK7SgN$WuF)XFc2EHyDOn=d7{-G zqrO2yg%JbWr+Z>JEi5UU^xTcLz9FZrQ&!irr$sJC-cHL*YjG|oJriYc-3_G zKmHlIaFXWoVA$f+H@~C=+Z{Qq7jEi~-Wj(SCOZZ)TZLy$74_+!YW21Idieo^XRgrQ zv)25+;>qNaf3dqLajqREmAHa2Yv0Sxm3_!S@1ZW`VkSM+zGsak16gkzpaTF3ddRx; zMM|SM*?G|yVM)t5%?2F_cW}w(mN)w!<@jX|kA)9ibT^6o;@@`~Vt+Dv*it_DYxyQn zIC@1x}!(