From 95fc53ee123389dcd3226757acdad15ce8bfda77 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Fri, 7 Nov 2025 05:27:58 +0000
Subject: [PATCH 01/26] Testing out github actions workflow

---
 .github/workflows/build.yml | 59 +++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..73d1437
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,59 @@
+name: Build Simitone
+
+on:
+  workflow_dispatch:
+    inputs:
+      configuration:
+        description: 'Build configuration'
+        required: false
+        default: 'Release'
+        type: choice
+        options:
+          - Release
+          - Debug
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Setup .NET 9
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '9.0.x'
+
+    - name: Run Protobuild
+      shell: pwsh
+      run: |
+        cd FreeSO/Other/libs/FSOMonoGame/
+        ./protobuild.exe --generate
+      continue-on-error: true
+
+    - name: Restore Simitone dependencies
+      run: dotnet restore Client/Simitone/Simitone.sln
+
+    - name: Restore FreeSO dependencies
+      run: dotnet restore FreeSO/TSOClient/FreeSO.sln
+      continue-on-error: true
+
+    - name: Restore Roslyn dependencies
+      shell: pwsh
+      run: |
+        cd FreeSO/TSOClient/FSO.SimAntics.JIT.Roslyn/
+        dotnet restore
+      continue-on-error: true
+
+    - name: Build
+      run: dotnet build Client/Simitone/Simitone.sln -c ${{ inputs.configuration || 'Release' }} --no-restore
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: SimitoneWindows-${{ inputs.configuration || 'Release' }}
+        path: Client/Simitone/Simitone.Windows/bin/${{ inputs.configuration || 'Release' }}/net9.0-windows/
+        if-no-files-found: error

From a65dcc478f6e82ec0a8d9923a8a96304da0153eb Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Tue, 20 Jan 2026 20:30:35 +0000
Subject: [PATCH 02/26] First pass with eyedropper tool

---
 .../uigraphics/live/cat/cat_eyedropper.png    | Bin 0 -> 485 bytes
 .../Panels/LiveSubpanels/UIBuyBrowsePanel.cs  |  69 ++++++++++++++++++
 .../UI/Panels/UIObjectHolder.cs               |  23 +++++-
 3 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 Client/Simitone/Simitone.Client/Content/uigraphics/live/cat/cat_eyedropper.png

