From 352b0cfae65c11f2cb956fee673ad1b722c4148c Mon Sep 17 00:00:00 2001
From: Ryan Hughes <1630358+ryanrhughes@users.noreply.github.com>
Date: Wed, 9 Jul 2025 21:25:15 -0400
Subject: [PATCH] Update assets and reduce progress target to 70%

---
 default/plymouth/bullet.png     | Bin 358 -> 293 bytes
 default/plymouth/lock.png       | Bin 531 -> 1537 bytes
 default/plymouth/omarchy.script |  32 +++++++++++++++++---------------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/default/plymouth/bullet.png b/default/plymouth/bullet.png
index 0b3ffa7f9b4774ce001e8797360abd43060f5e16..62249b3bd82b0b670a8a503a3bb69bbfe79cc4f4 100644
GIT binary patch
literal 293
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xamSQK*5Dp-y;YjHK^6z-MIEH9U
zoIA;|uZcmx^}qZQCjEr9ou<6JoZ<!g8$L3G$h4he&e_orci_meW4Bzg^$tWS{?Qdl
zE-`(uUTt#a=UM)DQa4-ou9~H}RG;DT>t7m0FRe~3I-q?kdfVZu-@kQlF<lV&-==z1
zrSQdb^AAiPpZ~kq-Eql=@9&)1cQZ@uivQpGk|W1svUOG3Em<Z8-qo{K2F@yNU+0&Z
z#-LW~$dLS-fr&w?;V}DygD&fS1u2C;vpU5v?XKapb&JmcZCRnlxWLcI)KjFQmC-@w
pm*vu*)yAi{nI3RH`fJJ`{u$A6`iFuNJ_G&9;OXk;vd$@?2>=GdcP{_{

literal 358
zcmeAS@N?(olHy`uVBq!ia0vp^>>$j-3?$8JydD54g=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C-zo@Ck7R(g#j`g`ofc|DQ?CHvtMUmjw9*GiYr7
z>fGT3<T56CySuRTXWR?~a@b2eeO=jKva^WD2%WR(5djJ*db&7<a9mGL2nkC`5HK?n
zO9(JC3rjFCGc#-0a3Dz`lEKlDdB<Ig`4@nSRZCnWN>UO_QmvAUQh^kMk%5t^u7SC(
zfk}vwft8Vkm7#^Ufq|8QK~I<Jd=w42`6-!cmAEzhy*^hNs6hj6LrG?CYH>+oZUJsR
Us}Ak?1JuLd>FVdQ&MBb@0B-zb00000

diff --git a/default/plymouth/lock.png b/default/plymouth/lock.png
index 06bb109e0688876dcdbf100fb6c3af8395171850..3046de1b6a3f20d194f010fee671c936326beb27 100644
GIT binary patch
literal 1537
zcmaKseKgYx7{|AHUkq{cvLRb`y@V2`mnmXdjLEhr)$(pBuF;Fg7MiYcO37PGhEj}Q
zjkx2~FG}6iyi`n^Yf__8QcEw2yZ-5)d(J)Q^E}@_p65B=bDrm%=QKHZn*rPs4uL=n
zhyi{()JjnYT~}M3b6C_2wdkb;L@*(cWhOrZ3aPkg4uNP1iGDtmqZi-uNcB{I6qr4G
z#i8)RDVJ5cL1!Nt{l+uGVeBIuqiPA1leLuzROguk=T?Ra9MON;!yO9zRCRCo6Z~dO
zZEkEpocTDP92U}<@#4T*rj2a+(<m-}adHAbsdHpbTv@)9ed1#C`uKM;YldHOoPj*}
zbGeob9;A(JN1L&Qpo82i#ng+@@~!!M(#EG@=`do2gWQ|$0cf_52v4sA%|I7<SPd0h
zS#49IM;e?tEGNpLTl73Cp*ApAq~OGI#?ykqJZz$;l|;MIY0V-8(2zv6Y=|Ipi_T-+
ziNb02RaQKE&Mxn*#x0nug<#PcLwE2U-TT!T0Jul3yfhnKqm!K@6N=+{0nS)0KRSIJ
z1&9;UFF#yah(?ACCgJ-7Ke^pi^iQWca=YgHS3R-T^tN{+1Z%T6T$;2Xq4SIwn|K%p
zAkBCCEx=S74P07PAa1pb+S>x$Pv@seyCNY93qf#zr(*_!G?;{%hf$7{)0wjI)D_X(
zm}u}Ln8`jY-p@J5VO8CjI08(3E0;){?Q-|cD59AsumI2J9^x48{P#=1M@1><v?aL>
z`3H_14&4M@jmRG{e0<jO`gZtRt#?l%ewe;58(@TpB~I+&8zEOeye}VM_=`o(`MPRf
z>-T%a$_};xp+UGO5W(w?k>lx9F;;;TAULlesb+OonM22Q!c81az}6c*t>v7~tOVPm
zhU!UpisjNWSukBNpiE6b9Q+!olgTZa?zW>>3@H1~d|7^cD&u?XCD2;IcY{V&A|v%}
zdgu$wb94J!*DI4eckMCCA2lAHSD>gLRdsonw|WzWbCTnPs>+EhLc?+2mx$6;Pv&90
z`0L*_g4}j}dR=HC;<$8$V8H_R+5)ZzLV8t}3+GKlEaK#JdXNo5RObC<{#qWnTDYlq
z)?=4}W)I5KWoU07<8~IqmNFI8_hC%4r#B}#Xw19S$T7|LGujzt$Su_wD^oXACsp6Y
z@KIlS8YxqxORtv@zY6`OX~XEy`ZfP$tM|_>py#PwsWV|^yI&|}5<#J-3naFWlPt&0
zMM1pA=0DF$cD`C*@wVbov-TLG5Xo`|Cp3#t1lw$AGfc{*?c{bf87cSbWy55&%tM%p
zeXIrPK75<{GLPwF=XCHZ+fTLU^X`|r<MiR_VTrfzUoyjVPi{)t$#e`c+)^AD4VVZO
zw9?^xg)Y#akbdo$RAnC;r^~#7ctad))Y<4j&nU4dgayOaSxSblgvNP2W&0b<+<Ts{
zA7}~ATo;=AKRyHrYY<17u5I<ny7SF#xdpPyQ_mz1{)@2q>K`Cd;+jrMtGa(^cXr+}
zgVU;=CUsvl!V_DzOK)XsWtP;Abb!{3qlSAP;8kvbDCe<{Y>C!!vz1@u+lCa}en)#)
z;t*rZHexumT)tUH-d4SN1?85h(q5JM8U5Fz3%*u)MG1WJ{{KN~pSIm6Hn6(LH){pv
ze0V$g{08_ag*>vOzNWv9Sb-lDoN*Gi<Yso(PX~(HMk~n4t*+l*Vs(>YdmB~>U7k^=
z!sR4-SaIB}#^(07LN<r3MYS6$6u}SPWLfr3`&so>V=C+^Wxvp#$8peZDi2`#_iZs=
zqu`0Tb?EN1+Q1#<YJ%|slF$$hQYWJbr$~&J4MUxek_GN119xdDZ6rd&sKmyy@Ktmv
zQ<7>UGG4l`!VHb{C~R_k3u*CyVN%VraV9KWDT5xw*ws95W?`)tyZ4)2<_Ue8M2_Lb
zaSg1=`gadV(~oTBd5ZNyUQ=(QUE*OKK)-|hxBH_7i+@D@94nGF6k#qnb#ZuUGt_nK
Vg$$|X5%o`p5dDMwntbUe{{_St%Ul2e

literal 531
zcmeAS@N?(olHy`uVBq!ia0vp^nn0|>!3-qN7blhjDTQQ@AYTTCDm4a%h86~fUqGRT
z7Yq!g1`G_Z5*Qe)W-u^_7tGleXakh63GfMV1=0sjeI*0^|NsB{vISFs`h`k@{DK)c
z9qZ1Uwpy{sE=grdjQ{ofZ&~!ID4;B3lDE5yFwgFoX+REpiKnkC`%88f5hdwws`_Vv
zLX$jQ978NlKfQdC@2~<7OTcE8!V{OS{r|sFG%RE#)A3@T%a*-Igu59Q{Z>CRrMT;0
zYqN}`jKwK+WwXWR*%Q{!d1I<IV}`o!#c7_2xn7fXi)EkR+OaLiJ9hKR>ywHn`klJt
zWO(U9(#cDAlg#T?#h<ZGuCcL-U+1E&X1++)M(`r@H2;Wwbr1VwI`>!pk$+hK`B5da
z%Wi`Z;R#BHK-a03xJHzuB$lLFB^RXvDF!10BU4=ib6o?I5F-OCV-qVQb8Q0yD+2@l
z|GBqOH00)|WTsW())2SoYC2GZ2Hb{{%-q!ClEmBs+<G{-f7t=l!{F)a=d#Wzp$PyN
CN6S(G

diff --git a/default/plymouth/omarchy.script b/default/plymouth/omarchy.script
index 0c7245c..07b2cd0 100644
--- a/default/plymouth/omarchy.script
+++ b/default/plymouth/omarchy.script
@@ -10,7 +10,7 @@ logo.sprite.SetY (Window.GetY() + Window.GetHeight() / 2 - logo.image.GetHeight(
 logo.sprite.SetOpacity (1);
 
 # Use these to adjust the progress bar timing
-global.fake_progress_limit = 0.8;  # Target percentage for fake progress (0.0 to 1.0)
+global.fake_progress_limit = 0.7;  # Target percentage for fake progress (0.0 to 1.0)
 global.fake_progress_duration = 15.0;  # Duration in seconds to reach limit
 
 # Progress bar animation variables
@@ -104,7 +104,6 @@ fun stop_fake_progress()
 
 #----------------------------------------- Dialogue --------------------------------
 
-# Dialog elements - create once, reuse
 lock.image = Image("lock.png");
 entry.image = Image("entry.png");
 bullet.image = Image("bullet.png");
@@ -115,9 +114,16 @@ entry.y = logo.sprite.GetY() + logo.image.GetHeight() + 40;
 entry.sprite.SetPosition(entry.x, entry.y, 10001);
 entry.sprite.SetOpacity(0);
 
-lock.sprite = Sprite(lock.image);
-lock.x = entry.x - lock.image.GetWidth() - 10;
-lock.y = entry.y + entry.image.GetHeight()/2 - lock.image.GetHeight()/2;
+# Scale lock to be slightly shorter than entry field height
+# Original lock is 84x96, entry height determines scale
+lock_height = entry.image.GetHeight() * 0.8;
+lock_scale = lock_height / 96;
+lock_width = 84 * lock_scale;
+
+scaled_lock = lock.image.Scale(lock_width, lock_height);
+lock.sprite = Sprite(scaled_lock);
+lock.x = entry.x - lock_width - 15;
+lock.y = entry.y + entry.image.GetHeight()/2 - lock_height/2;
 lock.sprite.SetPosition(lock.x, lock.y, 10001);
 lock.sprite.SetOpacity(0);
 
@@ -131,14 +137,8 @@ fun display_normal_callback ()
     # Get current mode
     mode = Plymouth.GetMode();
     
-    # Only require password_shown check for boot and resume modes
-    show_progress = 0;
+    # Only show progress bar for boot and resume modes
     if ((mode == "boot" || mode == "resume") && global.password_shown == 1)
-      show_progress = 1;
-    else if (mode != "boot" && mode != "resume")
-      show_progress = 1;
-    
-    if (show_progress == 1)
       {
         show_progress_bar();
         start_fake_progress();
@@ -162,9 +162,11 @@ fun display_password_callback (prompt, bullets)
       {
         if (!bullet.sprites[index])
           {
-            bullet.sprites[index] = Sprite(bullet.image);
-            bullet.x = entry.x + 20 + index * (bullet.image.GetWidth() + 5);
-            bullet.y = entry.y + entry.image.GetHeight() / 2 - bullet.image.GetHeight() / 2;
+            # Scale bullet image to 7x7 pixels
+            scaled_bullet = bullet.image.Scale(7, 7);
+            bullet.sprites[index] = Sprite(scaled_bullet);
+            bullet.x = entry.x + 20 + index * (7 + 5);
+            bullet.y = entry.y + entry.image.GetHeight() / 2 - 3.5;
             bullet.sprites[index].SetPosition(bullet.x, bullet.y, 10002);
           }
         bullet.sprites[index].SetOpacity(1);