diff --git a/Client/Simitone/Simitone.Client/Content/uigraphics/live/cat/cat_eyedropper.png b/Client/Simitone/Simitone.Client/Content/uigraphics/live/cat/cat_eyedropper.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c9ad47796b8ac6caf3089904fa078c9241b7a6c
GIT binary patch
literal 485
zcmeAS@N?(olHy`uVBq!ia0vp^jv&mz1|<8wpL7LMEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
za0`Jj<E6WGe}IBwC9V-A&PAz-C7Jno3L%-fsSE}d`UZyjhUP*avl@UZWI!r{^V3So
z6N^$A98>a>QWe}Xi&D$;i?WLqoP*6??Ag@Az`$th>EaktG3V{gi@t{qL|88fA7QxL
z(075CL%M`nqH$sZvzfx(2Ei9>IRbW*{sb%))#%eMTz^I0{_9bzO)<xFf9?Bzzc{#>
z>G}i(4yL9C1qBW))B?Rje6qhjUhYj^y?kZG-fx||<&)iWuFvyWJN1GUt3lt^)#qHk
zv9K^YItT~=sXJnC_8xxb^Y+g7XP;X8?aybZsq%SC?|E4F@>nw84QU54PtF!U%LYw$
zZn;%n3TsOF@~34@=?#=@Np76yIzN!<;ZBG1i_U9&)!KXXa_g_hK5wsnm}NVCI``N3
z<=1MRy1&o7)%;LAZEH%h2*OTBhkrGWcc*SJzr*b_Q_nlh|LoKP)06YCdIv7}KswLQ
WT+!jDBp)!q89ZJ6T-G@yGywn;!>&{S

literal 0
HcmV?d00001

diff --git a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
index d331844..de3a430 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
@@ -329,6 +329,10 @@ static UIBuyBrowsePanel()
 
         public bool HoldingEvents;
 
+        // Eyedropper tool support
+        public UICatButton EyedropperButton;
+        private bool EyedropperMode;
+
         public UIBuyBrowsePanel(TS1GameScreen screen, sbyte category, UICatalogMode mode) : base(screen) {
             CatContainer = new UITouchScroll(() => FilterCategory?.Count() ?? 0, CatalogElemProvider);
             CatContainer.ItemWidth = 90;
@@ -347,7 +351,70 @@ public UIBuyBrowsePanel(TS1GameScreen screen, sbyte category, UICatalogMode mode
             screen.LotControl.ObjectHolder.OnPickup += ObjectHolder_OnPickup;
             screen.LotControl.ObjectHolder.OnPutDown += ObjectHolder_OnPutDown;
             screen.LotControl.ObjectHolder.OnDelete += ObjectHolder_OnDelete;
+            screen.LotControl.ObjectHolder.OnEyedropperPick += ObjectHolder_OnEyedropperPick;
             HoldingEvents = true;
+
+            // Create eyedropper button - TODO: Replace cat_eyedropper.png with a proper eyedropper icon
+            var ui = Content.Get().CustomUI;
+            EyedropperButton = new UICatButton(ui.Get("cat_eyedropper.png").Get(GameFacade.GraphicsDevice));
+            EyedropperButton.Y = 8;
+            EyedropperButton.X = 8; // Position at left side
+            EyedropperButton.OnButtonClick += ToggleEyedropper;
+            Add(EyedropperButton);
+        }
+
+        private void ToggleEyedropper(UIElement btn)
+        {
+            EyedropperMode = !EyedropperMode;
+            EyedropperButton.Selected = EyedropperMode;
+            Game.LotControl.ObjectHolder.EyedropperMode = EyedropperMode;
+        }
+
+        private void ObjectHolder_OnEyedropperPick(uint guid)
+        {
+            // Turn off eyedropper mode
+            EyedropperMode = false;
+            EyedropperButton.Selected = false;
+            Game.LotControl.ObjectHolder.EyedropperMode = false;
+
+            // Select the item in catalog
+            SelectItemByGUID(guid);
+        }
+
+        /// <summary>
+        /// Finds an item by GUID in the current catalog and selects it.
+        /// </summary>
+        public void SelectItemByGUID(uint guid)
+        {
+            if (FilterCategory == null) return;
+
+            // Find the item index in the current filtered category
+            int index = 0;
+            foreach (var item in FilterCategory)
+            {
+                if (item.Item.GUID == guid)
+                {
+                    // Found it - select it
+                    Selected(index);
+                    return;
+                }
+                index++;
+            }
+
+            // If not found in current category, search in FullCategory
+            index = 0;
+            foreach (var item in FullCategory)
+            {
+                if (item.Item.GUID == guid)
+                {
+                    // Found it - need to show all items first, then select
+                    FilterCategory = FullCategory;
+                    CatContainer.Reset();
+                    Selected(index);
+                    return;
+                }
+                index++;
+            }
         }
 
         private void ObjectHolder_OnDelete(UIObjectSelection holding, UpdateState state)
@@ -392,6 +459,8 @@ private void RemoveEvents()
                 Game.LotControl.ObjectHolder.OnPickup -= ObjectHolder_OnPickup;
                 Game.LotControl.ObjectHolder.OnPutDown -= ObjectHolder_OnPutDown;
                 Game.LotControl.ObjectHolder.OnDelete -= ObjectHolder_OnDelete;
+                Game.LotControl.ObjectHolder.OnEyedropperPick -= ObjectHolder_OnEyedropperPick;
+                Game.LotControl.ObjectHolder.EyedropperMode = false;
                 Game.LotControl.QueryPanel.Active = false;
                 Game.Frontend.MainPanel.SetSubpanelPickup(1f);
 
diff --git a/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs b/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
index 457dbc7..a01eefc 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
@@ -50,6 +50,11 @@ public class UIObjectHolder //controls the object holder interface
         public bool Roommate = true;
         public bool UseNet = false;
 
+        // Eyedropper tool support
+        public bool EyedropperMode;
+        public event EyedropperEventHandler OnEyedropperPick;
+        public delegate void EyedropperEventHandler(uint guid);
+
         public event HolderEventHandler OnPickup;
         public event HolderEventHandler OnDelete;
         public event HolderEventHandler OnPutDown;
@@ -412,7 +417,23 @@ public void Update(UpdateState state, bool scrolled)
             {
                 //not holding an object, but one can be selected
                 var newHover = World.GetObjectIDAtScreenPos(state.MouseState.X, state.MouseState.Y, GameFacade.GraphicsDevice);
-                if (MouseClicked && (newHover != 0) && (vm.GetObjectById(newHover) is VMGameObject))
+
+                // Eyedropper mode - pick object GUID instead of selecting to move
+                if (EyedropperMode && newHover != 0 && vm.GetObjectById(newHover) is VMGameObject)
+                {
+                    var obj = vm.GetObjectById(newHover);
+                    uint guid = obj.Object.OBJ.GUID;
+                    if (obj.MasterDefinition != null) guid = obj.MasterDefinition.GUID;
+
+                    var catalogItem = Content.Get().WorldCatalog.GetItemByGUID(guid);
+                    if (catalogItem != null)
+                    {
+                        OnEyedropperPick?.Invoke(guid);
+                        HITVM.Get().PlaySoundEvent(UISounds.ObjectPlace);
+                    }
+                    // Don't process normal click when in eyedropper mode
+                }
+                else if (MouseClicked && (newHover != 0) && (vm.GetObjectById(newHover) is VMGameObject))
                 {
                     var objGroup = vm.GetObjectById(newHover).MultitileGroup;
                     var objBasePos = objGroup.BaseObject.Position;

From da634ef74d0588db674f03d531bee97a926308e6 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Tue, 20 Jan 2026 22:16:01 +0000
Subject: [PATCH 03/26] adding image reference

---
 Client/Simitone/Simitone.Client/Simitone.Client.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Client/Simitone/Simitone.Client/Simitone.Client.csproj b/Client/Simitone/Simitone.Client/Simitone.Client.csproj
index 1e2baf0..fade365 100644
--- a/Client/Simitone/Simitone.Client/Simitone.Client.csproj
+++ b/Client/Simitone/Simitone.Client/Simitone.Client.csproj
@@ -308,6 +308,9 @@
     <Content Include="Content\uigraphics\live\cat\cat_other.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\uigraphics\live\cat\cat_eyedropper.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\uigraphics\live\cat\cat_plum.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

From 7a46b27b6901d5da90aaf3beb1dcbb6da490e6e7 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Wed, 21 Jan 2026 14:28:05 +0000
Subject: [PATCH 04/26] Giving this a shot

---
 .../Panels/LiveSubpanels/UIBuyBrowsePanel.cs  | 104 +++++++++++++++---
 .../Simitone.Client/UI/Panels/UIMainPanel.cs  |   3 +
 2 files changed, 92 insertions(+), 15 deletions(-)

diff --git a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
index de3a430..52cdf37 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
@@ -332,6 +332,7 @@ static UIBuyBrowsePanel()
         // Eyedropper tool support
         public UICatButton EyedropperButton;
         private bool EyedropperMode;
+        private bool CheckedPendingEyedropper;
 
         public UIBuyBrowsePanel(TS1GameScreen screen, sbyte category, UICatalogMode mode) : base(screen) {
             CatContainer = new UITouchScroll(() => FilterCategory?.Count() ?? 0, CatalogElemProvider);
@@ -361,6 +362,25 @@ public UIBuyBrowsePanel(TS1GameScreen screen, sbyte category, UICatalogMode mode
             EyedropperButton.X = 8; // Position at left side
             EyedropperButton.OnButtonClick += ToggleEyedropper;
             Add(EyedropperButton);
+
+        }
+
+        /// <summary>
+        /// Checks if there's a pending eyedropper GUID to select after a category switch.
+        /// Called from Update since Parent may not be set during constructor.
+        /// </summary>
+        private void CheckPendingEyedropperSelection()
+        {
+            if (CheckedPendingEyedropper) return;
+            CheckedPendingEyedropper = true;
+
+            var mainPanel = Parent as UIMainPanel;
+            if (mainPanel?.PendingEyedropperGUID != null)
+            {
+                var guid = mainPanel.PendingEyedropperGUID.Value;
+                mainPanel.PendingEyedropperGUID = null;
+                SelectItemInCurrentCategory(guid);
+            }
         }
 
         private void ToggleEyedropper(UIElement btn)
@@ -382,38 +402,89 @@ private void ObjectHolder_OnEyedropperPick(uint guid)
         }
 
         /// <summary>
-        /// Finds an item by GUID in the current catalog and selects it.
+        /// Finds an item by GUID in the catalog and selects it.
+        /// If the item is in a different category, switches to that category first.
         /// </summary>
         public void SelectItemByGUID(uint guid)
         {
-            if (FilterCategory == null) return;
+            // First, look up the item in the world catalog to find its category
+            var catalogItem = Content.Get().WorldCatalog.GetItemByGUID(guid);
+            if (catalogItem == null) return;
 
-            // Find the item index in the current filtered category
-            int index = 0;
-            foreach (var item in FilterCategory)
+            var targetCategory = catalogItem.Value.Category;
+
+            // Check if item is in a different category
+            if (targetCategory != Category)
             {
-                if (item.Item.GUID == guid)
+                // Store the GUID to select after category switch
+                var mainPanel = Parent as UIMainPanel;
+                if (mainPanel != null)
                 {
-                    // Found it - select it
-                    Selected(index);
-                    return;
+                    mainPanel.PendingEyedropperGUID = guid;
+                    // Switch to the target category - this will create a new panel
+                    mainPanel.Switcher.Select(targetCategory);
                 }
-                index++;
+                return;
             }
 
-            // If not found in current category, search in FullCategory
-            index = 0;
+            // Item is in this category - select it
+            SelectItemInCurrentCategory(guid);
+        }
+
+        /// <summary>
+        /// Selects an item by GUID within the current category.
+        /// </summary>
+        private void SelectItemInCurrentCategory(uint guid)
+        {
+            // If we're still choosing subcategory, skip to show all items
+            if (ChoosingSub)
+            {
+                ChoosingSub = false;
+                foreach (var btn in SelButtons)
+                {
+                    Remove(btn);
+                }
+                foreach (var label in SelLabels)
+                {
+                    Remove(label);
+                }
+                SelButtons.Clear();
+                SelLabels.Clear();
+
+                // Show all items in this category
+                FilterCategory = FullCategory.Where(x => GetSubsort(x.Item) > 0);
+                CatContainer.Opacity = 1f;
+                CatContainer.Reset();
+            }
+
+            // Search in FilterCategory first
+            if (FilterCategory != null)
+            {
+                int index = 0;
+                foreach (var item in FilterCategory)
+                {
+                    if (item.Item.GUID == guid)
+                    {
+                        Selected(index);
+                        return;
+                    }
+                    index++;
+                }
+            }
+
+            // If not found in filtered, search in FullCategory
+            int fullIndex = 0;
             foreach (var item in FullCategory)
             {
                 if (item.Item.GUID == guid)
                 {
-                    // Found it - need to show all items first, then select
+                    // Show all items and select
                     FilterCategory = FullCategory;
                     CatContainer.Reset();
-                    Selected(index);
+                    Selected(fullIndex);
                     return;
                 }
-                index++;
+                fullIndex++;
             }
         }
 
@@ -853,6 +924,9 @@ public override void GameResized()
 
         public override void Update(UpdateState state)
         {
+            // Check for pending eyedropper selection (after category switch)
+            CheckPendingEyedropperSelection();
+
             Invalidate();
             var first = SelButtons.FirstOrDefault();
             if (first != null && first.Opacity == 0)
diff --git a/Client/Simitone/Simitone.Client/UI/Panels/UIMainPanel.cs b/Client/Simitone/Simitone.Client/UI/Panels/UIMainPanel.cs
index 1d98575..e20b3fb 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/UIMainPanel.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/UIMainPanel.cs
@@ -57,6 +57,9 @@ public float CurWidth
         public event Action OnEndSelect;
         public event Action<UIMainPanelMode> ModeChanged;
 
+        // Eyedropper tool support - stores GUID to select after category switch
+        public uint? PendingEyedropperGUID;
+
         public string[] FloorNames = new string[]
         {
             "1st",

From 859c1847b9510af17f57e67f2dc607094274855a Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Wed, 21 Jan 2026 14:59:40 +0000
Subject: [PATCH 05/26] checkpoint empty commit


From a070a7efd2ead2ca1734574e1f629ee766b87dbd Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Wed, 21 Jan 2026 16:01:25 +0000
Subject: [PATCH 06/26] UI adjustments

---
 .../uigraphics/desktop/d_live_eyedropper.png  | Bin 0 -> 351 bytes
 .../Simitone.Client/Simitone.Client.csproj    |   6 ++--
 .../UI/Controls/UITouchScroll.cs              |  10 ++++++
 .../UI/Panels/Desktop/UIDesktopUCP.cs         |  34 ++++++++++++++++++
 .../Panels/LiveSubpanels/UIBuyBrowsePanel.cs  |  25 ++-----------
 .../UI/Panels/UIObjectHolder.cs               |   1 -
 6 files changed, 50 insertions(+), 26 deletions(-)
 create mode 100644 Client/Simitone/Simitone.Client/Content/uigraphics/desktop/d_live_eyedropper.png

diff --git a/Client/Simitone/Simitone.Client/Content/uigraphics/desktop/d_live_eyedropper.png b/Client/Simitone/Simitone.Client/Content/uigraphics/desktop/d_live_eyedropper.png
new file mode 100644
index 0000000000000000000000000000000000000000..30b7d74955852d5879eafcb94808ac93dbf21bae
GIT binary patch
literal 351
zcmV-l0igbgP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00009a7bBm000XU
z000XU0RWnu7ytkP5lKWrRCt{2mBC8GKoCIpDkxGlp=ZJW(*8&q|3dI1^cQ-tB#K}|
z@zDH)o<t8%2Idg#Hf-9-N+9nN*j?uBY-VSj8yO<N5pWCCz_)&L8Shg%0Sf#)^&(g4
z3+?3pAr)#X;X;KWQsK)=T+)q=g){}Kj^eqcv<lonaZptQ39!;&@4)oWn2%TB+*G<_
zE{?QCF48k+_)pV-bwU|iTIt<h_IA8o)&&8a0B?I_>RlHMaIeAEF{KIcBfS;4j3O0)
znFf4xv7~|sHR!dAD814n{s2xrb8B;{pxs8u8jt*qo`P%$t#&)9(0J4(qYU_LbRsFZ
xJK)$^!*<(~EFZMsF3g1<`Lky4y-p*8;ujN~kmM>eO)~%h002ovPDHLkV1g&Mlnwv@

literal 0
HcmV?d00001

diff --git a/Client/Simitone/Simitone.Client/Simitone.Client.csproj b/Client/Simitone/Simitone.Client/Simitone.Client.csproj
index fade365..59c536b 100644
--- a/Client/Simitone/Simitone.Client/Simitone.Client.csproj
+++ b/Client/Simitone/Simitone.Client/Simitone.Client.csproj
@@ -89,6 +89,9 @@
     <Content Include="Content\uigraphics\desktop\d_live_buy.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\uigraphics\desktop\d_live_eyedropper.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\uigraphics\desktop\d_live_floordown.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -308,9 +311,6 @@
     <Content Include="Content\uigraphics\live\cat\cat_other.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\uigraphics\live\cat\cat_eyedropper.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\uigraphics\live\cat\cat_plum.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/Client/Simitone/Simitone.Client/UI/Controls/UITouchScroll.cs b/Client/Simitone/Simitone.Client/UI/Controls/UITouchScroll.cs
index af2da19..b7b8fc8 100644
--- a/Client/Simitone/Simitone.Client/UI/Controls/UITouchScroll.cs
+++ b/Client/Simitone/Simitone.Client/UI/Controls/UITouchScroll.cs
@@ -197,6 +197,16 @@ public void SetScroll(float value)
             Scroll = value;
         }
 
+        public void ScrollToItem(int itemIndex)
+        {
+            // Center the item in the visible area
+            var targetScroll = itemIndex * ItemWidth - (GetPAxis(Size) / 2) + (ItemWidth / 2);
+            // Clamp to valid scroll range
+            var length = LengthProvider();
+            Scroll = Math.Max(-Margin, Math.Min(length * ItemWidth - GetPAxis(Size) + Margin, targetScroll));
+            ScrollVelocity = 0; // Stop any ongoing momentum
+        }
+
         public override void Draw(UISpriteBatch batch)
         {
             if (!Visible) return;
diff --git a/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs b/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
index 74602ab..276395b 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
@@ -25,6 +25,7 @@ public class UIDesktopUCP : UICachedContainer
     {
         public UIImage Background;
         public UIImage FriendIcon;
+        public UIButton EyedropperButton;
 
         public UIButton LiveButton;
         public UIButton BuyButton;
@@ -90,6 +91,16 @@ public UIDesktopUCP(TS1GameScreen screen)
             FriendIcon = new UIImage(ui.Get("d_live_friend.png").Get(gd)) { Position = new Vector2(156, 186) };
             Add(FriendIcon);
 
+            // Eyedropper button - visible only in Buy/Build mode
+            Add(EyedropperButton = new UIStencilButton(ui.Get("d_live_eyedropper.png").Get(gd))
+            {
+                Position = new Vector2(196, 186),
+                Shadow = true,
+                ShadowParam = sDir
+            });
+            EyedropperButton.OnButtonClick += ToggleEyedropper;
+            EyedropperButton.Visible = false; // Hidden by default (LIVE mode)
+
             Add(LiveButton = new UIButton(ui.Get("d_live_live.png").Get(gd)) { Position = new Vector2(15, 2) });
             Add(BuyButton = new UIButton(ui.Get("d_live_buy.png").Get(gd)) { Position = new Vector2(107, 27) });
             Add(BuildButton = new UIButton(ui.Get("d_live_build.png").Get(gd)) { Position = new Vector2(179, 80) });
@@ -322,6 +333,12 @@ public override void Update(UpdateState state)
 
             if (LastZoom != Game.ZoomLevel) UpdateZoomButton();
 
+            // Sync eyedropper button state with ObjectHolder (for when it's auto-disabled after pick)
+            if (EyedropperButton.Visible && Game.LotControl?.ObjectHolder != null)
+            {
+                EyedropperButton.Selected = Game.LotControl.ObjectHolder.EyedropperMode;
+            }
+
             base.Update(state);
 
             //KEY SHORTCUTS
@@ -390,12 +407,29 @@ public void UpdateZoomButton()
             LastZoom = Game.ZoomLevel;
         }
 
+        private void ToggleEyedropper(UIElement btn)
+        {
+            var holder = Game.LotControl.ObjectHolder;
+            holder.EyedropperMode = !holder.EyedropperMode;
+            EyedropperButton.Selected = holder.EyedropperMode;
+        }
+
         public void SetMode(UIMainPanelMode mode)
         {
             LiveButton.Selected = mode == UIMainPanelMode.LIVE;
             BuyButton.Selected = mode == UIMainPanelMode.BUY;
             BuildButton.Selected = mode == UIMainPanelMode.BUILD;
             OptionsButton.Selected = mode == UIMainPanelMode.OPTIONS;
+
+            // Show eyedropper only in BUY or BUILD mode
+            EyedropperButton.Visible = (mode == UIMainPanelMode.BUY || mode == UIMainPanelMode.BUILD);
+            // Reset selection when changing modes
+            if (!EyedropperButton.Visible)
+            {
+                EyedropperButton.Selected = false;
+                if (Game.LotControl?.ObjectHolder != null)
+                    Game.LotControl.ObjectHolder.EyedropperMode = false;
+            }
         }
 
         public void DisplayChange(int change)
diff --git a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
index 52cdf37..f0644be 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
@@ -329,9 +329,6 @@ static UIBuyBrowsePanel()
 
         public bool HoldingEvents;
 
-        // Eyedropper tool support
-        public UICatButton EyedropperButton;
-        private bool EyedropperMode;
         private bool CheckedPendingEyedropper;
 
         public UIBuyBrowsePanel(TS1GameScreen screen, sbyte category, UICatalogMode mode) : base(screen) {
@@ -354,15 +351,6 @@ public UIBuyBrowsePanel(TS1GameScreen screen, sbyte category, UICatalogMode mode
             screen.LotControl.ObjectHolder.OnDelete += ObjectHolder_OnDelete;
             screen.LotControl.ObjectHolder.OnEyedropperPick += ObjectHolder_OnEyedropperPick;
             HoldingEvents = true;
-
-            // Create eyedropper button - TODO: Replace cat_eyedropper.png with a proper eyedropper icon
-            var ui = Content.Get().CustomUI;
-            EyedropperButton = new UICatButton(ui.Get("cat_eyedropper.png").Get(GameFacade.GraphicsDevice));
-            EyedropperButton.Y = 8;
-            EyedropperButton.X = 8; // Position at left side
-            EyedropperButton.OnButtonClick += ToggleEyedropper;
-            Add(EyedropperButton);
-
         }
 
         /// <summary>
@@ -383,18 +371,9 @@ private void CheckPendingEyedropperSelection()
             }
         }
 
-        private void ToggleEyedropper(UIElement btn)
-        {
-            EyedropperMode = !EyedropperMode;
-            EyedropperButton.Selected = EyedropperMode;
-            Game.LotControl.ObjectHolder.EyedropperMode = EyedropperMode;
-        }
-
         private void ObjectHolder_OnEyedropperPick(uint guid)
         {
-            // Turn off eyedropper mode
-            EyedropperMode = false;
-            EyedropperButton.Selected = false;
+            // Turn off eyedropper mode (button state is synced in UIDesktopUCP)
             Game.LotControl.ObjectHolder.EyedropperMode = false;
 
             // Select the item in catalog
@@ -466,6 +445,7 @@ private void SelectItemInCurrentCategory(uint guid)
                     if (item.Item.GUID == guid)
                     {
                         Selected(index);
+                        CatContainer.ScrollToItem(index);
                         return;
                     }
                     index++;
@@ -482,6 +462,7 @@ private void SelectItemInCurrentCategory(uint guid)
                     FilterCategory = FullCategory;
                     CatContainer.Reset();
                     Selected(fullIndex);
+                    CatContainer.ScrollToItem(fullIndex);
                     return;
                 }
                 fullIndex++;
diff --git a/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs b/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
index a01eefc..d716b51 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
@@ -429,7 +429,6 @@ public void Update(UpdateState state, bool scrolled)
                     if (catalogItem != null)
                     {
                         OnEyedropperPick?.Invoke(guid);
-                        HITVM.Get().PlaySoundEvent(UISounds.ObjectPlace);
                     }
                     // Don't process normal click when in eyedropper mode
                 }

From 8f6fb4e319595647bf576b986b1654061512daf7 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Wed, 21 Jan 2026 16:59:41 +0000
Subject: [PATCH 07/26] some more tweaks

---
 .../UI/Panels/Desktop/UIDesktopUCP.cs          |  6 +++---
 .../Panels/LiveSubpanels/UIBuyBrowsePanel.cs   | 18 ++++++++++++++++++
 README.md                                      |  4 ++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs b/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
index 276395b..efd47e7 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
@@ -94,7 +94,7 @@ public UIDesktopUCP(TS1GameScreen screen)
             // Eyedropper button - visible only in Buy/Build mode
             Add(EyedropperButton = new UIStencilButton(ui.Get("d_live_eyedropper.png").Get(gd))
             {
-                Position = new Vector2(196, 186),
+                Position = new Vector2(196, 180),
                 Shadow = true,
                 ShadowParam = sDir
             });
@@ -421,8 +421,8 @@ public void SetMode(UIMainPanelMode mode)
             BuildButton.Selected = mode == UIMainPanelMode.BUILD;
             OptionsButton.Selected = mode == UIMainPanelMode.OPTIONS;
 
-            // Show eyedropper only in BUY or BUILD mode
-            EyedropperButton.Visible = (mode == UIMainPanelMode.BUY || mode == UIMainPanelMode.BUILD);
+            // Show eyedropper only in BUY mode (Build mode not yet supported)
+            EyedropperButton.Visible = (mode == UIMainPanelMode.BUY);
             // Reset selection when changing modes
             if (!EyedropperButton.Visible)
             {
diff --git a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
index f0644be..f10316e 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
@@ -395,6 +395,24 @@ public void SelectItemByGUID(uint guid)
             // Check if item is in a different category
             if (targetCategory != Category)
             {
+                // Validate that the target category is valid for the current mode
+                // Buy mode uses categories 0-7, Build mode uses different categories
+                if (Mode == UICatalogMode.Build)
+                {
+                    // Build mode - can't switch to buy categories via eyedropper
+                    // Build categories are handled differently (13-18), so just return
+                    return;
+                }
+                else
+                {
+                    // Buy mode - only categories 0-7 are valid
+                    if (targetCategory < 0 || targetCategory > 7)
+                    {
+                        // This item is in a build category, can't select in buy mode
+                        return;
+                    }
+                }
+
                 // Store the GUID to select after category switch
                 var mainPanel = Parent as UIMainPanel;
                 if (mainPanel != null)
diff --git a/README.md b/README.md
index 54e32fd..9a16c53 100644
--- a/README.md
+++ b/README.md
@@ -27,3 +27,7 @@ On modern operating systems, The Sims has a few nagging issues that make it less
 Simitone -> Semitone -> musical term -> C# -> a note
 
 Further questions can be directed at my PR manager, uh, ... burglar cop.
+
+# Attributions
+
+Icon for Eyedropper tool: <a target="_blank" href="https://icons8.com/icon/78728/color-dropper">eyedropper</a> icon by <a target="_blank" href="https://icons8.com">Icons8</a>

From a37123abbd9648a55a668d2f3c4318785cab6013 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Wed, 21 Jan 2026 17:47:01 +0000
Subject: [PATCH 08/26] adding cursor icon for eyedropper, tool tips, and more
 UI adjustments.

---
 .../Content/Cursors/eyedropper.cur            | Bin 0 -> 3782 bytes
 .../uigraphics/desktop/d_live_eyedropper.png  | Bin 351 -> 956 bytes
 .../Simitone/Simitone.Client/SimitoneGame.cs  |   2 +
 .../UI/Panels/Desktop/UIDesktopUCP.cs         |  39 ++++++------
 .../UI/Panels/UIObjectHolder.cs               |  10 ++-
 .../Simitone.Client/Utils/SimitoneCursors.cs  |  59 ++++++++++++++++++
 6 files changed, 91 insertions(+), 19 deletions(-)
 create mode 100644 Client/Simitone/Simitone.Client/Content/Cursors/eyedropper.cur
 create mode 100644 Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs

diff --git a/Client/Simitone/Simitone.Client/Content/Cursors/eyedropper.cur b/Client/Simitone/Simitone.Client/Content/Cursors/eyedropper.cur
new file mode 100644
index 0000000000000000000000000000000000000000..692bbc10ad1e397e80c222d695302aacfd5550a3
GIT binary patch
literal 3782
zcmeH}-%1-n6vn4`5sKE-TEz=7r6BYnLi;M}a|lW5QwTnUzJc+=QY(eF6fg85`UKId
zMTbs*pYF=K*-4Ic*WP%-Z)bAm<okC1>=Nf*@L5@LT;I9fS?3m=b02_|YlHHN*Nn|i
z-*KCGzWlcp2q7%OH#mm(PjMru=P%kU5<0uE0dMQN2edUug}gg(1zFtC*@l^_{n7lM
znslU1e-74R4>Whh56~l1S)jKH(!YdeUN{~5O{>s)RPC*~Dc177>XXx%%l5xgZ*+Br
z6njPAI=%5*0G%PNcj<FPzLt5Ty8{aCXX!pF50$Ptdapp|RuSDt#_I6adjFI$aRN(`
z{WjH={Wg}v%QT;oI=z3s#B?qB5>3l~^RsYd(H~cX#>BNO)W}!wzBl7^En@}U2m4(Z
z<LiCMd)}fyt_F>fc^7i`hPh5v-o>+)J;OPxk?vPAFUQTvGKNOpd&DG?=vuTV)u4S8
z(T}B1Cuv&75kCMur`dmnm|vDpEV|YjMCXj&XI4#Xozc5z)q6}`>aBBI7KbGN`8>z&
zN80ci&fq$2d$hHA#_r`gf42gxz0VlZAGDwm{KZu8=l$R>2QcjTVe-i*n=PMwY<k~n
m_&?2_4~@PLTl+rryPIL)+F|IHLjpb}(1tGT!=Rn{sQnAPuk5@4

literal 0
HcmV?d00001

diff --git a/Client/Simitone/Simitone.Client/Content/uigraphics/desktop/d_live_eyedropper.png b/Client/Simitone/Simitone.Client/Content/uigraphics/desktop/d_live_eyedropper.png
index 30b7d74955852d5879eafcb94808ac93dbf21bae..0d4a33427b5c1e66513f251e7cc3f53bf7efcdfc 100644
GIT binary patch
literal 956
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}EvXTnX}-P;
zT0k}j11qBt12aeo5Hc`IF|dN!3=Ce3(r|VVqXtwB69YqgCIbspO%#v@0S_Ps>W0$H
z3m6e5E?|PI7FxiJV1u+}PQD)oq&N#aB8wRqxP?KOkzv*x37~0_nIRD+5xzcF$@#f@
zi7EL>sd^Q;1t47vHWgMtW^QUpqC!P(PF}H9g{=};g%ywu64qBz04piUwpEJo4N!2-
zFG^J~(=*UBP_pAvP*AWbN=dT{a&d!d2l8x{GD=Dctn~HE%ggo3jrH=2()A53EiLs8
zjP#9+bb%^#i!1X=5-W7`ij^UTz|3(;Elw`VEGWs$&r<-Io0ybeT4JlD1hNPYAnq*5
zOhed|R}A$Q(1ZFQ8GS=N1AVyJK&>_)Q7iwV%v7MwAoJ}EZNMr~#Gv-r=z}araty?$
zU{Rn~?YM08;lXCdB^mdS9T><to-U3d7J^eJ`T8+A3bY0)WJSC<#r=YF%3Ae;hi*3{
zl3bi0v3_A`>6LyI8u2RA<lv4^>5JJe*Im7$Y-`-$tlA$Q`}dWvFYnY-T!Kz3mKB|Q
z{c>l>I<*RMlisz0aoV{JJD&OKelpxp!KfY=Zzp-^=H(OT8y?*jHtwFRJBQ2h4*MNO
z<qwQHYQbFg=i1YR+~XdkJ^t6kT<~TVXO3;y`ewrlrq9jlnd;$B;u9F=HMXj4+LOyy
z@GRRcyvt~(fokE~N6JMrYbTZOiHk9reyiI@FLuw<JMPJbpNb1jW8Bg$@;5#7wSD)-
zwEe-I?3<Z8CV0-i<23oi5^LS|d6E$Y^ZuF|vFb@ZkiD~`;Bur|to`+iXKGb-zl$8y
zzR~CZpxq`vXz{eUE=h(>?gm?o_b}%H9iZvAFwOAM-y1@QWNY|yHkn^2di?0W%h{wO
zQCs$1V>Ycm+cx`1^-FKVv(+mD_&u}#Kg$%Z6xE5(I`@%3)NRkdS8HvOK}p!t)z4*}
HQ$iB}hUqhH

delta 338
zcmV-Y0j>VL2j2oAiBL{Q4GJ0x0000DNk~Le0000U0000U2nGNE06Q?QqLIEBe-TMU
zK~#90?Ulhw!$1%~_bMn-HKAw0|I+?Q8vjD@BlH(~uq29LL-El3gq}nXPX^`?>^5xL
z$x0ya64+hl?QCXeof{b<z!7i@)WElXa~bbbIspp&JoO@1=?m@T{~;A>E8#+gAyVPX
zN?g*7jfFG?s*d8hrL+p%Kygr2e*+1y(qQkv^v{@&SK!=Kx??Vmv_&q`GiUfu(|~nC
z8CzQE-Cp)~yj|7>0h|DDdt~Ze7YuN(!PYUQ3GgGm6}XHd6@Zxrd~~s-f(SL}wTmdd
z(j)!=PCavLbE%-+M#vhE{EeQ1YzVD(JE_ok)Fq<~_-u3{DY!e}*jdANDBF`PAGF{u
k%!MBLvu5wTP9uZj7ZaS2<SH{wGXMYp07*qoM6N<$g1AqWM*si-

diff --git a/Client/Simitone/Simitone.Client/SimitoneGame.cs b/Client/Simitone/Simitone.Client/SimitoneGame.cs
index 52ca85b..612e161 100644
--- a/Client/Simitone/Simitone.Client/SimitoneGame.cs
+++ b/Client/Simitone/Simitone.Client/SimitoneGame.cs
@@ -23,6 +23,7 @@
 using MSDFData;
 using FSO.LotView.Model;
 using Simitone.Client.UI.Panels;
+using Simitone.Client.Utils;
 
 namespace Simitone.Client
 {
@@ -148,6 +149,7 @@ protected override void Initialize()
             {
                 CurLoader.BmpLoaderFunc = ImageLoader.BaseFunction;
                 GameFacade.Cursor.Init(GlobalSettings.Default.TS1HybridPath, true);
+                SimitoneCursors.Init(GraphicsDevice);
             }
 
             /** Init any computed values **/
diff --git a/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs b/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
index efd47e7..5ff93cc 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
@@ -91,42 +91,45 @@ public UIDesktopUCP(TS1GameScreen screen)
             FriendIcon = new UIImage(ui.Get("d_live_friend.png").Get(gd)) { Position = new Vector2(156, 186) };
             Add(FriendIcon);
 
-            // Eyedropper button - visible only in Buy/Build mode
+            // Eyedropper button - visible only in Buy mode (Build mode not yet supported)
             Add(EyedropperButton = new UIStencilButton(ui.Get("d_live_eyedropper.png").Get(gd))
             {
-                Position = new Vector2(196, 180),
+                Position = new Vector2(155, 164),
                 Shadow = true,
-                ShadowParam = sDir
+                ShadowParam = sDir,
+                Tooltip = "Eyedropper Tool"
             });
             EyedropperButton.OnButtonClick += ToggleEyedropper;
             EyedropperButton.Visible = false; // Hidden by default (LIVE mode)
 
-            Add(LiveButton = new UIButton(ui.Get("d_live_live.png").Get(gd)) { Position = new Vector2(15, 2) });
-            Add(BuyButton = new UIButton(ui.Get("d_live_buy.png").Get(gd)) { Position = new Vector2(107, 27) });
-            Add(BuildButton = new UIButton(ui.Get("d_live_build.png").Get(gd)) { Position = new Vector2(179, 80) });
-            Add(OptionsButton = new UIButton(ui.Get("d_live_opt.png").Get(gd)) { Position = new Vector2(242, 165) });
+            Add(LiveButton = new UIButton(ui.Get("d_live_live.png").Get(gd)) { Position = new Vector2(15, 2), Tooltip = "Live Mode" });
+            Add(BuyButton = new UIButton(ui.Get("d_live_buy.png").Get(gd)) { Position = new Vector2(107, 27), Tooltip = "Buy Mode" });
+            Add(BuildButton = new UIButton(ui.Get("d_live_build.png").Get(gd)) { Position = new Vector2(179, 80), Tooltip = "Build Mode" });
+            Add(OptionsButton = new UIButton(ui.Get("d_live_opt.png").Get(gd)) { Position = new Vector2(242, 165), Tooltip = "Options" });
 
-            Add(FloorUpButton = new UIStencilButton(ui.Get("d_live_floorup.png").Get(gd)) { Position = new Vector2(16, 150), Shadow = true, ShadowParam = sDir });
-            Add(FloorDownButton = new UIStencilButton(ui.Get("d_live_floordown.png").Get(gd)) { Position = new Vector2(16, 192), Shadow = true, ShadowParam = sDir });
+            Add(FloorUpButton = new UIStencilButton(ui.Get("d_live_floorup.png").Get(gd)) { Position = new Vector2(16, 150), Shadow = true, ShadowParam = sDir, Tooltip = "Floor Up" });
+            Add(FloorDownButton = new UIStencilButton(ui.Get("d_live_floordown.png").Get(gd)) { Position = new Vector2(16, 192), Shadow = true, ShadowParam = sDir, Tooltip = "Floor Down" });
 
-            Add(RoofButton = new UIStencilButton(ui.Get("d_live_w1.png").Get(gd)) { Position = new Vector2(15, 111), Shadow = true, ShadowParam = sDir });
-            Add(WallsUpButton = new UIStencilButton(ui.Get("d_live_w2.png").Get(gd)) { Position = new Vector2(50, 107), Shadow = true, ShadowParam = sDir });
-            Add(WallsCutButton = new UIStencilButton(ui.Get("d_live_w3.png").Get(gd)) { Position = new Vector2(86, 112), Shadow = true, ShadowParam = sDir });
-            Add(WallsDownButton = new UIStencilButton(ui.Get("d_live_w4.png").Get(gd)) { Position = new Vector2(117, 122), Shadow = true, ShadowParam = sDir });
+            Add(RoofButton = new UIStencilButton(ui.Get("d_live_w1.png").Get(gd)) { Position = new Vector2(15, 111), Shadow = true, ShadowParam = sDir, Tooltip = "Roof" });
+            Add(WallsUpButton = new UIStencilButton(ui.Get("d_live_w2.png").Get(gd)) { Position = new Vector2(50, 107), Shadow = true, ShadowParam = sDir, Tooltip = "Walls Up" });
+            Add(WallsCutButton = new UIStencilButton(ui.Get("d_live_w3.png").Get(gd)) { Position = new Vector2(86, 112), Shadow = true, ShadowParam = sDir, Tooltip = "Walls Cutaway" });
+            Add(WallsDownButton = new UIStencilButton(ui.Get("d_live_w4.png").Get(gd)) { Position = new Vector2(117, 122), Shadow = true, ShadowParam = sDir, Tooltip = "Walls Down" });
 
-            Add(ZoomInButton = new UIStencilButton(ui.Get("d_live_zoomp.png").Get(gd)) { Position = new Vector2(87, 154) });
-            Add(ZoomOutButton = new UIStencilButton(ui.Get("d_live_zoomm.png").Get(gd)) { Position = new Vector2(87, 196) });
-            Add(RotateCWButton = new UIStencilButton(ui.Get("d_live_rotcw.png").Get(gd)) { Position = new Vector2(62, 175) });
-            Add(RotateCCWButton = new UIStencilButton(ui.Get("d_live_rotccw.png").Get(gd)) { Position = new Vector2(114, 175) });
+            Add(ZoomInButton = new UIStencilButton(ui.Get("d_live_zoomp.png").Get(gd)) { Position = new Vector2(87, 154), Tooltip = "Zoom In" });
+            Add(ZoomOutButton = new UIStencilButton(ui.Get("d_live_zoomm.png").Get(gd)) { Position = new Vector2(87, 196), Tooltip = "Zoom Out" });
+            Add(RotateCWButton = new UIStencilButton(ui.Get("d_live_rotcw.png").Get(gd)) { Position = new Vector2(62, 175), Tooltip = "Rotate Clockwise" });
+            Add(RotateCCWButton = new UIStencilButton(ui.Get("d_live_rotccw.png").Get(gd)) { Position = new Vector2(114, 175), Tooltip = "Rotate Counter-Clockwise" });
 
             SpeedButtons = new UIButton[4];
+            var speedTooltips = new string[] { "Pause", "Normal Speed", "Fast", "Ultra Fast" };
             for (int i=0; i<4; i++)
             {
                 Add(SpeedButtons[i] = new UIStencilButton(ui.Get($"d_live_speed{i+1}.png").Get(gd))
                 {
                     Position = new Vector2(158 + 30 * i, 246),
                     Shadow = true,
-                    ShadowParam = sDir
+                    ShadowParam = sDir,
+                    Tooltip = speedTooltips[i]
                 });
                 var speed = i + 1;
                 SpeedButtons[i].OnButtonClick += (btn) =>
diff --git a/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs b/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
index d716b51..136cfa1 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
@@ -26,6 +26,7 @@
 using FSO.Common.Rendering.Framework;
 using FSO.Content;
 using FSO.Client;
+using Simitone.Client.Utils;
 
 namespace Simitone.Client.UI.Panels
 {
@@ -465,7 +466,14 @@ public void Update(UpdateState state, bool scrolled)
 
             if (ParentControl.MouseIsOn && !ParentControl.RMBScroll)
             {
-                GameFacade.Cursor.SetCursor(cur);
+                if (EyedropperMode && Holding == null)
+                {
+                    SimitoneCursors.SetEyedropperCursor();
+                }
+                else
+                {
+                    GameFacade.Cursor.SetCursor(cur);
+                }
             }
 
             MouseWasDown = MouseIsDown;
diff --git a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
new file mode 100644
index 0000000..c606ef2
--- /dev/null
+++ b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
@@ -0,0 +1,59 @@
+using FSO.Common.Rendering.Framework;
+using FSO.Common.Utils;
+using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Input;
+using System.IO;
+
+namespace Simitone.Client.Utils
+{
+    /// <summary>
+    /// Manages Simitone-specific custom cursors that aren't part of FreeSO.
+    /// </summary>
+    public static class SimitoneCursors
+    {
+        private static MouseCursor EyedropperCursor;
+        private static bool Initialized;
+
+        /// <summary>
+        /// Initialize Simitone-specific cursors.
+        /// </summary>
+        public static void Init(GraphicsDevice gd)
+        {
+            if (Initialized) return;
+
+            // Load the eyedropper cursor from the Content folder
+            var cursorPath = Path.Combine("Content", "Cursors", "eyedropper.cur");
+            if (File.Exists(cursorPath))
+            {
+                using (var stream = File.Open(cursorPath, FileMode.Open, FileAccess.Read, FileShare.Read))
+                {
+                    var cursorData = CurLoader.LoadMonoCursor(gd, stream);
+                    EyedropperCursor = cursorData.MouseCursor;
+                }
+            }
+
+            Initialized = true;
+        }
+
+        /// <summary>
+        /// Sets the eyedropper cursor if available, otherwise uses a fallback.
+        /// </summary>
+        public static void SetEyedropperCursor()
+        {
+            if (EyedropperCursor != null)
+            {
+                Mouse.SetCursor(EyedropperCursor);
+            }
+            else
+            {
+                // Fallback to LiveObjectAvail if custom cursor not available
+                CursorManager.INSTANCE?.SetCursor(CursorType.LiveObjectAvail);
+            }
+        }
+
+        /// <summary>
+        /// Returns true if the eyedropper cursor was loaded successfully.
+        /// </summary>
+        public static bool HasEyedropperCursor => EyedropperCursor != null;
+    }
+}

From 3bad1d2ed1ef766d7fe23c8911f58cda1bc25fa8 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Wed, 21 Jan 2026 18:16:53 +0000
Subject: [PATCH 09/26] more UI tweaks and upates

---
 .../Simitone.Client/Simitone.Client.csproj        |  3 +++
 .../Simitone.Client/UI/Controls/UITouchScroll.cs  | 15 +++++++++++++++
 .../UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs   |  4 ++--
 .../Simitone.Client/Utils/SimitoneCursors.cs      |  3 ++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Client/Simitone/Simitone.Client/Simitone.Client.csproj b/Client/Simitone/Simitone.Client/Simitone.Client.csproj
index 59c536b..d279950 100644
--- a/Client/Simitone/Simitone.Client/Simitone.Client.csproj
+++ b/Client/Simitone/Simitone.Client/Simitone.Client.csproj
@@ -11,6 +11,9 @@
   </PropertyGroup>
   
   <ItemGroup>
+    <Content Include="Content\Cursors\eyedropper.cur">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\3D\TEX_0.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/Client/Simitone/Simitone.Client/UI/Controls/UITouchScroll.cs b/Client/Simitone/Simitone.Client/UI/Controls/UITouchScroll.cs
index b7b8fc8..939d639 100644
--- a/Client/Simitone/Simitone.Client/UI/Controls/UITouchScroll.cs
+++ b/Client/Simitone/Simitone.Client/UI/Controls/UITouchScroll.cs
@@ -207,6 +207,21 @@ public void ScrollToItem(int itemIndex)
             ScrollVelocity = 0; // Stop any ongoing momentum
         }
 
+        /// <summary>
+        /// Selects an item by its index programmatically, triggering the visual highlight.
+        /// </summary>
+        public void SelectItem(int itemIndex)
+        {
+            if (itemIndex < 0 || itemIndex >= LengthProvider()) return;
+            var rItem = GetOrPrepare(itemIndex);
+            if (rItem != null)
+            {
+                LastSelected?.Deselected();
+                rItem.Selected();
+                LastSelected = rItem;
+            }
+        }
+
         public override void Draw(UISpriteBatch batch)
         {
             if (!Visible) return;
diff --git a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
index f10316e..4f2edc0 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
@@ -462,7 +462,7 @@ private void SelectItemInCurrentCategory(uint guid)
                 {
                     if (item.Item.GUID == guid)
                     {
-                        Selected(index);
+                        CatContainer.SelectItem(index);
                         CatContainer.ScrollToItem(index);
                         return;
                     }
@@ -479,7 +479,7 @@ private void SelectItemInCurrentCategory(uint guid)
                     // Show all items and select
                     FilterCategory = FullCategory;
                     CatContainer.Reset();
-                    Selected(fullIndex);
+                    CatContainer.SelectItem(fullIndex);
                     CatContainer.ScrollToItem(fullIndex);
                     return;
                 }
diff --git a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
index c606ef2..45efdaf 100644
--- a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
+++ b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
@@ -1,3 +1,4 @@
+using FSO.Common;
 using FSO.Common.Rendering.Framework;
 using FSO.Common.Utils;
 using Microsoft.Xna.Framework.Graphics;
@@ -22,7 +23,7 @@ public static void Init(GraphicsDevice gd)
             if (Initialized) return;
 
             // Load the eyedropper cursor from the Content folder
-            var cursorPath = Path.Combine("Content", "Cursors", "eyedropper.cur");
+            var cursorPath = Path.Combine(FSOEnvironment.ContentDir, "Cursors", "eyedropper.cur");
             if (File.Exists(cursorPath))
             {
                 using (var stream = File.Open(cursorPath, FileMode.Open, FileAccess.Read, FileShare.Read))

From b8e381559ba52ac92964ac752592413bbc2abf94 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Wed, 21 Jan 2026 19:34:18 +0000
Subject: [PATCH 10/26] adjusting cursor

---
 .../Content/Cursors/eyedropper.cur            | Bin 3782 -> 4286 bytes
 .../Simitone.Client/Utils/SimitoneCursors.cs  |  15 ++++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Client/Simitone/Simitone.Client/Content/Cursors/eyedropper.cur b/Client/Simitone/Simitone.Client/Content/Cursors/eyedropper.cur
index 692bbc10ad1e397e80c222d695302aacfd5550a3..2185e23fdd4887f39d0e69e82240ce816c9cc48a 100644
GIT binary patch
literal 4286
zcmd^?y-!n77{)J(A2nd1)LMuJ!iPbPiXTBV8gL*%W1?|za031V6BnlzV`AdM<UqpY
zWSn5o$pIZ`3TT3b6euW$7*~riDM&c}9_S^dw$fV*i%;@!Z_hpFJkNRG_ndpNtX)=-
zRa0YG#a5;DqRg^<mSr_Unyfa+Q~m;;IYbft#hr#Ucf&nN>VBtuNT(Q<zzXPv2jM=b
z_FZs0y=bk{J_3)!6R-v<t;*m5sJO_-c3?k~R>3py5^RA@P(JFRd?_ySQSiL@e7?HT
z(b34**w|EUZS7q&F2K|9EIbG0MddAzij#6ukbI!+i$o%mCW%BMu{<y^@TR-F`+?W%
zl@G;09&~>S9)+c_ARburn56MA9S8*a7Z(?Q+FpKvzP`TaB_$;%(Nk`klh=ZI_yDAb
z_EY9=Dlac@@9OG$I5;@?idZD{Y<zrtf-or;@^G<`9vXmj;_>*R+wDHj+;;8xc+@xv
z<Uu*YgX*B*9$4$3G&(yw?=!zVXpO4-QZ%d3j%=p~YOP!IW8*cNs&mCaHMf@MJUlqs
z8;5{uO?hDdNn3kwQ=W75kbY(|O>XE1iUH}4X3KL99%@nZLpRjfoij=Sbv`Z+f2*}D
z9<(<uC#k&EKzVQk<>4cchiEi9?f3gN*B|vxx5|`$GxWPczpL;%Y)_6+92}q3tWW3R
zmi3;D!$dM(GaO^np-^ZV&0A1@>Y&bQd2oarJ-F#tkJTx85JpBuVhG)V9Z=`B_D^0O
za>zv;eVWNbY+c<Lj?zyakEavO+faE>{`BtDd(-i|JBx?4TI1ObwC8MX`zj9=6%}3R
z*&cLe9)^3NV`T8qLR$ygpKZ<bYnq2^h#rG_XXb^pdWe$qjhLrv+rPu%aLna$-9zvu
zR1Ca%i6;l8dayONx(0*6mkif_&^tvr_$N@`BU@>vK99v>-w-Uw`epnb(Dw>>pQ@AX
zp4Z7T!`fg2%sc;#-2}c-JTj3@*KVJko&Cx{eY53V|C@wUe&C^eD-S(AJ<k}Tb2zX4
zpCXs>RvxJHu)W^Y>+taKDD_{-Ko@j;24@t^(1?cX5g^vH%Ye%q>wZjg8Qt}b?D*Wv
zAd_p8zI)P{>)8LMUuvD$_e<P-4;VA=HfG_8F+Uby+?XZ)16W!Kn8a$USqW5|)z)5P
ks^1#Z`^A_LTo^JY9;Aas2djF6CRlCE5S(vapV@5SHydn7dH?_b

literal 3782
zcmeH}-%1-n6vn4`5sKE-TEz=7r6BYnLi;M}a|lW5QwTnUzJc+=QY(eF6fg85`UKId
zMTbs*pYF=K*-4Ic*WP%-Z)bAm<okC1>=Nf*@L5@LT;I9fS?3m=b02_|YlHHN*Nn|i
z-*KCGzWlcp2q7%OH#mm(PjMru=P%kU5<0uE0dMQN2edUug}gg(1zFtC*@l^_{n7lM
znslU1e-74R4>Whh56~l1S)jKH(!YdeUN{~5O{>s)RPC*~Dc177>XXx%%l5xgZ*+Br
z6njPAI=%5*0G%PNcj<FPzLt5Ty8{aCXX!pF50$Ptdapp|RuSDt#_I6adjFI$aRN(`
z{WjH={Wg}v%QT;oI=z3s#B?qB5>3l~^RsYd(H~cX#>BNO)W}!wzBl7^En@}U2m4(Z
z<LiCMd)}fyt_F>fc^7i`hPh5v-o>+)J;OPxk?vPAFUQTvGKNOpd&DG?=vuTV)u4S8
z(T}B1Cuv&75kCMur`dmnm|vDpEV|YjMCXj&XI4#Xozc5z)q6}`>aBBI7KbGN`8>z&
zN80ci&fq$2d$hHA#_r`gf42gxz0VlZAGDwm{KZu8=l$R>2QcjTVe-i*n=PMwY<k~n
m_&?2_4~@PLTl+rryPIL)+F|IHLjpb}(1tGT!=Rn{sQnAPuk5@4

diff --git a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
index 45efdaf..5bd5e99 100644
--- a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
+++ b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
@@ -3,6 +3,7 @@
 using FSO.Common.Utils;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
+using System;
 using System.IO;
 
 namespace Simitone.Client.Utils
@@ -26,10 +27,18 @@ public static void Init(GraphicsDevice gd)
             var cursorPath = Path.Combine(FSOEnvironment.ContentDir, "Cursors", "eyedropper.cur");
             if (File.Exists(cursorPath))
             {
-                using (var stream = File.Open(cursorPath, FileMode.Open, FileAccess.Read, FileShare.Read))
+                try
                 {
-                    var cursorData = CurLoader.LoadMonoCursor(gd, stream);
-                    EyedropperCursor = cursorData.MouseCursor;
+                    using (var stream = File.Open(cursorPath, FileMode.Open, FileAccess.Read, FileShare.Read))
+                    {
+                        var cursorData = CurLoader.LoadMonoCursor(gd, stream);
+                        EyedropperCursor = cursorData.MouseCursor;
+                    }
+                }
+                catch (Exception)
+                {
+                    // Cursor file is invalid - will use fallback
+                    EyedropperCursor = null;
                 }
             }
 

From 16a1d372149e9eeef2215653849ad8827eadd17a Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Wed, 21 Jan 2026 20:13:11 +0000
Subject: [PATCH 11/26] cursor fixes

---
 .../UI/Panels/UIObjectHolder.cs               |  6 ++++++
 .../Simitone.Client/Utils/SimitoneCursors.cs  | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs b/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
index 136cfa1..81f5af6 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
@@ -472,9 +472,15 @@ public void Update(UpdateState state, bool scrolled)
                 }
                 else
                 {
+                    SimitoneCursors.ClearEyedropperCursor();
                     GameFacade.Cursor.SetCursor(cur);
                 }
             }
+            else
+            {
+                // Mouse left the area or scrolling - clear eyedropper cursor priority
+                SimitoneCursors.ClearEyedropperCursor();
+            }
 
             MouseWasDown = MouseIsDown;
         }
diff --git a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
index 5bd5e99..5279308 100644
--- a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
+++ b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
@@ -15,6 +15,7 @@ public static class SimitoneCursors
     {
         private static MouseCursor EyedropperCursor;
         private static bool Initialized;
+        private static bool EyedropperActive;
 
         /// <summary>
         /// Initialize Simitone-specific cursors.
@@ -47,9 +48,14 @@ public static void Init(GraphicsDevice gd)
 
         /// <summary>
         /// Sets the eyedropper cursor if available, otherwise uses a fallback.
+        /// Uses high priority to prevent CursorManager from overriding it.
         /// </summary>
         public static void SetEyedropperCursor()
         {
+            // Use high priority to prevent other cursor changes from overriding
+            CursorManager.INSTANCE?.SetCursorPriority(10);
+            EyedropperActive = true;
+
             if (EyedropperCursor != null)
             {
                 Mouse.SetCursor(EyedropperCursor);
@@ -61,6 +67,19 @@ public static void SetEyedropperCursor()
             }
         }
 
+        /// <summary>
+        /// Clears the eyedropper cursor priority, allowing normal cursor handling.
+        /// Call this when eyedropper mode is disabled.
+        /// </summary>
+        public static void ClearEyedropperCursor()
+        {
+            if (EyedropperActive)
+            {
+                CursorManager.INSTANCE?.SetCursorPriority(0);
+                EyedropperActive = false;
+            }
+        }
+
         /// <summary>
         /// Returns true if the eyedropper cursor was loaded successfully.
         /// </summary>

From eacbfe676dadc06b2a02d41d163913408b3375ef Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Wed, 21 Jan 2026 20:42:43 +0000
Subject: [PATCH 12/26] please work curso

---
 .../UI/Panels/UIObjectHolder.cs               |  6 ----
 .../Simitone.Client/Utils/SimitoneCursors.cs  | 29 +++++--------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs b/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
index 81f5af6..136cfa1 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
@@ -472,15 +472,9 @@ public void Update(UpdateState state, bool scrolled)
                 }
                 else
                 {
-                    SimitoneCursors.ClearEyedropperCursor();
                     GameFacade.Cursor.SetCursor(cur);
                 }
             }
-            else
-            {
-                // Mouse left the area or scrolling - clear eyedropper cursor priority
-                SimitoneCursors.ClearEyedropperCursor();
-            }
 
             MouseWasDown = MouseIsDown;
         }
diff --git a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
index 5279308..e166e8c 100644
--- a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
+++ b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
@@ -15,7 +15,6 @@ public static class SimitoneCursors
     {
         private static MouseCursor EyedropperCursor;
         private static bool Initialized;
-        private static bool EyedropperActive;
 
         /// <summary>
         /// Initialize Simitone-specific cursors.
@@ -48,35 +47,22 @@ public static void Init(GraphicsDevice gd)
 
         /// <summary>
         /// Sets the eyedropper cursor if available, otherwise uses a fallback.
-        /// Uses high priority to prevent CursorManager from overriding it.
         /// </summary>
         public static void SetEyedropperCursor()
         {
-            // Use high priority to prevent other cursor changes from overriding
-            CursorManager.INSTANCE?.SetCursorPriority(10);
-            EyedropperActive = true;
-
             if (EyedropperCursor != null)
             {
                 Mouse.SetCursor(EyedropperCursor);
             }
             else
             {
-                // Fallback to LiveObjectAvail if custom cursor not available
-                CursorManager.INSTANCE?.SetCursor(CursorType.LiveObjectAvail);
-            }
-        }
-
-        /// <summary>
-        /// Clears the eyedropper cursor priority, allowing normal cursor handling.
-        /// Call this when eyedropper mode is disabled.
-        /// </summary>
-        public static void ClearEyedropperCursor()
-        {
-            if (EyedropperActive)
-            {
-                CursorManager.INSTANCE?.SetCursorPriority(0);
-                EyedropperActive = false;
+                // Fallback - set directly via Mouse to bypass CursorManager state
+                var group = CursorManager.INSTANCE?.GetCurrentGroup();
+                if (CursorManager.INSTANCE != null)
+                {
+                    // Force set SimsRotate as fallback (visually distinct)
+                    Mouse.SetCursor(MouseCursor.Crosshair);
+                }
             }
         }
 
@@ -85,4 +71,5 @@ public static void ClearEyedropperCursor()
         /// </summary>
         public static bool HasEyedropperCursor => EyedropperCursor != null;
     }
+    }
 }

From 2572814c45201e8dae71f0bc9e33f686e6d808ee Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Wed, 21 Jan 2026 21:00:24 +0000
Subject: [PATCH 13/26] syntax

---
 Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
index e166e8c..415c7f0 100644
--- a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
+++ b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
@@ -71,5 +71,4 @@ public static void SetEyedropperCursor()
         /// </summary>
         public static bool HasEyedropperCursor => EyedropperCursor != null;
     }
-    }
 }

From 58784de9926a05ddc4dd2fd502044a969db6108d Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Wed, 21 Jan 2026 21:21:06 +0000
Subject: [PATCH 14/26] debugging

---
 .../Simitone.Client/Utils/SimitoneCursors.cs       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
index 415c7f0..91a46db 100644
--- a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
+++ b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
@@ -25,6 +25,16 @@ public static void Init(GraphicsDevice gd)
 
             // Load the eyedropper cursor from the Content folder
             var cursorPath = Path.Combine(FSOEnvironment.ContentDir, "Cursors", "eyedropper.cur");
+            
+            // Debug: write to log file
+            var logPath = Path.Combine(FSOEnvironment.ContentDir, "cursor_debug.log");
+            try
+            {
+                File.AppendAllText(logPath, $"Looking for cursor at: {cursorPath}\n");
+                File.AppendAllText(logPath, $"File exists: {File.Exists(cursorPath)}\n");
+            }
+            catch { }
+            
             if (File.Exists(cursorPath))
             {
                 try
@@ -33,11 +43,13 @@ public static void Init(GraphicsDevice gd)
                     {
                         var cursorData = CurLoader.LoadMonoCursor(gd, stream);
                         EyedropperCursor = cursorData.MouseCursor;
+                        try { File.AppendAllText(logPath, "Cursor loaded successfully!\n"); } catch { }
                     }
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
                     // Cursor file is invalid - will use fallback
+                    try { File.AppendAllText(logPath, $"Failed to load cursor: {ex.Message}\n"); } catch { }
                     EyedropperCursor = null;
                 }
             }

From 8d421b631cb1f3c4722bc55e242a1cff82b58cac Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Wed, 21 Jan 2026 21:31:47 +0000
Subject: [PATCH 15/26] log update

---
 .../Simitone.Client/Utils/SimitoneCursors.cs  | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
index 91a46db..7c25995 100644
--- a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
+++ b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
@@ -26,14 +26,26 @@ public static void Init(GraphicsDevice gd)
             // Load the eyedropper cursor from the Content folder
             var cursorPath = Path.Combine(FSOEnvironment.ContentDir, "Cursors", "eyedropper.cur");
             
-            // Debug: write to log file
-            var logPath = Path.Combine(FSOEnvironment.ContentDir, "cursor_debug.log");
+            // Debug: write to log file in same folder as executable
+            var logPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "cursor_debug.log");
             try
             {
+                File.WriteAllText(logPath, $"ContentDir: {FSOEnvironment.ContentDir}\n");
                 File.AppendAllText(logPath, $"Looking for cursor at: {cursorPath}\n");
                 File.AppendAllText(logPath, $"File exists: {File.Exists(cursorPath)}\n");
             }
-            catch { }
+            catch (Exception logEx) 
+            { 
+                // Try desktop as fallback
+                try
+                {
+                    var desktopLog = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "cursor_debug.log");
+                    File.WriteAllText(desktopLog, $"ContentDir: {FSOEnvironment.ContentDir}\n");
+                    File.AppendAllText(desktopLog, $"Looking for cursor at: {cursorPath}\n");
+                    File.AppendAllText(desktopLog, $"File exists: {File.Exists(cursorPath)}\n");
+                }
+                catch { }
+            }
             
             if (File.Exists(cursorPath))
             {
@@ -49,7 +61,7 @@ public static void Init(GraphicsDevice gd)
                 catch (Exception ex)
                 {
                     // Cursor file is invalid - will use fallback
-                    try { File.AppendAllText(logPath, $"Failed to load cursor: {ex.Message}\n"); } catch { }
+                    try { File.AppendAllText(logPath, $"Failed to load cursor: {ex.Message}\n{ex.StackTrace}\n"); } catch { }
                     EyedropperCursor = null;
                 }
             }

From c1d112f9ffeeb89669086e95696f105737eccca1 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Wed, 21 Jan 2026 21:49:32 +0000
Subject: [PATCH 16/26] oh my lanta

---
 .../Content/Cursors/eyedropper.png            | Bin 0 -> 956 bytes
 .../Simitone.Client/Simitone.Client.csproj    |   3 ++
 .../Simitone.Client/Utils/SimitoneCursors.cs  |  42 ++++++++----------
 3 files changed, 22 insertions(+), 23 deletions(-)
 create mode 100644 Client/Simitone/Simitone.Client/Content/Cursors/eyedropper.png

diff --git a/Client/Simitone/Simitone.Client/Content/Cursors/eyedropper.png b/Client/Simitone/Simitone.Client/Content/Cursors/eyedropper.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d4a33427b5c1e66513f251e7cc3f53bf7efcdfc
GIT binary patch
literal 956
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}EvXTnX}-P;
zT0k}j11qBt12aeo5Hc`IF|dN!3=Ce3(r|VVqXtwB69YqgCIbspO%#v@0S_Ps>W0$H
z3m6e5E?|PI7FxiJV1u+}PQD)oq&N#aB8wRqxP?KOkzv*x37~0_nIRD+5xzcF$@#f@
zi7EL>sd^Q;1t47vHWgMtW^QUpqC!P(PF}H9g{=};g%ywu64qBz04piUwpEJo4N!2-
zFG^J~(=*UBP_pAvP*AWbN=dT{a&d!d2l8x{GD=Dctn~HE%ggo3jrH=2()A53EiLs8
zjP#9+bb%^#i!1X=5-W7`ij^UTz|3(;Elw`VEGWs$&r<-Io0ybeT4JlD1hNPYAnq*5
zOhed|R}A$Q(1ZFQ8GS=N1AVyJK&>_)Q7iwV%v7MwAoJ}EZNMr~#Gv-r=z}araty?$
zU{Rn~?YM08;lXCdB^mdS9T><to-U3d7J^eJ`T8+A3bY0)WJSC<#r=YF%3Ae;hi*3{
zl3bi0v3_A`>6LyI8u2RA<lv4^>5JJe*Im7$Y-`-$tlA$Q`}dWvFYnY-T!Kz3mKB|Q
z{c>l>I<*RMlisz0aoV{JJD&OKelpxp!KfY=Zzp-^=H(OT8y?*jHtwFRJBQ2h4*MNO
z<qwQHYQbFg=i1YR+~XdkJ^t6kT<~TVXO3;y`ewrlrq9jlnd;$B;u9F=HMXj4+LOyy
z@GRRcyvt~(fokE~N6JMrYbTZOiHk9reyiI@FLuw<JMPJbpNb1jW8Bg$@;5#7wSD)-
zwEe-I?3<Z8CV0-i<23oi5^LS|d6E$Y^ZuF|vFb@ZkiD~`;Bur|to`+iXKGb-zl$8y
zzR~CZpxq`vXz{eUE=h(>?gm?o_b}%H9iZvAFwOAM-y1@QWNY|yHkn^2di?0W%h{wO
zQCs$1V>Ycm+cx`1^-FKVv(+mD_&u}#Kg$%Z6xE5(I`@%3)NRkdS8HvOK}p!t)z4*}
HQ$iB}hUqhH

literal 0
HcmV?d00001

diff --git a/Client/Simitone/Simitone.Client/Simitone.Client.csproj b/Client/Simitone/Simitone.Client/Simitone.Client.csproj
index d279950..a061926 100644
--- a/Client/Simitone/Simitone.Client/Simitone.Client.csproj
+++ b/Client/Simitone/Simitone.Client/Simitone.Client.csproj
@@ -14,6 +14,9 @@
     <Content Include="Content\Cursors\eyedropper.cur">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Cursors\eyedropper.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\3D\TEX_0.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
index 7c25995..d85418a 100644
--- a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
+++ b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
@@ -23,45 +23,41 @@ public static void Init(GraphicsDevice gd)
         {
             if (Initialized) return;
 
-            // Load the eyedropper cursor from the Content folder
-            var cursorPath = Path.Combine(FSOEnvironment.ContentDir, "Cursors", "eyedropper.cur");
+            // Try loading from PNG first (more reliable), then fall back to .cur
+            var pngPath = Path.Combine(FSOEnvironment.ContentDir, "Cursors", "eyedropper.png");
+            var curPath = Path.Combine(FSOEnvironment.ContentDir, "Cursors", "eyedropper.cur");
             
-            // Debug: write to log file in same folder as executable
-            var logPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "cursor_debug.log");
-            try
+            // Try PNG first
+            if (File.Exists(pngPath))
             {
-                File.WriteAllText(logPath, $"ContentDir: {FSOEnvironment.ContentDir}\n");
-                File.AppendAllText(logPath, $"Looking for cursor at: {cursorPath}\n");
-                File.AppendAllText(logPath, $"File exists: {File.Exists(cursorPath)}\n");
-            }
-            catch (Exception logEx) 
-            { 
-                // Try desktop as fallback
                 try
                 {
-                    var desktopLog = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "cursor_debug.log");
-                    File.WriteAllText(desktopLog, $"ContentDir: {FSOEnvironment.ContentDir}\n");
-                    File.AppendAllText(desktopLog, $"Looking for cursor at: {cursorPath}\n");
-                    File.AppendAllText(desktopLog, $"File exists: {File.Exists(cursorPath)}\n");
+                    using (var stream = File.Open(pngPath, FileMode.Open, FileAccess.Read, FileShare.Read))
+                    {
+                        var texture = Texture2D.FromStream(gd, stream);
+                        // Hotspot at tip of eyedropper (adjust X,Y as needed)
+                        EyedropperCursor = MouseCursor.FromTexture2D(texture, 1, 1);
+                    }
+                }
+                catch (Exception)
+                {
+                    EyedropperCursor = null;
                 }
-                catch { }
             }
             
-            if (File.Exists(cursorPath))
+            // Fall back to .cur if PNG didn't work
+            if (EyedropperCursor == null && File.Exists(curPath))
             {
                 try
                 {
-                    using (var stream = File.Open(cursorPath, FileMode.Open, FileAccess.Read, FileShare.Read))
+                    using (var stream = File.Open(curPath, FileMode.Open, FileAccess.Read, FileShare.Read))
                     {
                         var cursorData = CurLoader.LoadMonoCursor(gd, stream);
                         EyedropperCursor = cursorData.MouseCursor;
-                        try { File.AppendAllText(logPath, "Cursor loaded successfully!\n"); } catch { }
                     }
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
-                    // Cursor file is invalid - will use fallback
-                    try { File.AppendAllText(logPath, $"Failed to load cursor: {ex.Message}\n{ex.StackTrace}\n"); } catch { }
                     EyedropperCursor = null;
                 }
             }

From 4c7a5b956fd2031162614ba854abb963297774f9 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Wed, 21 Jan 2026 22:03:19 +0000
Subject: [PATCH 17/26] removing some old code

---
 Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
index d85418a..470503c 100644
--- a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
+++ b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
@@ -76,13 +76,8 @@ public static void SetEyedropperCursor()
             }
             else
             {
-                // Fallback - set directly via Mouse to bypass CursorManager state
-                var group = CursorManager.INSTANCE?.GetCurrentGroup();
-                if (CursorManager.INSTANCE != null)
-                {
-                    // Force set SimsRotate as fallback (visually distinct)
-                    Mouse.SetCursor(MouseCursor.Crosshair);
-                }
+                // Fallback to crosshair if custom cursor not available
+                Mouse.SetCursor(MouseCursor.Crosshair);
             }
         }
 

From b38c46bd4eeb1ff1fa21bd88f6664e2eda4970fb Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Thu, 22 Jan 2026 03:50:00 +0000
Subject: [PATCH 18/26] First pass with build mode eyedropper

---
 .../UI/Panels/Desktop/UIDesktopUCP.cs         |  6 +-
 .../Panels/LiveSubpanels/UIBuyBrowsePanel.cs  | 99 ++++++++++++++++---
 2 files changed, 88 insertions(+), 17 deletions(-)

diff --git a/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs b/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
index 5ff93cc..ccf3d7c 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
@@ -91,7 +91,7 @@ public UIDesktopUCP(TS1GameScreen screen)
             FriendIcon = new UIImage(ui.Get("d_live_friend.png").Get(gd)) { Position = new Vector2(156, 186) };
             Add(FriendIcon);
 
-            // Eyedropper button - visible only in Buy mode (Build mode not yet supported)
+            // Eyedropper button - visible in Buy and Build modes
             Add(EyedropperButton = new UIStencilButton(ui.Get("d_live_eyedropper.png").Get(gd))
             {
                 Position = new Vector2(155, 164),
@@ -424,8 +424,8 @@ public void SetMode(UIMainPanelMode mode)
             BuildButton.Selected = mode == UIMainPanelMode.BUILD;
             OptionsButton.Selected = mode == UIMainPanelMode.OPTIONS;
 
-            // Show eyedropper only in BUY mode (Build mode not yet supported)
-            EyedropperButton.Visible = (mode == UIMainPanelMode.BUY);
+            // Show eyedropper in BUY and BUILD modes
+            EyedropperButton.Visible = (mode == UIMainPanelMode.BUY || mode == UIMainPanelMode.BUILD);
             // Reset selection when changing modes
             if (!EyedropperButton.Visible)
             {
diff --git a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
index 4f2edc0..5759915 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
@@ -353,6 +353,36 @@ public UIBuyBrowsePanel(TS1GameScreen screen, sbyte category, UICatalogMode mode
             HoldingEvents = true;
         }
 
+        /// <summary>
+        /// Maps a WorldCatalog category to the Build mode UI category and subcategory.
+        /// Returns null if the category is not a valid Build mode object category.
+        /// </summary>
+        private static (int uiCategory, int subcatIndex)? MapCatalogToBuildCategory(int catalogCategory)
+        {
+            // Based on BuildCategories MaskBit values
+            switch (catalogCategory)
+            {
+                // Objects (UI Category 2)
+                case 8: return (2, 0);  // Doors - MaskBit 7+1
+                case 9: return (2, 1);  // Windows - MaskBit 7+2
+                case 10: return (2, 2); // Stairs - MaskBit 7+3
+                case 12: return (2, 3); // Fireplaces - MaskBit 7+5
+
+                // Outdoors (UI Category 1)
+                case 11: return (1, 0); // Trees - MaskBit 7+4
+                case 14: return (1, 2); // Water - MaskBit 7+7
+                case 18: return (1, 1); // Terrain - MaskBit 7+11
+
+                // Architecture (UI Category 0) - these are special elements, not clickable objects
+                case 13: return (0, 0); // Walls - MaskBit 7+6
+                case 15: return (0, 1); // Wallpaper - MaskBit 7+8
+                case 16: return (0, 2); // Floors - MaskBit 7+9
+                case 17: return (0, 3); // Roofs - MaskBit 7+10
+
+                default: return null;
+            }
+        }
+
         /// <summary>
         /// Checks if there's a pending eyedropper GUID to select after a category switch.
         /// Called from Update since Parent may not be set during constructor.
@@ -367,6 +397,27 @@ private void CheckPendingEyedropperSelection()
             {
                 var guid = mainPanel.PendingEyedropperGUID.Value;
                 mainPanel.PendingEyedropperGUID = null;
+
+                if (Mode == UICatalogMode.Build)
+                {
+                    // In Build mode, we need to also switch to the correct subcategory
+                    var catalogItem = Content.Get().WorldCatalog.GetItemByGUID(guid);
+                    if (catalogItem != null)
+                    {
+                        var mapping = MapCatalogToBuildCategory(catalogItem.Value.Category);
+                        if (mapping != null)
+                        {
+                            var (_, targetSubcatIndex) = mapping.Value;
+                            var subcat = BuildCategories[Category][targetSubcatIndex];
+
+                            if (ChoosingSub)
+                            {
+                                InitSubcategory(subcat);
+                            }
+                        }
+                    }
+                }
+
                 SelectItemInCurrentCategory(guid);
             }
         }
@@ -392,25 +443,45 @@ public void SelectItemByGUID(uint guid)
 
             var targetCategory = catalogItem.Value.Category;
 
-            // Check if item is in a different category
-            if (targetCategory != Category)
+            if (Mode == UICatalogMode.Build)
             {
-                // Validate that the target category is valid for the current mode
-                // Buy mode uses categories 0-7, Build mode uses different categories
-                if (Mode == UICatalogMode.Build)
+                // Build mode - map catalog category to Build UI category
+                var mapping = MapCatalogToBuildCategory(targetCategory);
+                if (mapping == null) return; // Not a valid build object
+
+                var (targetUICategory, targetSubcatIndex) = mapping.Value;
+
+                // Check if we need to switch Build UI categories
+                if (targetUICategory != Category)
                 {
-                    // Build mode - can't switch to buy categories via eyedropper
-                    // Build categories are handled differently (13-18), so just return
+                    var mainPanel = Parent as UIMainPanel;
+                    if (mainPanel != null)
+                    {
+                        // Store for after category switch
+                        mainPanel.PendingEyedropperGUID = guid;
+                        mainPanel.Switcher.Select(targetUICategory);
+                    }
                     return;
                 }
-                else
+
+                // Same Build category - initialize the subcategory and select
+                if (ChoosingSub)
                 {
-                    // Buy mode - only categories 0-7 are valid
-                    if (targetCategory < 0 || targetCategory > 7)
-                    {
-                        // This item is in a build category, can't select in buy mode
-                        return;
-                    }
+                    var subcat = BuildCategories[Category][targetSubcatIndex];
+                    InitSubcategory(subcat);
+                }
+                SelectItemInCurrentCategory(guid);
+                return;
+            }
+
+            // Buy mode logic
+            if (targetCategory != Category)
+            {
+                // Buy mode - only categories 0-7 are valid
+                if (targetCategory < 0 || targetCategory > 7)
+                {
+                    // This item is in a build category, can't select in buy mode
+                    return;
                 }
 
                 // Store the GUID to select after category switch

From aa5dcfc6c0afe6a2d4e5f487d7eb8b1f7f9fa347 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Thu, 22 Jan 2026 04:04:40 +0000
Subject: [PATCH 19/26] More refinements for build mode switch

---
 .../Panels/LiveSubpanels/UIBuyBrowsePanel.cs  | 68 ++++++++++---------
 .../UI/Panels/UISimitoneFrontend.cs           |  9 +++
 2 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
index 5759915..5f5074c 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
@@ -384,7 +384,7 @@ private static (int uiCategory, int subcatIndex)? MapCatalogToBuildCategory(int
         }
 
         /// <summary>
-        /// Checks if there's a pending eyedropper GUID to select after a category switch.
+        /// Checks if there's a pending eyedropper GUID to select after a category or mode switch.
         /// Called from Update since Parent may not be set during constructor.
         /// </summary>
         private void CheckPendingEyedropperSelection()
@@ -398,27 +398,9 @@ private void CheckPendingEyedropperSelection()
                 var guid = mainPanel.PendingEyedropperGUID.Value;
                 mainPanel.PendingEyedropperGUID = null;
 
-                if (Mode == UICatalogMode.Build)
-                {
-                    // In Build mode, we need to also switch to the correct subcategory
-                    var catalogItem = Content.Get().WorldCatalog.GetItemByGUID(guid);
-                    if (catalogItem != null)
-                    {
-                        var mapping = MapCatalogToBuildCategory(catalogItem.Value.Category);
-                        if (mapping != null)
-                        {
-                            var (_, targetSubcatIndex) = mapping.Value;
-                            var subcat = BuildCategories[Category][targetSubcatIndex];
-
-                            if (ChoosingSub)
-                            {
-                                InitSubcategory(subcat);
-                            }
-                        }
-                    }
-                }
-
-                SelectItemInCurrentCategory(guid);
+                // Use SelectItemByGUID to handle category switching if needed
+                // (e.g., after a mode switch, we may be in the wrong category)
+                SelectItemByGUID(guid);
             }
         }
 
@@ -434,6 +416,7 @@ private void ObjectHolder_OnEyedropperPick(uint guid)
         /// <summary>
         /// Finds an item by GUID in the catalog and selects it.
         /// If the item is in a different category, switches to that category first.
+        /// If the item is in a different mode (Buy vs Build), switches modes first.
         /// </summary>
         public void SelectItemByGUID(uint guid)
         {
@@ -442,7 +425,39 @@ public void SelectItemByGUID(uint guid)
             if (catalogItem == null) return;
 
             var targetCategory = catalogItem.Value.Category;
+            var mainPanel = Parent as UIMainPanel;
 
+            // Determine if this is a Buy item (0-7) or Build item (8+)
+            bool isBuyItem = targetCategory >= 0 && targetCategory <= 7;
+            bool isBuildItem = targetCategory >= 8;
+
+            // Check if we need to switch modes
+            if (Mode == UICatalogMode.Build && isBuyItem)
+            {
+                // In Build mode but clicked a Buy item → switch to Buy mode
+                if (mainPanel != null)
+                {
+                    mainPanel.PendingEyedropperGUID = guid;
+                    // Trigger mode switch to Buy
+                    var frontend = Game.Frontend as UISimitoneFrontend;
+                    frontend?.SwitchMode(UIMainPanelMode.BUY);
+                }
+                return;
+            }
+            else if (Mode != UICatalogMode.Build && isBuildItem)
+            {
+                // In Buy mode but clicked a Build item → switch to Build mode
+                if (mainPanel != null)
+                {
+                    mainPanel.PendingEyedropperGUID = guid;
+                    // Trigger mode switch to Build
+                    var frontend = Game.Frontend as UISimitoneFrontend;
+                    frontend?.SwitchMode(UIMainPanelMode.BUILD);
+                }
+                return;
+            }
+
+            // Same mode - handle normally
             if (Mode == UICatalogMode.Build)
             {
                 // Build mode - map catalog category to Build UI category
@@ -454,7 +469,6 @@ public void SelectItemByGUID(uint guid)
                 // Check if we need to switch Build UI categories
                 if (targetUICategory != Category)
                 {
-                    var mainPanel = Parent as UIMainPanel;
                     if (mainPanel != null)
                     {
                         // Store for after category switch
@@ -477,15 +491,7 @@ public void SelectItemByGUID(uint guid)
             // Buy mode logic
             if (targetCategory != Category)
             {
-                // Buy mode - only categories 0-7 are valid
-                if (targetCategory < 0 || targetCategory > 7)
-                {
-                    // This item is in a build category, can't select in buy mode
-                    return;
-                }
-
                 // Store the GUID to select after category switch
-                var mainPanel = Parent as UIMainPanel;
                 if (mainPanel != null)
                 {
                     mainPanel.PendingEyedropperGUID = guid;
diff --git a/Client/Simitone/Simitone.Client/UI/Panels/UISimitoneFrontend.cs b/Client/Simitone/Simitone.Client/UI/Panels/UISimitoneFrontend.cs
index 973515d..8853b5e 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/UISimitoneFrontend.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/UISimitoneFrontend.cs
@@ -161,6 +161,15 @@ private void ExpandClicked(UIElement button)
             MainPanel.Switcher_OnCategorySelect(MainPanel.Switcher.ActiveCategory);
         }
 
+        /// <summary>
+        /// Programmatically switch to a different mode (Buy, Build, Live, Options).
+        /// Used by eyedropper to auto-switch modes when clicking cross-mode objects.
+        /// </summary>
+        public void SwitchMode(UIMainPanelMode mode)
+        {
+            LiveButtonClicked(mode);
+        }
+
         private bool LiveButtonClicked(UIMainPanelMode mode)
         {
             var deskAuto = Game.Desktop && (mode != UIMainPanelMode.LIVE || MainPanel.Mode != UIMainPanelMode.LIVE);

From 69341b4255a6fda8a4ee13acf04838aa04a901f8 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Thu, 22 Jan 2026 04:56:23 +0000
Subject: [PATCH 20/26] more tweaks

---
 .../UI/Panels/Desktop/UIDesktopUCP.cs         |  12 ++-
 .../Panels/LiveSubpanels/UIBuyBrowsePanel.cs  | 100 +++++++++++++++++-
 .../Simitone.Client/UI/Panels/UILotControl.cs |  27 +++--
 .../Simitone.Client/UI/Panels/UIMainPanel.cs  |   3 +
 .../UI/Panels/UIObjectHolder.cs               |  56 ++++++++--
 5 files changed, 179 insertions(+), 19 deletions(-)

diff --git a/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs b/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
index ccf3d7c..1fbc4a7 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
@@ -97,7 +97,7 @@ public UIDesktopUCP(TS1GameScreen screen)
                 Position = new Vector2(155, 164),
                 Shadow = true,
                 ShadowParam = sDir,
-                Tooltip = "Eyedropper Tool"
+                Tooltip = "Eyedropper Tool (E)"
             });
             EyedropperButton.OnButtonClick += ToggleEyedropper;
             EyedropperButton.Visible = false; // Hidden by default (LIVE mode)
@@ -121,7 +121,7 @@ public UIDesktopUCP(TS1GameScreen screen)
             Add(RotateCCWButton = new UIStencilButton(ui.Get("d_live_rotccw.png").Get(gd)) { Position = new Vector2(114, 175), Tooltip = "Rotate Counter-Clockwise" });
 
             SpeedButtons = new UIButton[4];
-            var speedTooltips = new string[] { "Pause", "Normal Speed", "Fast", "Ultra Fast" };
+            var speedTooltips = new string[] { "Normal Speed", "Fast", "Ultra Fast", "Pause" };
             for (int i=0; i<4; i++)
             {
                 Add(SpeedButtons[i] = new UIStencilButton(ui.Get($"d_live_speed{i+1}.png").Get(gd))
@@ -346,7 +346,7 @@ public override void Update(UpdateState state)
 
             //KEY SHORTCUTS
             var keys = state.NewKeys;
-            var nofocus = true;
+            var nofocus = state.InputManager.GetFocus() == null; // No text input has focus
             if (Game.InLot)
             {
                 if (keys.Contains(Keys.F1) && !LiveButton.Disabled) OnModeClick?.Invoke(UIMainPanelMode.LIVE);
@@ -354,6 +354,12 @@ public override void Update(UpdateState state)
                 if (keys.Contains(Keys.F3) && !BuildButton.Disabled) OnModeClick?.Invoke(UIMainPanelMode.BUILD);
                 if (keys.Contains(Keys.F4)) OnModeClick?.Invoke(UIMainPanelMode.OPTIONS); // Options Panel
 
+                // E key for eyedropper (only in Buy/Build mode and when no text input is focused)
+                if (nofocus && keys.Contains(Keys.E) && EyedropperButton.Visible)
+                {
+                    ToggleEyedropper(EyedropperButton);
+                }
+
                 if (nofocus)
                 {
                     var world = Game.vm.Context.World;
diff --git a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
index 5f5074c..3b9bd0c 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/LiveSubpanels/UIBuyBrowsePanel.cs
@@ -350,6 +350,8 @@ public UIBuyBrowsePanel(TS1GameScreen screen, sbyte category, UICatalogMode mode
             screen.LotControl.ObjectHolder.OnPutDown += ObjectHolder_OnPutDown;
             screen.LotControl.ObjectHolder.OnDelete += ObjectHolder_OnDelete;
             screen.LotControl.ObjectHolder.OnEyedropperPick += ObjectHolder_OnEyedropperPick;
+            screen.LotControl.ObjectHolder.OnEyedropperArchitecturePick += ObjectHolder_OnEyedropperArchitecturePick;
+            screen.LotControl.OnCustomControlReleased += LotControl_OnCustomControlReleased;
             HoldingEvents = true;
         }
 
@@ -384,7 +386,7 @@ private static (int uiCategory, int subcatIndex)? MapCatalogToBuildCategory(int
         }
 
         /// <summary>
-        /// Checks if there's a pending eyedropper GUID to select after a category or mode switch.
+        /// Checks if there's a pending eyedropper GUID or architecture pattern to select after a category or mode switch.
         /// Called from Update since Parent may not be set during constructor.
         /// </summary>
         private void CheckPendingEyedropperSelection()
@@ -393,7 +395,22 @@ private void CheckPendingEyedropperSelection()
             CheckedPendingEyedropper = true;
 
             var mainPanel = Parent as UIMainPanel;
-            if (mainPanel?.PendingEyedropperGUID != null)
+            if (mainPanel == null) return;
+
+            // Check for pending architecture pick first
+            if (mainPanel.PendingEyedropperPatternID != null && mainPanel.PendingEyedropperArchType != null)
+            {
+                var patternID = mainPanel.PendingEyedropperPatternID.Value;
+                var archType = mainPanel.PendingEyedropperArchType.Value;
+                mainPanel.PendingEyedropperPatternID = null;
+                mainPanel.PendingEyedropperArchType = null;
+
+                SelectArchitectureByPatternID(patternID, archType);
+                return;
+            }
+
+            // Check for pending GUID pick
+            if (mainPanel.PendingEyedropperGUID != null)
             {
                 var guid = mainPanel.PendingEyedropperGUID.Value;
                 mainPanel.PendingEyedropperGUID = null;
@@ -413,6 +430,77 @@ private void ObjectHolder_OnEyedropperPick(uint guid)
             SelectItemByGUID(guid);
         }
 
+        private void ObjectHolder_OnEyedropperArchitecturePick(ushort patternID, ArchitectureType archType)
+        {
+            // Turn off eyedropper mode (button state is synced in UIDesktopUCP)
+            Game.LotControl.ObjectHolder.EyedropperMode = false;
+
+            // Architecture picks only work in Build mode
+            if (Mode != UICatalogMode.Build)
+            {
+                // Switch to Build mode first
+                var mainPanel = Parent as UIMainPanel;
+                if (mainPanel != null)
+                {
+                    mainPanel.PendingEyedropperPatternID = patternID;
+                    mainPanel.PendingEyedropperArchType = archType;
+                    var frontend = Game.Frontend as UISimitoneFrontend;
+                    frontend?.SwitchMode(UIMainPanelMode.BUILD);
+                }
+                return;
+            }
+
+            // Already in Build mode - select the architecture item
+            SelectArchitectureByPatternID(patternID, archType);
+        }
+
+        /// <summary>
+        /// Selects an architecture item (floor or wallpaper) by its pattern ID.
+        /// </summary>
+        private void SelectArchitectureByPatternID(ushort patternID, ArchitectureType archType)
+        {
+            // Architecture items are in UI Category 0 (Architecture)
+            // Floor = subcategory index 2, Wallpaper = subcategory index 1
+            int targetUICategory = 0;
+            int targetSubcatIndex = (archType == ArchitectureType.Floor) ? 2 : 1;
+
+            // Switch to Architecture category if needed
+            if (Category != targetUICategory)
+            {
+                var mainPanel = Parent as UIMainPanel;
+                if (mainPanel != null)
+                {
+                    mainPanel.PendingEyedropperPatternID = patternID;
+                    mainPanel.PendingEyedropperArchType = archType;
+                    mainPanel.Switcher.Select(targetUICategory);
+                }
+                return;
+            }
+
+            // Initialize the correct subcategory
+            var subcat = BuildCategories[targetUICategory][targetSubcatIndex];
+            if (ChoosingSub)
+            {
+                InitSubcategory(subcat);
+            }
+
+            // Find and select the item by pattern ID (matching Special.ResID)
+            if (FilterCategory != null)
+            {
+                int index = 0;
+                foreach (var elem in FilterCategory)
+                {
+                    if (elem.Special?.ResID == patternID)
+                    {
+                        Selected(index);
+                        CatContainer.ScrollToItem(index);
+                        return;
+                    }
+                    index++;
+                }
+            }
+        }
+
         /// <summary>
         /// Finds an item by GUID in the catalog and selects it.
         /// If the item is in a different category, switches to that category first.
@@ -571,6 +659,12 @@ private void ObjectHolder_OnDelete(UIObjectSelection holding, UpdateState state)
             ItemID = -1;
         }
 
+        private void LotControl_OnCustomControlReleased()
+        {
+            Game.LotControl.QueryPanel.Active = false;
+            ItemID = -1;
+        }
+
         private void ObjectHolder_OnPutDown(UIObjectSelection holding, UpdateState state)
         {
             Game.LotControl.QueryPanel.Active = false;
@@ -607,6 +701,8 @@ private void RemoveEvents()
                 Game.LotControl.ObjectHolder.OnPutDown -= ObjectHolder_OnPutDown;
                 Game.LotControl.ObjectHolder.OnDelete -= ObjectHolder_OnDelete;
                 Game.LotControl.ObjectHolder.OnEyedropperPick -= ObjectHolder_OnEyedropperPick;
+                Game.LotControl.ObjectHolder.OnEyedropperArchitecturePick -= ObjectHolder_OnEyedropperArchitecturePick;
+                Game.LotControl.OnCustomControlReleased -= LotControl_OnCustomControlReleased;
                 Game.LotControl.ObjectHolder.EyedropperMode = false;
                 Game.LotControl.QueryPanel.Active = false;
                 Game.Frontend.MainPanel.SetSubpanelPickup(1f);
diff --git a/Client/Simitone/Simitone.Client/UI/Panels/UILotControl.cs b/Client/Simitone/Simitone.Client/UI/Panels/UILotControl.cs
index 5e73ba1..45f962b 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/UILotControl.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/UILotControl.cs
@@ -80,6 +80,11 @@ public uint SelectedSimID
 
         public int WallsMode = 1;
 
+        /// <summary>
+        /// Fired when CustomControl (floor/wallpaper tool) is released via ESC key.
+        /// </summary>
+        public event Action OnCustomControlReleased;
+
         private int OldMX;
         private int OldMY;
         private bool FoundMe; //if false and avatar changes, center. Should center on join lot.
@@ -900,15 +905,25 @@ public override void Update(UpdateState state)
                 if (LiveMode) LiveModeUpdate(state, scrolled);
                 else if (CustomControl != null)
                 {
-                    if (FSOEnvironment.SoftwareKeyboard) CustomControl.MousePosition = new Point(UIScreen.Current.ScreenWidth / 2, UIScreen.Current.ScreenHeight / 2);
+                    // ESC cancels floor/wallpaper/wall tools
+                    if (state.KeyboardState.IsKeyDown(Keys.Escape))
+                    {
+                        CustomControl.Release();
+                        CustomControl = null;
+                        OnCustomControlReleased?.Invoke();
+                    }
                     else
                     {
-                        CustomControl.Modifiers = 0;
-                        if (state.CtrlDown) CustomControl.Modifiers |= UILotControlModifiers.CTRL;
-                        if (state.ShiftDown) CustomControl.Modifiers |= UILotControlModifiers.SHIFT;
-                        CustomControl.MousePosition = state.MouseState.Position;
+                        if (FSOEnvironment.SoftwareKeyboard) CustomControl.MousePosition = new Point(UIScreen.Current.ScreenWidth / 2, UIScreen.Current.ScreenHeight / 2);
+                        else
+                        {
+                            CustomControl.Modifiers = 0;
+                            if (state.CtrlDown) CustomControl.Modifiers |= UILotControlModifiers.CTRL;
+                            if (state.ShiftDown) CustomControl.Modifiers |= UILotControlModifiers.SHIFT;
+                            CustomControl.MousePosition = state.MouseState.Position;
+                        }
+                        CustomControl.Update(state, scrolled);
                     }
-                    CustomControl.Update(state, scrolled);
                 }
                 else ObjectHolder.Update(state, scrolled);
 
diff --git a/Client/Simitone/Simitone.Client/UI/Panels/UIMainPanel.cs b/Client/Simitone/Simitone.Client/UI/Panels/UIMainPanel.cs
index e20b3fb..b76e95c 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/UIMainPanel.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/UIMainPanel.cs
@@ -59,6 +59,9 @@ public float CurWidth
 
         // Eyedropper tool support - stores GUID to select after category switch
         public uint? PendingEyedropperGUID;
+        // Architecture eyedropper - stores pattern ID and type for floors/wallpaper
+        public ushort? PendingEyedropperPatternID;
+        public ArchitectureType? PendingEyedropperArchType;
 
         public string[] FloorNames = new string[]
         {
diff --git a/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs b/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
index 136cfa1..f6d8280 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/UIObjectHolder.cs
@@ -56,6 +56,10 @@ public class UIObjectHolder //controls the object holder interface
         public event EyedropperEventHandler OnEyedropperPick;
         public delegate void EyedropperEventHandler(uint guid);
 
+        // Architecture eyedropper (for floors/wallpaper which don't have GUIDs)
+        public event EyedropperArchitectureHandler OnEyedropperArchitecturePick;
+        public delegate void EyedropperArchitectureHandler(ushort patternID, ArchitectureType type);
+
         public event HolderEventHandler OnPickup;
         public event HolderEventHandler OnDelete;
         public event HolderEventHandler OnPutDown;
@@ -419,18 +423,46 @@ public void Update(UpdateState state, bool scrolled)
                 //not holding an object, but one can be selected
                 var newHover = World.GetObjectIDAtScreenPos(state.MouseState.X, state.MouseState.Y, GameFacade.GraphicsDevice);
 
-                // Eyedropper mode - pick object GUID instead of selecting to move
-                if (EyedropperMode && newHover != 0 && vm.GetObjectById(newHover) is VMGameObject)
+                // Eyedropper mode - pick object GUID or architecture pattern
+                // Priority: Objects (doors/windows in walls) → Walls → Floors
+                if (EyedropperMode)
                 {
-                    var obj = vm.GetObjectById(newHover);
-                    uint guid = obj.Object.OBJ.GUID;
-                    if (obj.MasterDefinition != null) guid = obj.MasterDefinition.GUID;
+                    bool handled = false;
 
-                    var catalogItem = Content.Get().WorldCatalog.GetItemByGUID(guid);
-                    if (catalogItem != null)
+                    // First, try to pick an object if one is directly under cursor
+                    // This ensures doors/windows in walls get picked instead of the wall
+                    if (newHover != 0 && vm.GetObjectById(newHover) is VMGameObject)
                     {
-                        OnEyedropperPick?.Invoke(guid);
+                        var obj = vm.GetObjectById(newHover);
+                        uint guid = obj.Object.OBJ.GUID;
+                        if (obj.MasterDefinition != null) guid = obj.MasterDefinition.GUID;
+
+                        var catalogItem = Content.Get().WorldCatalog.GetItemByGUID(guid);
+                        if (catalogItem != null)
+                        {
+                            OnEyedropperPick?.Invoke(guid);
+                            handled = true;
+                        }
                     }
+
+                    // If no object, check for walls (wallpaper)
+                    // Check for floor tiles (architecture without GUIDs)
+                    if (!handled)
+                    {
+                        var tilePos = World.EstTileAtPosWithScroll(
+                            new Vector2(state.MouseState.X, state.MouseState.Y) / FSOEnvironment.DPIScaleFactor);
+                        var tileX = (short)Math.Floor(tilePos.X);
+                        var tileY = (short)Math.Floor(tilePos.Y);
+                        var level = World.State.Level;
+
+                        var floor = vm.Context.Architecture.GetFloor(tileX, tileY, level);
+                        if (floor.Pattern > 0 && Content.Get().WorldFloors.Entries.ContainsKey(floor.Pattern))
+                        {
+                            OnEyedropperArchitecturePick?.Invoke(floor.Pattern, ArchitectureType.Floor);
+                            handled = true;
+                        }
+                    }
+
                     // Don't process normal click when in eyedropper mode
                 }
                 else if (MouseClicked && (newHover != 0) && (vm.GetObjectById(newHover) is VMGameObject))
@@ -573,4 +605,12 @@ public bool IsBought
             }
         }
     }
+
+    /// <summary>
+    /// Type of architecture element for eyedropper picks.
+    /// </summary>
+    public enum ArchitectureType
+    {
+        Floor
+    }
 }

From f1489352538792c150793a6f8afbd82b9c555ede Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Thu, 22 Jan 2026 05:09:12 +0000
Subject: [PATCH 21/26] focus fix

---
 Client/Simitone/Simitone.Client/UI/Panels/UICheatTextbox.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Client/Simitone/Simitone.Client/UI/Panels/UICheatTextbox.cs b/Client/Simitone/Simitone.Client/UI/Panels/UICheatTextbox.cs
index 51ec4d6..ec60862 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/UICheatTextbox.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/UICheatTextbox.cs
@@ -75,6 +75,7 @@ public override void Update(UpdateState state)
                 && state.NewKeys.Contains(Keys.C)) //prevent change over multiple frames
             {
                 Visible = !Visible;
+                if (!Visible) state.InputManager.SetFocus(null); // Clear focus when hiding
             }
             baseTextbox.Visible = Visible;
             if (Visible)
@@ -83,6 +84,7 @@ public override void Update(UpdateState state)
                 {
                     commandEntered(baseTextbox.CurrentText, out bool shouldHide);
                     Visible = !shouldHide;
+                    if (!Visible) state.InputManager.SetFocus(null); // Clear focus when hiding
                 }
             }               
         }

From c82e7ffcf1de31723f0c79d73e2dc768c4b28342 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Thu, 22 Jan 2026 18:23:41 -0500
Subject: [PATCH 22/26] Update README with quality of life fixes

Added note about quality of life fixes including the eyedropper tool.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 9a16c53..b42eae5 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ On modern operating systems, The Sims has a few nagging issues that make it less
 - Custom user interface that works at modern resolutions. Working on a more desktop oriented interface.
 - Improved graphical performance, support for high resolutions and refresh rates.
 - Custom lighting - directional lights with smooth falloffs and shadows using generated 3D meshes.
+- Quality of life fixes that were available in later installations of the series such as the eyedropper tool
 - *Volcanic*, a program which allows you to examine, modify and create new game objects. (from FreeSO)
 
 # Why is it called Simitone?

From 69db3551ca9b63c56bebfb400762dba01d1a8551 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Fri, 23 Jan 2026 04:09:08 +0000
Subject: [PATCH 23/26] final cleanup

---
 .../Content/Cursors/eyedropper.cur            | Bin 4286 -> 0 bytes
 .../Simitone.Client/Simitone.Client.csproj    |   3 --
 .../Simitone.Client/Utils/SimitoneCursors.cs  |  38 +++---------------
 3 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 Client/Simitone/Simitone.Client/Content/Cursors/eyedropper.cur

diff --git a/Client/Simitone/Simitone.Client/Content/Cursors/eyedropper.cur b/Client/Simitone/Simitone.Client/Content/Cursors/eyedropper.cur
deleted file mode 100644
index 2185e23fdd4887f39d0e69e82240ce816c9cc48a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4286
zcmd^?y-!n77{)J(A2nd1)LMuJ!iPbPiXTBV8gL*%W1?|za031V6BnlzV`AdM<UqpY
zWSn5o$pIZ`3TT3b6euW$7*~riDM&c}9_S^dw$fV*i%;@!Z_hpFJkNRG_ndpNtX)=-
zRa0YG#a5;DqRg^<mSr_Unyfa+Q~m;;IYbft#hr#Ucf&nN>VBtuNT(Q<zzXPv2jM=b
z_FZs0y=bk{J_3)!6R-v<t;*m5sJO_-c3?k~R>3py5^RA@P(JFRd?_ySQSiL@e7?HT
z(b34**w|EUZS7q&F2K|9EIbG0MddAzij#6ukbI!+i$o%mCW%BMu{<y^@TR-F`+?W%
zl@G;09&~>S9)+c_ARburn56MA9S8*a7Z(?Q+FpKvzP`TaB_$;%(Nk`klh=ZI_yDAb
z_EY9=Dlac@@9OG$I5;@?idZD{Y<zrtf-or;@^G<`9vXmj;_>*R+wDHj+;;8xc+@xv
z<Uu*YgX*B*9$4$3G&(yw?=!zVXpO4-QZ%d3j%=p~YOP!IW8*cNs&mCaHMf@MJUlqs
z8;5{uO?hDdNn3kwQ=W75kbY(|O>XE1iUH}4X3KL99%@nZLpRjfoij=Sbv`Z+f2*}D
z9<(<uC#k&EKzVQk<>4cchiEi9?f3gN*B|vxx5|`$GxWPczpL;%Y)_6+92}q3tWW3R
zmi3;D!$dM(GaO^np-^ZV&0A1@>Y&bQd2oarJ-F#tkJTx85JpBuVhG)V9Z=`B_D^0O
za>zv;eVWNbY+c<Lj?zyakEavO+faE>{`BtDd(-i|JBx?4TI1ObwC8MX`zj9=6%}3R
z*&cLe9)^3NV`T8qLR$ygpKZ<bYnq2^h#rG_XXb^pdWe$qjhLrv+rPu%aLna$-9zvu
zR1Ca%i6;l8dayONx(0*6mkif_&^tvr_$N@`BU@>vK99v>-w-Uw`epnb(Dw>>pQ@AX
zp4Z7T!`fg2%sc;#-2}c-JTj3@*KVJko&Cx{eY53V|C@wUe&C^eD-S(AJ<k}Tb2zX4
zpCXs>RvxJHu)W^Y>+taKDD_{-Ko@j;24@t^(1?cX5g^vH%Ye%q>wZjg8Qt}b?D*Wv
zAd_p8zI)P{>)8LMUuvD$_e<P-4;VA=HfG_8F+Uby+?XZ)16W!Kn8a$USqW5|)z)5P
ks^1#Z`^A_LTo^JY9;Aas2djF6CRlCE5S(vapV@5SHydn7dH?_b

diff --git a/Client/Simitone/Simitone.Client/Simitone.Client.csproj b/Client/Simitone/Simitone.Client/Simitone.Client.csproj
index a061926..b5f16be 100644
--- a/Client/Simitone/Simitone.Client/Simitone.Client.csproj
+++ b/Client/Simitone/Simitone.Client/Simitone.Client.csproj
@@ -11,9 +11,6 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <Content Include="Content\Cursors\eyedropper.cur">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Cursors\eyedropper.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
index 470503c..11d167b 100644
--- a/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
+++ b/Client/Simitone/Simitone.Client/Utils/SimitoneCursors.cs
@@ -8,26 +8,19 @@
 
 namespace Simitone.Client.Utils
 {
-    /// <summary>
-    /// Manages Simitone-specific custom cursors that aren't part of FreeSO.
-    /// </summary>
+    // Manages Simitone-specific custom cursors that aren't part of FreeSO.
     public static class SimitoneCursors
     {
         private static MouseCursor EyedropperCursor;
         private static bool Initialized;
 
-        /// <summary>
-        /// Initialize Simitone-specific cursors.
-        /// </summary>
+        // Initialize Simitone-specific cursors.
         public static void Init(GraphicsDevice gd)
         {
             if (Initialized) return;
 
-            // Try loading from PNG first (more reliable), then fall back to .cur
             var pngPath = Path.Combine(FSOEnvironment.ContentDir, "Cursors", "eyedropper.png");
-            var curPath = Path.Combine(FSOEnvironment.ContentDir, "Cursors", "eyedropper.cur");
-            
-            // Try PNG first
+
             if (File.Exists(pngPath))
             {
                 try
@@ -44,30 +37,11 @@ public static void Init(GraphicsDevice gd)
                     EyedropperCursor = null;
                 }
             }
-            
-            // Fall back to .cur if PNG didn't work
-            if (EyedropperCursor == null && File.Exists(curPath))
-            {
-                try
-                {
-                    using (var stream = File.Open(curPath, FileMode.Open, FileAccess.Read, FileShare.Read))
-                    {
-                        var cursorData = CurLoader.LoadMonoCursor(gd, stream);
-                        EyedropperCursor = cursorData.MouseCursor;
-                    }
-                }
-                catch (Exception)
-                {
-                    EyedropperCursor = null;
-                }
-            }
 
             Initialized = true;
         }
 
-        /// <summary>
-        /// Sets the eyedropper cursor if available, otherwise uses a fallback.
-        /// </summary>
+        // Sets the eyedropper cursor if available, otherwise uses a fallback.
         public static void SetEyedropperCursor()
         {
             if (EyedropperCursor != null)
@@ -81,9 +55,7 @@ public static void SetEyedropperCursor()
             }
         }
 
-        /// <summary>
-        /// Returns true if the eyedropper cursor was loaded successfully.
-        /// </summary>
+        // Returns true if the eyedropper cursor was loaded successfully.
         public static bool HasEyedropperCursor => EyedropperCursor != null;
     }
 }

From b5ffadaad33a8db806e6a1046b7757c7e8ffe813 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Fri, 23 Jan 2026 04:26:33 +0000
Subject: [PATCH 24/26] removing old files

---
 .../uigraphics/live/cat/cat_eyedropper.png        | Bin 485 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Client/Simitone/Simitone.Client/Content/uigraphics/live/cat/cat_eyedropper.png

diff --git a/Client/Simitone/Simitone.Client/Content/uigraphics/live/cat/cat_eyedropper.png b/Client/Simitone/Simitone.Client/Content/uigraphics/live/cat/cat_eyedropper.png
deleted file mode 100644
index 3c9ad47796b8ac6caf3089904fa078c9241b7a6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 485
zcmeAS@N?(olHy`uVBq!ia0vp^jv&mz1|<8wpL7LMEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
za0`Jj<E6WGe}IBwC9V-A&PAz-C7Jno3L%-fsSE}d`UZyjhUP*avl@UZWI!r{^V3So
z6N^$A98>a>QWe}Xi&D$;i?WLqoP*6??Ag@Az`$th>EaktG3V{gi@t{qL|88fA7QxL
z(075CL%M`nqH$sZvzfx(2Ei9>IRbW*{sb%))#%eMTz^I0{_9bzO)<xFf9?Bzzc{#>
z>G}i(4yL9C1qBW))B?Rje6qhjUhYj^y?kZG-fx||<&)iWuFvyWJN1GUt3lt^)#qHk
zv9K^YItT~=sXJnC_8xxb^Y+g7XP;X8?aybZsq%SC?|E4F@>nw84QU54PtF!U%LYw$
zZn;%n3TsOF@~34@=?#=@Np76yIzN!<;ZBG1i_U9&)!KXXa_g_hK5wsnm}NVCI``N3
z<=1MRy1&o7)%;LAZEH%h2*OTBhkrGWcc*SJzr*b_Q_nlh|LoKP)06YCdIv7}KswLQ
WT+!jDBp)!q89ZJ6T-G@yGywn;!>&{S


From 44731fefcf990b4581c668d0f67d1152fef70d15 Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Thu, 22 Jan 2026 23:33:46 -0500
Subject: [PATCH 25/26] edits

---
 .../Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs b/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
index 1fbc4a7..4a5e3f8 100644
--- a/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
+++ b/Client/Simitone/Simitone.Client/UI/Panels/Desktop/UIDesktopUCP.cs
@@ -346,7 +346,7 @@ public override void Update(UpdateState state)
 
             //KEY SHORTCUTS
             var keys = state.NewKeys;
-            var nofocus = state.InputManager.GetFocus() == null; // No text input has focus
+            var nofocus = state.InputManager.GetFocus() == null; // No text input (like the cheat menu!) has focus
             if (Game.InLot)
             {
                 if (keys.Contains(Keys.F1) && !LiveButton.Disabled) OnModeClick?.Invoke(UIMainPanelMode.LIVE);

From e260ba36d50e2213e6ee7763e590131297f57d5d Mon Sep 17 00:00:00 2001
From: Alex Yong <alexjyong@gmail.com>
Date: Fri, 23 Jan 2026 13:42:10 -0500
Subject: [PATCH 26/26] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b42eae5..1e2c26b 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ On modern operating systems, The Sims has a few nagging issues that make it less
 - Custom user interface that works at modern resolutions. Working on a more desktop oriented interface.
 - Improved graphical performance, support for high resolutions and refresh rates.
 - Custom lighting - directional lights with smooth falloffs and shadows using generated 3D meshes.
-- Quality of life fixes that were available in later installations of the series such as the eyedropper tool
+- Quality of life fixes that were available in later installations of the series such as the eyedropper tool (currently does not work on wallpaper)
 - *Volcanic*, a program which allows you to examine, modify and create new game objects. (from FreeSO)
 
 # Why is it called Simitone?