From 4ca5d0e2c49c55150557af4059196db6443816c2 Mon Sep 17 00:00:00 2001
From: Ryan Kramer <default.kramer@gmail.com>
Date: Wed, 14 Jan 2026 19:35:25 -0600
Subject: [PATCH 1/6] working on snippets

---
 .../ResourceDeserializationContext.cs         |   9 ++
 .../Persistence/V1/ProjectV1.cs               |  16 +++
 src/Blocktavius.AppDQB2/ProjectControl.xaml   |   6 +
 src/Blocktavius.AppDQB2/ProjectVM.cs          |  29 +++++
 .../ExtractedSnippetResourceEditor.xaml       |  58 +++++++++
 .../ExtractedSnippetResourceEditor.xaml.cs    |  15 +++
 .../Resources/ExtractedSnippetResourceVM.cs   |  85 ++++++++++++++
 src/Blocktavius.AppDQB2/ResourcesControl.xaml |  38 ++++++
 .../ResourcesControl.xaml.cs                  |  15 +++
 .../ScriptNodes/AreaDefinerVM.cs              | 110 ++++++++++++++++++
 .../ScriptNodes/PutGroundNodeVM.cs            |  99 ++--------------
 src/Blocktavius.DQB2/Snippet.cs               |  79 +++++++++++++
 12 files changed, 467 insertions(+), 92 deletions(-)
 create mode 100644 src/Blocktavius.AppDQB2/Persistence/ResourceDeserializationContext.cs
 create mode 100644 src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceEditor.xaml
 create mode 100644 src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceEditor.xaml.cs
 create mode 100644 src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs
 create mode 100644 src/Blocktavius.AppDQB2/ResourcesControl.xaml
 create mode 100644 src/Blocktavius.AppDQB2/ResourcesControl.xaml.cs
 create mode 100644 src/Blocktavius.AppDQB2/ScriptNodes/AreaDefinerVM.cs
 create mode 100644 src/Blocktavius.DQB2/Snippet.cs

diff --git a/src/Blocktavius.AppDQB2/Persistence/ResourceDeserializationContext.cs b/src/Blocktavius.AppDQB2/Persistence/ResourceDeserializationContext.cs
new file mode 100644
index 0000000..84327b9
--- /dev/null
+++ b/src/Blocktavius.AppDQB2/Persistence/ResourceDeserializationContext.cs
@@ -0,0 +1,9 @@
+using Blocktavius.AppDQB2.Resources;
+
+namespace Blocktavius.AppDQB2.Persistence;
+
+sealed class ResourceDeserializationContext
+{
+	public required IAreaManager AreaManager { get; init; }
+	public required IReadOnlyList<SlotVM> Slots { get; init; }
+}
diff --git a/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs b/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs
index 65fa0aa..74f4e01 100644
--- a/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs
+++ b/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs
@@ -49,6 +49,13 @@ public required IReadOnlyList<ScriptV1>? Scripts
 
 	public required int? SelectedScriptIndex { get; init; }
 
+	private IContentEqualityList<ExtractedSnippetV1>? _extractedSnippets = null;
+	public required IReadOnlyList<ExtractedSnippetV1>? ExtractedSnippets
+	{
+		get => _extractedSnippets;
+		init => _extractedSnippets = value?.ToContentEqualityList();
+	}
+
 	public ProjectV1 VerifyProfileHash(ProfileSettings profile)
 	{
 		if (profile.VerificationHash == ProfileVerificationHash)
@@ -139,3 +146,12 @@ public Rect ToCoreRect()
 		return new Rect(start, end);
 	}
 }
+
+sealed record ExtractedSnippetV1
+{
+	public required string? Name { get; init; }
+	public required SlotReferenceV1? SourceSlot { get; init; }
+	public required string? SourceStgdatFilename { get; init; }
+	public required string? AreaPersistentId { get; init; }
+	public required RectV1? CustomRectArea { get; init; }
+}
diff --git a/src/Blocktavius.AppDQB2/ProjectControl.xaml b/src/Blocktavius.AppDQB2/ProjectControl.xaml
index 152b06f..22dd5e9 100644
--- a/src/Blocktavius.AppDQB2/ProjectControl.xaml
+++ b/src/Blocktavius.AppDQB2/ProjectControl.xaml
@@ -34,6 +34,12 @@
                 </TabItem.Header>
                 <local:ScriptsControl></local:ScriptsControl>
             </TabItem>
+            <TabItem>
+                <TabItem.Header>
+                    <TextBlock>Resources</TextBlock>
+                </TabItem.Header>
+                <local:ResourcesControl></local:ResourcesControl>
+            </TabItem>
         </TabControl>
     </Grid>
 </UserControl>
diff --git a/src/Blocktavius.AppDQB2/ProjectVM.cs b/src/Blocktavius.AppDQB2/ProjectVM.cs
index cc2c379..b3c787a 100644
--- a/src/Blocktavius.AppDQB2/ProjectVM.cs
+++ b/src/Blocktavius.AppDQB2/ProjectVM.cs
@@ -59,6 +59,7 @@ sealed partial class ProjectVM : ViewModelBaseWithCustomTypeDescriptor, IBlockLi
 	// commands
 	public I.Project.CommandEditChunkGrid CommandEditChunkGrid { get; }
 	public ICommand CommandAddScript { get; }
+	public ICommand CommandAddSnippet { get; }
 
 	// wrapper properties
 	private ProfileSettings getProfile => xProfile.Value;
@@ -113,10 +114,18 @@ public ProjectVM(IServices services, ProfileSettings profile)
 		CommandExportChunkMask = new RelayCommand(_ => chunkGridLayer.ChunkGridImage != null, ExportChunkMask);
 		CommandExportMinimap = new RelayCommand(_ => minimapLayer?.MinimapImage != null, ExportMinimap);
 		CommandAddScript = new RelayCommand(_ => true, AddScript);
+		CommandAddSnippet = new RelayCommand(_ => true, AddSnippet);
 
 		ForceUpdateProfile(profile);
 	}
 
+	private void AddSnippet(object? _)
+	{
+		var newResource = new Resources.ExtractedSnippetResourceVM();
+		newResource.Name = $"New Snippet {ExtractedSnippets.Count + 1}";
+		ExtractedSnippets.Add(newResource);
+	}
+
 	private void ExportChunkMask(object? arg) => ExportImage(chunkGridLayer.ChunkGridImage, "exported-chunk-mask.png", 1.0);
 
 	private void ExportMinimap(object? arg) => ExportImage(minimapLayer?.MinimapImage, "exported-minimap.png", 0.5);
@@ -248,6 +257,11 @@ public ILayerVM? SelectedLayer
 
 	public ObservableCollection<ScriptVM> Scripts { get; } = new();
 
+	public ObservableCollection<Resources.ExtractedSnippetResourceVM> ExtractedSnippets { get; } = new();
+
+	public IReadOnlyList<IAreaVM> AvailableAreas
+		=> Layers.Select(layer => layer.SelfAsAreaVM).WhereNotNull().ToList();
+
 	private ScriptVM? _selectedScript;
 	public ScriptVM? SelectedScript
 	{
@@ -393,6 +407,7 @@ public ProjectV1 ToPersistModel()
 			ChunkGridVisible = chunkGridLayer.IsVisible,
 			Scripts = this.Scripts.Select(s => s.ToPersistModelConcrete()).ToList(),
 			SelectedScriptIndex = SelectedScript == null ? null : Scripts.IndexOf(SelectedScript),
+			ExtractedSnippets = this.ExtractedSnippets.Select(s => s.ToPersistModel()).ToList(),
 		};
 	}
 
@@ -469,6 +484,20 @@ private void Reload(ProjectV1 project, ExternalImageManager imageManager)
 		}
 		SelectedScript = Scripts.ElementAtOrDefault(project.SelectedScriptIndex.GetValueOrDefault(-1));
 
+		var resourceContext = new Persistence.ResourceDeserializationContext
+		{
+			AreaManager = this,
+			Slots = getSourceSlots,
+		};
+
+		ExtractedSnippets.Clear();
+		foreach (var snippet in project.ExtractedSnippets.EmptyIfNull())
+		{
+			var snippetVM = Resources.ExtractedSnippetResourceVM.Load(snippet, resourceContext);
+			ExtractedSnippets.Add(snippetVM);
+		}
+
+
 		changeset.Complete();
 	}
 
diff --git a/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceEditor.xaml b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceEditor.xaml
new file mode 100644
index 0000000..ea797f9
--- /dev/null
+++ b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceEditor.xaml
@@ -0,0 +1,58 @@
+<UserControl x:Class="Blocktavius.AppDQB2.Resources.ExtractedSnippetResourceEditor"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:app="clr-namespace:Blocktavius.AppDQB2"
+             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+             mc:Ignorable="d"
+             d:DesignHeight="450" d:DesignWidth="400">
+    <StackPanel Margin="10">
+        <TextBlock Text="Name:" FontWeight="Bold"/>
+        <TextBox Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}" Margin="0,0,0,10"/>
+
+        <TextBlock Text="Source Slot:" FontWeight="Bold"/>
+        <ComboBox ItemsSource="{Binding DataContext.SourceSlots82, RelativeSource={RelativeSource AncestorType={x:Type app:ResourcesControl}}}"
+                  SelectedItem="{Binding SourceSlot}"
+                  DisplayMemberPath="Name" Margin="0,0,0,10"/>
+
+        <TextBlock Text="Source Stage:" FontWeight="Bold"/>
+        <ComboBox ItemsSource="{Binding SourceSlot.Stages}"
+                  SelectedItem="{Binding SourceStage}"
+                  DisplayMemberPath="Name" Margin="0,0,0,10"/>
+
+        <GroupBox Header="Area" Margin="0,10,0,0">
+            <StackPanel>
+                <TextBlock Text="Pre-defined Area:" Margin="0,5,0,0"/>
+                <ComboBox ItemsSource="{Binding DataContext.AvailableAreas, RelativeSource={RelativeSource AncestorType={x:Type app:ResourcesControl}}}"
+                          SelectedItem="{Binding AreaDefiner.Area}"
+                          DisplayMemberPath="DisplayName" Margin="0,0,0,10"/>
+
+                <TextBlock Text="Or define custom rectangle:" FontStyle="Italic" Margin="0,5,0,5"/>
+
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+
+                    <Label Grid.Row="0" Grid.Column="0" Content="X Begin:"/>
+                    <xctk:IntegerUpDown Grid.Row="0" Grid.Column="1" Value="{Binding AreaDefiner.RectAreaBeginX, UpdateSourceTrigger=PropertyChanged}" Margin="0,0,10,5"/>
+                    <Label Grid.Row="0" Grid.Column="2" Content="Z Begin:"/>
+                    <xctk:IntegerUpDown Grid.Row="0" Grid.Column="3" Value="{Binding AreaDefiner.RectAreaBeginZ, UpdateSourceTrigger=PropertyChanged}" Margin="0,0,0,5"/>
+
+                    <Label Grid.Row="1" Grid.Column="0" Content="X End:"/>
+                    <xctk:IntegerUpDown Grid.Row="1" Grid.Column="1" Value="{Binding AreaDefiner.RectAreaEndX, UpdateSourceTrigger=PropertyChanged}" Margin="0,0,10,0"/>
+                    <Label Grid.Row="1" Grid.Column="2" Content="Z End:"/>
+                    <xctk:IntegerUpDown Grid.Row="1" Grid.Column="3" Value="{Binding AreaDefiner.RectAreaEndZ, UpdateSourceTrigger=PropertyChanged}"/>
+                </Grid>
+            </StackPanel>
+        </GroupBox>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceEditor.xaml.cs b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceEditor.xaml.cs
new file mode 100644
index 0000000..efd4296
--- /dev/null
+++ b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceEditor.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace Blocktavius.AppDQB2.Resources
+{
+    /// <summary>
+    /// Interaction logic for ExtractedSnippetResourceEditor.xaml
+    /// </summary>
+    public partial class ExtractedSnippetResourceEditor : UserControl
+    {
+        public ExtractedSnippetResourceEditor()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs
new file mode 100644
index 0000000..1bbc405
--- /dev/null
+++ b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs
@@ -0,0 +1,85 @@
+using Blocktavius.AppDQB2.ScriptNodes;
+using Blocktavius.AppDQB2.Persistence.V1;
+using Blocktavius.AppDQB2.Persistence;
+using System.Linq;
+using Blocktavius.Core;
+
+namespace Blocktavius.AppDQB2.Resources;
+
+sealed class ExtractedSnippetResourceVM : ViewModelBase
+{
+	private string _name = "New Snippet";
+	public string Name
+	{
+		get => _name;
+		set => ChangeProperty(ref _name, value);
+	}
+
+	private SlotVM? _sourceSlot;
+	public SlotVM? SourceSlot
+	{
+		get => _sourceSlot;
+		set
+		{
+			if (ChangeProperty(ref _sourceSlot, value))
+			{
+				SourceStage = null;
+			}
+		}
+	}
+
+	private SlotStageVM? _sourceStage;
+	public SlotStageVM? SourceStage
+	{
+		get => _sourceStage;
+		set => ChangeProperty(ref _sourceStage, value);
+	}
+
+	public AreaDefinerVM AreaDefiner { get; } = new();
+
+	public ExtractedSnippetV1 ToPersistModel()
+	{
+		return new ExtractedSnippetV1
+		{
+			Name = this.Name,
+			SourceSlot = this.SourceSlot?.ToPersistModel(),
+			SourceStgdatFilename = this.SourceStage?.Filename,
+			AreaPersistentId = this.AreaDefiner.Area?.PersistentId,
+			CustomRectArea = this.AreaDefiner.RebuildCustomRect(),
+		};
+	}
+
+	public static ExtractedSnippetResourceVM Load(ExtractedSnippetV1 persistModel, ResourceDeserializationContext context)
+	{
+		var vm = new ExtractedSnippetResourceVM
+		{
+			Name = persistModel.Name ?? "Unnamed Snippet",
+		};
+
+		// Lookup Source Slot
+		if (persistModel.SourceSlot != null)
+		{
+			vm.SourceSlot = context.Slots.FirstOrDefault(
+				s => s.MatchesByNumber(persistModel.SourceSlot) || s.MatchesByName(persistModel.SourceSlot));
+		}
+
+		// Lookup Source Stage
+		if (persistModel.SourceStgdatFilename != null && vm.SourceSlot != null)
+		{
+			vm.SourceStage = vm.SourceSlot.Stages.EmptyIfNull().FirstOrDefault(
+				s => string.Equals(s.Filename, persistModel.SourceStgdatFilename, StringComparison.OrdinalIgnoreCase));
+		}
+
+		// AreaDefiner
+		if (persistModel.AreaPersistentId != null)
+		{
+			vm.AreaDefiner.Area = context.AreaManager.FindArea(persistModel.AreaPersistentId);
+		}
+		else if (persistModel.CustomRectArea != null)
+		{
+			vm.AreaDefiner.Load(persistModel.CustomRectArea);
+		}
+
+		return vm;
+	}
+}
diff --git a/src/Blocktavius.AppDQB2/ResourcesControl.xaml b/src/Blocktavius.AppDQB2/ResourcesControl.xaml
new file mode 100644
index 0000000..ac82aec
--- /dev/null
+++ b/src/Blocktavius.AppDQB2/ResourcesControl.xaml
@@ -0,0 +1,38 @@
+<UserControl x:Class="Blocktavius.AppDQB2.ResourcesControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:Blocktavius.AppDQB2"
+             xmlns:res="clr-namespace:Blocktavius.AppDQB2.Resources"
+             mc:Ignorable="d"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <DataTemplate DataType="{x:Type res:ExtractedSnippetResourceVM}">
+            <res:ExtractedSnippetResourceEditor/>
+        </DataTemplate>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" MinWidth="150"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="2*" MinWidth="200"/>
+        </Grid.ColumnDefinitions>
+
+        <!-- Master View -->
+        <DockPanel Grid.Column="0" LastChildFill="True">
+            <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" Margin="2">
+                <Button Content="Add" Margin="2" Command="{Binding CommandAddSnippet}"/>
+                <Button Content="Remove" Margin="2"/>
+            </StackPanel>
+            <ListBox x:Name="MasterList" ItemsSource="{Binding ExtractedSnippets}" DisplayMemberPath="Name">
+                <!-- ItemsSource will be bound to the list of resources -->
+            </ListBox>
+        </DockPanel>
+
+        <GridSplitter Grid.Column="1" Width="5" HorizontalAlignment="Center" VerticalAlignment="Stretch" />
+
+        <!-- Detail View -->
+        <ContentControl Grid.Column="2" Content="{Binding ElementName=MasterList, Path=SelectedItem}" />
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/src/Blocktavius.AppDQB2/ResourcesControl.xaml.cs b/src/Blocktavius.AppDQB2/ResourcesControl.xaml.cs
new file mode 100644
index 0000000..3378922
--- /dev/null
+++ b/src/Blocktavius.AppDQB2/ResourcesControl.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace Blocktavius.AppDQB2
+{
+    /// <summary>
+    /// Interaction logic for ResourcesControl.xaml
+    /// </summary>
+    public partial class ResourcesControl : UserControl
+    {
+        public ResourcesControl()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/Blocktavius.AppDQB2/ScriptNodes/AreaDefinerVM.cs b/src/Blocktavius.AppDQB2/ScriptNodes/AreaDefinerVM.cs
new file mode 100644
index 0000000..276548c
--- /dev/null
+++ b/src/Blocktavius.AppDQB2/ScriptNodes/AreaDefinerVM.cs
@@ -0,0 +1,110 @@
+using Blocktavius.AppDQB2.Persistence.V1;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+
+namespace Blocktavius.AppDQB2.ScriptNodes;
+
+sealed class AreaDefinerVM : ViewModelBase
+{
+	public void Load(RectV1 rect)
+	{
+		RectAreaBeginX = rect.X0;
+		RectAreaBeginZ = rect.Z0;
+		RectAreaEndX = rect.X1;
+		RectAreaEndZ = rect.Z1;
+	}
+
+	public RectV1? RebuildCustomRect()
+	{
+		if (RectAreaBeginX.HasValue && RectAreaBeginZ.HasValue && RectAreaEndX.HasValue && RectAreaEndZ.HasValue)
+		{
+			return new RectV1()
+			{
+				X0 = RectAreaBeginX.Value,
+				Z0 = RectAreaBeginZ.Value,
+				X1 = RectAreaEndX.Value,
+				Z1 = RectAreaEndZ.Value,
+			};
+		}
+		return null;
+	}
+
+	private IAreaVM? area;
+	[Category("Area")]
+	[ItemsSource(typeof(Global.AreasItemsSource))]
+	public IAreaVM? Area
+	{
+		get => area;
+		set
+		{
+			if (ChangeProperty(ref area, value) && value != null)
+			{
+				RectAreaBeginX = null;
+				RectAreaBeginZ = null;
+				RectAreaEndX = null;
+				RectAreaEndZ = null;
+			}
+		}
+	}
+
+	private int? _beginX;
+	[Category("Area")]
+	public int? RectAreaBeginX
+	{
+		get => _beginX;
+		set
+		{
+			if (ChangeProperty(ref _beginX, value) && value.HasValue)
+			{
+				Area = null;
+			}
+		}
+	}
+
+	private int? _beginZ;
+	[Category("Area")]
+	public int? RectAreaBeginZ
+	{
+		get => _beginZ;
+		set
+		{
+			if (ChangeProperty(ref _beginZ, value) && value.HasValue)
+			{
+				Area = null;
+			}
+		}
+	}
+
+	private int? _endX;
+	[Category("Area")]
+	public int? RectAreaEndX
+	{
+		get => _endX;
+		set
+		{
+			if (ChangeProperty(ref _endX, value) && value.HasValue)
+			{
+				Area = null;
+			}
+		}
+	}
+
+	private int? _endZ;
+	[Category("Area")]
+	public int? RectAreaEndZ
+	{
+		get => _endZ;
+		set
+		{
+			if (ChangeProperty(ref _endZ, value) && value.HasValue)
+			{
+				Area = null;
+			}
+		}
+	}
+}
diff --git a/src/Blocktavius.AppDQB2/ScriptNodes/PutGroundNodeVM.cs b/src/Blocktavius.AppDQB2/ScriptNodes/PutGroundNodeVM.cs
index f7a1734..3b13f14 100644
--- a/src/Blocktavius.AppDQB2/ScriptNodes/PutGroundNodeVM.cs
+++ b/src/Blocktavius.AppDQB2/ScriptNodes/PutGroundNodeVM.cs
@@ -33,14 +33,11 @@ public bool TryDeserializeV1(out ScriptNodeVM node, ScriptDeserializationContext
 			me.YMin = this.YMin.GetValueOrDefault(me.YMin);
 			me.YRange = this.YRange.GetValueOrDefault(me.YRange);
 			me.YFloor = this.YFloor ?? me.YFloor;
-			me.Area = context.AreaManager.FindArea(this.AreaPersistId);
+			me.AreaDefiner.Area = context.AreaManager.FindArea(this.AreaPersistId);
 			me.Block = context.BlockManager.FindBlock(this.BlockPersistId);
 			if (CustomRectArea != null)
 			{
-				me.RectAreaBeginX = CustomRectArea.X0;
-				me.RectAreaBeginZ = CustomRectArea.Z0;
-				me.RectAreaEndX = CustomRectArea.X1;
-				me.RectAreaEndZ = CustomRectArea.Z1;
+				me.AreaDefiner.Load(CustomRectArea);
 			}
 			node = me;
 			return true;
@@ -55,7 +52,7 @@ public IPersistentScriptNode ToPersistModel()
 			YMin = this.YMin,
 			YRange = this.YRange,
 			YFloor = this.YFloor,
-			AreaPersistId = this.Area?.PersistentId,
+			AreaPersistId = this.AreaDefiner.Area?.PersistentId,
 			BlockPersistId = this.Block?.PersistentId,
 			CustomRectArea = this.RebuildCustomRect(),
 		};
@@ -69,79 +66,10 @@ public PutGroundNodeVM()
 		RebuildLongStatus();
 	}
 
-	private IAreaVM? area;
-	[Category("Area")]
-	[ItemsSource(typeof(Global.AreasItemsSource))]
-	public IAreaVM? Area
-	{
-		get => area;
-		set
-		{
-			if (ChangeProperty(ref area, value) && value != null)
-			{
-				RectAreaBeginX = null;
-				RectAreaBeginZ = null;
-				RectAreaEndX = null;
-				RectAreaEndZ = null;
-			}
-		}
-	}
-
-	private int? _beginX;
-	[Category("Area")]
-	public int? RectAreaBeginX
-	{
-		get => _beginX;
-		set
-		{
-			if (ChangeProperty(ref _beginX, value) && value.HasValue)
-			{
-				Area = null;
-			}
-		}
-	}
-
-	private int? _beginZ;
-	[Category("Area")]
-	public int? RectAreaBeginZ
-	{
-		get => _beginZ;
-		set
-		{
-			if (ChangeProperty(ref _beginZ, value) && value.HasValue)
-			{
-				Area = null;
-			}
-		}
-	}
+	[FlattenProperties]
+	public AreaDefinerVM AreaDefiner { get; } = new();
 
-	private int? _endX;
-	[Category("Area")]
-	public int? RectAreaEndX
-	{
-		get => _endX;
-		set
-		{
-			if (ChangeProperty(ref _endX, value) && value.HasValue)
-			{
-				Area = null;
-			}
-		}
-	}
-
-	private int? _endZ;
-	[Category("Area")]
-	public int? RectAreaEndZ
-	{
-		get => _endZ;
-		set
-		{
-			if (ChangeProperty(ref _endZ, value) && value.HasValue)
-			{
-				Area = null;
-			}
-		}
-	}
+	private IAreaVM? Area => AreaDefiner.Area;
 
 	private IBlockProviderVM? blockProvider = Blockdata.AnArbitraryBlockVM;
 	[Editor(typeof(PropGridEditors.BlockProviderEditor), typeof(PropGridEditors.BlockProviderEditor))]
@@ -215,20 +143,7 @@ private void RebuildLongStatus()
 		LongStatus = rtb.Build();
 	}
 
-	private RectV1? RebuildCustomRect()
-	{
-		if (RectAreaBeginX.HasValue && RectAreaBeginZ.HasValue && RectAreaEndX.HasValue && RectAreaEndZ.HasValue)
-		{
-			return new RectV1()
-			{
-				X0 = RectAreaBeginX.Value,
-				Z0 = RectAreaBeginZ.Value,
-				X1 = RectAreaEndX.Value,
-				Z1 = RectAreaEndZ.Value,
-			};
-		}
-		return null;
-	}
+	private RectV1? RebuildCustomRect() => AreaDefiner.RebuildCustomRect();
 
 	public StageMutation? BuildMutation(StageRebuildContext context)
 	{
diff --git a/src/Blocktavius.DQB2/Snippet.cs b/src/Blocktavius.DQB2/Snippet.cs
new file mode 100644
index 0000000..49b8aa4
--- /dev/null
+++ b/src/Blocktavius.DQB2/Snippet.cs
@@ -0,0 +1,79 @@
+using Blocktavius.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Blocktavius.DQB2;
+
+public sealed class Snippet
+{
+	private readonly int sizeX;
+	private readonly int sizeZ;
+	private readonly int sizeY;
+	private readonly IReadOnlyList<ushort> blockdata;
+
+	public XZ SizeXZ => new XZ(sizeX, sizeZ);
+	public int SizeY => sizeY;
+
+	private Snippet(IReadOnlyList<ushort> blockdata, XZ sizeXZ, int sizeY)
+	{
+		this.sizeX = sizeXZ.X;
+		this.sizeZ = sizeXZ.Z;
+		this.sizeY = sizeY;
+		this.blockdata = blockdata;
+
+		if (sizeX < 0 || sizeZ < 0 || sizeY < 0)
+		{
+			throw new ArgumentException("negative dimensions are not allowed");
+		}
+		int totalSize = sizeX * sizeZ * sizeY;
+		if (blockdata.Count < totalSize)
+		{
+			throw new ArgumentException($"blockdata too short, needed {totalSize} but got {blockdata.Count}");
+		}
+	}
+
+	public static Snippet Create(IStage stage, Rect bounds, int floorY = 0)
+	{
+		if (floorY < 0 || floorY >= DQB2Constants.MaxElevation)
+		{
+			throw new ArgumentOutOfRangeException($"invalid {nameof(floorY)}: {floorY}");
+		}
+
+		int maxSize = bounds.Size.X * bounds.Size.Z * (DQB2Constants.MaxElevation - floorY);
+		var blockdata = new ushort[maxSize];
+		int numBlocks = 0;
+
+		int y = floorY;
+		while (y < DQB2Constants.MaxElevation)
+		{
+			bool empty = true;
+			int numBlocksRewind = numBlocks;
+
+			foreach (var xz in bounds.Enumerate())
+			{
+				var offset = ChunkOffset.FromXZ(xz);
+				ushort block = 0;
+				if (stage.TryReadChunk(offset, out var chunk))
+				{
+					block = chunk.GetBlock(new Point(xz, y));
+				}
+				blockdata[numBlocks++] = block;
+				empty = empty && block == 0;
+			}
+
+			if (empty)
+			{
+				numBlocks = numBlocksRewind;
+				break;
+			}
+			y++;
+		}
+
+		int actualSizeY = y - floorY;
+		Array.Resize(ref blockdata, numBlocks);
+		return new Snippet(blockdata, bounds.Size, actualSizeY);
+	}
+}

From 3f4512857146d56c40488957ff69b7560b1a9f4e Mon Sep 17 00:00:00 2001
From: Ryan Kramer <default.kramer@gmail.com>
Date: Wed, 14 Jan 2026 20:15:45 -0600
Subject: [PATCH 2/6] Add PutSnippet script node with serialization support.
 Doesn't mutate the stage yet.

---
 src/Blocktavius.AppDQB2/Global.cs             |  29 ++++
 .../ScriptDeserializationContext.cs           |  12 +-
 .../Persistence/V1/ProjectV1.cs               |   1 +
 src/Blocktavius.AppDQB2/ProjectVM.cs          |  28 ++--
 .../Resources/ExtractedSnippetResourceVM.cs   |   4 +
 .../ScriptNodes/PutSnippetNodeVM.cs           | 124 ++++++++++++++++++
 src/Blocktavius.AppDQB2/ScriptVM.cs           |   1 +
 7 files changed, 182 insertions(+), 17 deletions(-)
 create mode 100644 src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs

diff --git a/src/Blocktavius.AppDQB2/Global.cs b/src/Blocktavius.AppDQB2/Global.cs
index 548f761..9dcb6cb 100644
--- a/src/Blocktavius.AppDQB2/Global.cs
+++ b/src/Blocktavius.AppDQB2/Global.cs
@@ -70,6 +70,35 @@ public ItemCollection GetValues()
 		}
 	}
 
+	public sealed class SnippetsItemsSource : IItemsSource
+	{
+		public ItemCollection GetValues()
+		{
+			var list = new ItemCollection();
+			if (currentProject != null)
+			{
+				foreach (var snippet in currentProject.ExtractedSnippets)
+				{
+					list.Add(snippet, snippet.Name);
+				}
+			}
+			return list;
+		}
+	}
+
+	public sealed class RotationItemsSource : IItemsSource
+	{
+		public ItemCollection GetValues()
+		{
+			var list = new ItemCollection();
+			list.Add(0);
+			list.Add(90);
+			list.Add(180);
+			list.Add(270);
+			return list;
+		}
+	}
+
 	public static IEnumerable<DependencyObject> LogicalAncestors(this DependencyObject obj)
 	{
 		do
diff --git a/src/Blocktavius.AppDQB2/Persistence/ScriptDeserializationContext.cs b/src/Blocktavius.AppDQB2/Persistence/ScriptDeserializationContext.cs
index 04809d5..b8388e6 100644
--- a/src/Blocktavius.AppDQB2/Persistence/ScriptDeserializationContext.cs
+++ b/src/Blocktavius.AppDQB2/Persistence/ScriptDeserializationContext.cs
@@ -1,13 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Blocktavius.AppDQB2.Resources;
 
 namespace Blocktavius.AppDQB2.Persistence;
 
 public sealed class ScriptDeserializationContext
 {
+	internal ScriptDeserializationContext(IReadOnlyList<ExtractedSnippetResourceVM> snippets)
+	{
+		this.Snippets = snippets;
+	}
+
 	public required IAreaManager AreaManager { get; init; }
 	public required IBlockManager BlockManager { get; init; }
+	internal IReadOnlyList<ExtractedSnippetResourceVM> Snippets { get; }
 }
diff --git a/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs b/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs
index 74f4e01..458060a 100644
--- a/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs
+++ b/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs
@@ -149,6 +149,7 @@ public Rect ToCoreRect()
 
 sealed record ExtractedSnippetV1
 {
+	public required string? PersistentId { get; init; }
 	public required string? Name { get; init; }
 	public required SlotReferenceV1? SourceSlot { get; init; }
 	public required string? SourceStgdatFilename { get; init; }
diff --git a/src/Blocktavius.AppDQB2/ProjectVM.cs b/src/Blocktavius.AppDQB2/ProjectVM.cs
index b3c787a..9e98073 100644
--- a/src/Blocktavius.AppDQB2/ProjectVM.cs
+++ b/src/Blocktavius.AppDQB2/ProjectVM.cs
@@ -15,6 +15,7 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using Blocktavius.AppDQB2.Persistence;
 
 namespace Blocktavius.AppDQB2;
 
@@ -470,7 +471,20 @@ private void Reload(ProjectV1 project, ExternalImageManager imageManager)
 		Layers.Add(chunkGridLayer);
 		SelectedLayer = Layers.FirstOrDefault();
 
-		var scriptContext = new Persistence.ScriptDeserializationContext
+		var resourceContext = new Persistence.ResourceDeserializationContext
+		{
+			AreaManager = this,
+			Slots = getSourceSlots,
+		};
+
+		ExtractedSnippets.Clear();
+		foreach (var snippet in project.ExtractedSnippets.EmptyIfNull())
+		{
+			var snippetVM = Resources.ExtractedSnippetResourceVM.Load(snippet, resourceContext);
+			ExtractedSnippets.Add(snippetVM);
+		}
+
+		var scriptContext = new Persistence.ScriptDeserializationContext(ExtractedSnippets)
 		{
 			AreaManager = this,
 			BlockManager = this,
@@ -484,18 +498,7 @@ private void Reload(ProjectV1 project, ExternalImageManager imageManager)
 		}
 		SelectedScript = Scripts.ElementAtOrDefault(project.SelectedScriptIndex.GetValueOrDefault(-1));
 
-		var resourceContext = new Persistence.ResourceDeserializationContext
-		{
-			AreaManager = this,
-			Slots = getSourceSlots,
-		};
 
-		ExtractedSnippets.Clear();
-		foreach (var snippet in project.ExtractedSnippets.EmptyIfNull())
-		{
-			var snippetVM = Resources.ExtractedSnippetResourceVM.Load(snippet, resourceContext);
-			ExtractedSnippets.Add(snippetVM);
-		}
 
 
 		changeset.Complete();
@@ -519,6 +522,7 @@ private void Reload(ProjectV1 project, ExternalImageManager imageManager)
 		return Blockdata.AllBlockVMs.FirstOrDefault(x => x.PersistentId == persistentId);
 	}
 
+
 	static partial class MyProperty
 	{
 		public sealed class Profile : NotnullOriginProp<Profile, ProfileSettings>, I.Project.Profile { }
diff --git a/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs
index 1bbc405..ac53bd4 100644
--- a/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs
+++ b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs
@@ -15,6 +15,8 @@ public string Name
 		set => ChangeProperty(ref _name, value);
 	}
 
+	public string PersistentId { get; private set; } = Guid.NewGuid().ToString();
+
 	private SlotVM? _sourceSlot;
 	public SlotVM? SourceSlot
 	{
@@ -41,6 +43,7 @@ public ExtractedSnippetV1 ToPersistModel()
 	{
 		return new ExtractedSnippetV1
 		{
+			PersistentId = this.PersistentId,
 			Name = this.Name,
 			SourceSlot = this.SourceSlot?.ToPersistModel(),
 			SourceStgdatFilename = this.SourceStage?.Filename,
@@ -53,6 +56,7 @@ public static ExtractedSnippetResourceVM Load(ExtractedSnippetV1 persistModel, R
 	{
 		var vm = new ExtractedSnippetResourceVM
 		{
+			PersistentId = persistModel.PersistentId ?? Guid.NewGuid().ToString(),
 			Name = persistModel.Name ?? "Unnamed Snippet",
 		};
 
diff --git a/src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs b/src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs
new file mode 100644
index 0000000..4600cbe
--- /dev/null
+++ b/src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs
@@ -0,0 +1,124 @@
+using Blocktavius.AppDQB2.Persistence;
+using Blocktavius.AppDQB2.Resources;
+using Blocktavius.DQB2;
+using System.ComponentModel;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+
+namespace Blocktavius.AppDQB2.ScriptNodes;
+
+sealed class PutSnippetNodeVM : ScriptLeafNodeVM, IHaveLongStatusText, IStageMutator, IDynamicScriptNodeVM
+{
+	[PersistentScriptNode(Discriminator = "PutSnippet-7890")]
+	sealed record PersistModel : IPersistentScriptNode
+	{
+		public required string? SnippetPersistentId { get; init; }
+		public required int? Rotation { get; init; }
+		public required int? NorthwestX { get; init; }
+		public required int? NorthwestZ { get; init; }
+		public required int? AdjustY { get; init; }
+
+		public bool TryDeserializeV1(out ScriptNodeVM node, ScriptDeserializationContext context)
+		{
+			var me = new PutSnippetNodeVM();
+			me.Snippet = context.Snippets.FirstOrDefault(x => x.PersistentId == SnippetPersistentId);
+			me.Rotation = this.Rotation ?? 0;
+			me.NorthwestX = this.NorthwestX ?? 0;
+			me.NorthwestZ = this.NorthwestZ ?? 0;
+			me.AdjustY = this.AdjustY ?? 0;
+
+			node = me;
+			return true;
+		}
+	}
+
+	public IPersistentScriptNode ToPersistModel()
+	{
+		return new PersistModel
+		{
+			SnippetPersistentId = this.Snippet?.PersistentId,
+			Rotation = this.Rotation,
+			NorthwestX = this.NorthwestX,
+			AdjustY = this.AdjustY,
+			NorthwestZ = this.NorthwestZ,
+		};
+	}
+
+	IStageMutator? IDynamicScriptNodeVM.SelfAsMutator => this;
+	ScriptNodeVM IDynamicScriptNodeVM.SelfAsVM => this;
+
+	public PutSnippetNodeVM()
+	{
+		RebuildLongStatus();
+	}
+
+	private ExtractedSnippetResourceVM? _snippet;
+	[Category("Source")]
+	[ItemsSource(typeof(Global.SnippetsItemsSource))]
+	public ExtractedSnippetResourceVM? Snippet
+	{
+		get => _snippet;
+		set => ChangeProperty(ref _snippet, value);
+	}
+
+	private int _rotation = 0;
+	[Category("Transform")]
+	[ItemsSource(typeof(Global.RotationItemsSource))]
+	public int Rotation
+	{
+		get => _rotation;
+		set => ChangeProperty(ref _rotation, value);
+	}
+
+	private int _northwestX = 0;
+	[Category("Transform")]
+	public int NorthwestX
+	{
+		get => _northwestX;
+		set => ChangeProperty(ref _northwestX, value);
+	}
+
+	private int _northwestZ = 0;
+	[Category("Transform")]
+	public int NorthwestZ
+	{
+		get => _northwestZ;
+		set => ChangeProperty(ref _northwestZ, value);
+	}
+
+	private int _adjustY = 0;
+	[Category("Transform")]
+	public int AdjustY
+	{
+		get => _adjustY;
+		set => ChangeProperty(ref _adjustY, value);
+	}
+
+	private BindableRichText _longStatus = BindableRichText.Empty;
+	[Browsable(false)]
+	public BindableRichText LongStatus
+	{
+		get => _longStatus;
+		private set => ChangeProperty(ref _longStatus, value);
+	}
+
+	protected override void AfterPropertyChanges()
+	{
+		RebuildLongStatus();
+	}
+
+	private void RebuildLongStatus()
+	{
+		var rtb = new BindableRichTextBuilder();
+		rtb.Append("Put Snippet: ").FallbackIfNull("None Selected", Snippet?.Name);
+		rtb.AppendLine().Append($"  Rotation: {Rotation}°");
+		rtb.AppendLine().Append($"  Where: X={NorthwestX}, Z={NorthwestZ}, AdjustY={AdjustY}");
+
+		LongStatus = rtb.Build();
+	}
+
+	public StageMutation? BuildMutation(StageRebuildContext context)
+	{
+		// Not implemented as per request
+		return null;
+	}
+}
diff --git a/src/Blocktavius.AppDQB2/ScriptVM.cs b/src/Blocktavius.AppDQB2/ScriptVM.cs
index ec24b8d..9a5ea96 100644
--- a/src/Blocktavius.AppDQB2/ScriptVM.cs
+++ b/src/Blocktavius.AppDQB2/ScriptVM.cs
@@ -146,6 +146,7 @@ internal ScriptVM()
 		var kinds = new List<NodeKindVM>();
 		kinds.Add(new NodeKindVM(() => new ScriptNodes.PutGroundNodeVM()) { DisplayName = "Put Ground" });
 		kinds.Add(new NodeKindVM(() => new ScriptNodes.PutHillNodeVM()) { DisplayName = "Put Hill" });
+		kinds.Add(new NodeKindVM(() => new ScriptNodes.PutSnippetNodeVM()) { DisplayName = "Put Snippet" });
 		NodeKinds = kinds;
 
 		CommandAddNode = new RelayCommand(_ => SelectedNodeKind != null, DoCommandAddNode);

From d6f96766055c51724350f3e2fdeb1e449caed36b Mon Sep 17 00:00:00 2001
From: Ryan Kramer <default.kramer@gmail.com>
Date: Thu, 15 Jan 2026 13:57:43 -0600
Subject: [PATCH 3/6] put snippet kind of working... should be named CopyBlocks
 instead I think

---
 .../Persistence/V1/ProjectV1.cs               |  2 +-
 src/Blocktavius.AppDQB2/ProjectVM.cs          |  2 +-
 .../Resources/ExtractedSnippetResourceVM.cs   | 41 ++++++++++++-
 .../ScriptNodes/PutSnippetNodeVM.cs           | 29 ++++++++-
 .../StageRebuildContext.cs                    |  9 ++-
 src/Blocktavius.DQB2/MaskedBlockLookup.cs     |  2 +-
 .../Mutations/PutSnippetMutation.cs           | 59 +++++++++++++++++++
 src/Blocktavius.DQB2/Snippet.cs               | 49 ++++++++++++++-
 8 files changed, 184 insertions(+), 9 deletions(-)
 create mode 100644 src/Blocktavius.DQB2/Mutations/PutSnippetMutation.cs

diff --git a/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs b/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs
index 458060a..6469d89 100644
--- a/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs
+++ b/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs
@@ -139,7 +139,7 @@ sealed record RectV1
 	public required int X1 { get; init; }
 	public required int Z1 { get; init; }
 
-	public Rect ToCoreRect()
+	public Rect ToCoreRect() // TODO - make Inclusive() and Exclusive() versions of this function, since that's what we usually want
 	{
 		var start = new XZ(Math.Min(X0, X1), Math.Min(Z0, Z1));
 		var end = new XZ(Math.Max(X0, X1), Math.Max(Z0, Z1));
diff --git a/src/Blocktavius.AppDQB2/ProjectVM.cs b/src/Blocktavius.AppDQB2/ProjectVM.cs
index 9e98073..3c731d9 100644
--- a/src/Blocktavius.AppDQB2/ProjectVM.cs
+++ b/src/Blocktavius.AppDQB2/ProjectVM.cs
@@ -317,7 +317,7 @@ private void ExpandChunks(IReadOnlySet<ChunkOffset> expansion)
 			return null;
 		}
 
-		var context = new StageRebuildContext(workingStage);
+		var context = new StageRebuildContext(workingStage, stageLoader);
 		var mutation = this.SelectedScript?.BuildMutation(context);
 		if (mutation != null)
 		{
diff --git a/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs
index ac53bd4..b4a83a8 100644
--- a/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs
+++ b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs
@@ -3,10 +3,16 @@
 using Blocktavius.AppDQB2.Persistence;
 using System.Linq;
 using Blocktavius.Core;
+using Blocktavius.DQB2;
 
 namespace Blocktavius.AppDQB2.Resources;
 
-sealed class ExtractedSnippetResourceVM : ViewModelBase
+interface ISnippetVM
+{
+	Snippet? LoadSnippet(StageRebuildContext context);
+}
+
+sealed class ExtractedSnippetResourceVM : ViewModelBase, ISnippetVM
 {
 	private string _name = "New Snippet";
 	public string Name
@@ -86,4 +92,37 @@ public static ExtractedSnippetResourceVM Load(ExtractedSnippetV1 persistModel, R
 
 		return vm;
 	}
+
+	public const int TODO_Y_ADJUST = 1; // skip bedrock
+
+	public Snippet? LoadSnippet(StageRebuildContext context)
+	{
+		if (SourceStage == null)
+		{
+			return null;
+		}
+
+		var bounds = AreaDefiner.RebuildCustomRect()?.ToCoreRect();
+		IArea? area = null;
+		if (bounds == null && true == AreaDefiner.Area?.IsArea(context.ImageCoordTranslation, out var areaWrapper))
+		{
+			area = areaWrapper.Area;
+			bounds = areaWrapper.Area.Bounds;
+		}
+		if (bounds == null)
+		{
+			return null;
+		}
+
+		var loadResult = context.StageLoader.LoadStage(SourceStage.StgdatFile).GetAwaiter().GetResult();
+		if (loadResult?.Stage == null)
+		{
+			return null;
+		}
+
+		// TODO!!! Need to respect area if not null here!
+		// Probably Snippet.Create should accept an IArea or a Rect
+		var snippet = Snippet.Create(loadResult.Stage, bounds, floorY: TODO_Y_ADJUST);
+		return snippet;
+	}
 }
diff --git a/src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs b/src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs
index 4600cbe..ecec4a7 100644
--- a/src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs
+++ b/src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs
@@ -1,6 +1,8 @@
 using Blocktavius.AppDQB2.Persistence;
 using Blocktavius.AppDQB2.Resources;
+using Blocktavius.Core;
 using Blocktavius.DQB2;
+using Blocktavius.DQB2.Mutations;
 using System.ComponentModel;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 
@@ -118,7 +120,30 @@ private void RebuildLongStatus()
 
 	public StageMutation? BuildMutation(StageRebuildContext context)
 	{
-		// Not implemented as per request
-		return null;
+		var snippet = Snippet?.LoadSnippet(context);
+		if (snippet == null)
+		{
+			return null;
+		}
+
+		var translated = snippet
+			.Rotate(this.Rotation)
+			.TranslateTo(new XZ(NorthwestX, NorthwestZ));
+
+		// TEMP NOMERGE
+		var toCopy = new MaskedBlockLookup<bool>();
+		toCopy[2] = true; // earth
+		toCopy[3] = true; // grassy earth
+		toCopy[4] = true; // limegrassy earth
+		toCopy[10] = true; // obsidian
+		toCopy[130] = true; // dolomite
+		toCopy[131] = true; // dolomite
+
+		return new PutSnippetMutation()
+		{
+			Snippet = translated,
+			AdjustY = this.AdjustY + ExtractedSnippetResourceVM.TODO_Y_ADJUST,
+			BlocksToCopy = toCopy,
+		};
 	}
 }
diff --git a/src/Blocktavius.AppDQB2/StageRebuildContext.cs b/src/Blocktavius.AppDQB2/StageRebuildContext.cs
index 1012abe..4e5dd15 100644
--- a/src/Blocktavius.AppDQB2/StageRebuildContext.cs
+++ b/src/Blocktavius.AppDQB2/StageRebuildContext.cs
@@ -1,4 +1,6 @@
-using Blocktavius.Core;
+using Blocktavius.AppDQB2.Resources;
+using Blocktavius.AppDQB2.Services;
+using Blocktavius.Core;
 using Blocktavius.DQB2;
 using System;
 using System.Collections.Generic;
@@ -15,9 +17,10 @@ sealed class StageRebuildContext
 	public XZ ImageCoordTranslation { get; }
 	public PRNG PRNG { get; init; } = PRNG.Create(new Random());
 
-	public StageRebuildContext(IMutableStage stage)
+	public StageRebuildContext(IMutableStage stage, IStageLoader stageLoader)
 	{
 		this.stage = stage;
+		this.StageLoader = stageLoader;
 		var minX = stage.ChunksInUse.Select(o => o.NorthwestCorner.X).Min();
 		var minZ = stage.ChunksInUse.Select(o => o.NorthwestCorner.Z).Min();
 		ImageCoordTranslation = new XZ(minX, minZ);
@@ -27,4 +30,6 @@ public void AddError(string error)
 	{
 		this.errors.Add(error);
 	}
+
+	internal IStageLoader StageLoader { get; }
 }
diff --git a/src/Blocktavius.DQB2/MaskedBlockLookup.cs b/src/Blocktavius.DQB2/MaskedBlockLookup.cs
index 0429487..b5e2a91 100644
--- a/src/Blocktavius.DQB2/MaskedBlockLookup.cs
+++ b/src/Blocktavius.DQB2/MaskedBlockLookup.cs
@@ -7,7 +7,7 @@
 
 namespace Blocktavius.DQB2;
 
-sealed class MaskedBlockLookup<T> : IReadOnlyDictionary<ushort, T?>
+public sealed class MaskedBlockLookup<T> : IReadOnlyDictionary<ushort, T?>
 {
 	private const int count = Block.CanonicalBlockCount;
 	const ushort mask = Block.Mask_CanonicalBlockId;
diff --git a/src/Blocktavius.DQB2/Mutations/PutSnippetMutation.cs b/src/Blocktavius.DQB2/Mutations/PutSnippetMutation.cs
new file mode 100644
index 0000000..b1f1510
--- /dev/null
+++ b/src/Blocktavius.DQB2/Mutations/PutSnippetMutation.cs
@@ -0,0 +1,59 @@
+using Blocktavius.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Blocktavius.DQB2.Mutations;
+
+public sealed class PutSnippetMutation : StageMutation
+{
+	public required I2DSampler<IBlockdataColumn> Snippet { get; init; }
+	public MaskedBlockLookup<bool> BlocksToCopy { get; init; } = DefaultBlocksToCopy;
+	public int AdjustY { get; set; } = 0;
+	public bool OverwriteBedrock { get; set; } = false;
+
+	internal override void Apply(IMutableStage stage)
+	{
+		int floorY = OverwriteBedrock ? 0 : 1;
+
+		var bounds = Snippet.Bounds;
+		foreach (var offset in stage.ChunksInUse)
+		{
+			var intersection = Snippet.Bounds.Intersection(offset.Bounds);
+			if (intersection.IsZero || !stage.TryGetChunk(offset, out var chunk))
+			{
+				continue;
+			}
+
+			foreach (var xz in intersection.Enumerate())
+			{
+				var column = Snippet.Sample(xz);
+				for (int y = column.YStart; y < column.YEnd; y++)
+				{
+					int adjustedY = y + AdjustY;
+					if (adjustedY >= floorY && adjustedY < DQB2Constants.MaxElevation)
+					{
+						ushort block = column.GetBlock(y);
+						if (BlocksToCopy[block])
+						{
+							chunk.SetBlock(new Point(xz, adjustedY), block);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	private static readonly MaskedBlockLookup<bool> DefaultBlocksToCopy = new();
+	static PutSnippetMutation()
+	{
+		foreach (var key in DefaultBlocksToCopy.Keys)
+		{
+			DefaultBlocksToCopy[key] = true;
+		}
+		DefaultBlocksToCopy[0] = false; // exclude vacancy
+		DefaultBlocksToCopy[1] = false; // exclude bedrock
+	}
+}
diff --git a/src/Blocktavius.DQB2/Snippet.cs b/src/Blocktavius.DQB2/Snippet.cs
index 49b8aa4..d803cd9 100644
--- a/src/Blocktavius.DQB2/Snippet.cs
+++ b/src/Blocktavius.DQB2/Snippet.cs
@@ -7,15 +7,25 @@
 
 namespace Blocktavius.DQB2;
 
-public sealed class Snippet
+public interface IBlockdataColumn
+{
+	int YStart { get; }
+	int YEnd { get; }
+
+	ushort GetBlock(int y);
+}
+
+public sealed class Snippet : I2DSampler<IBlockdataColumn>
 {
 	private readonly int sizeX;
 	private readonly int sizeZ;
 	private readonly int sizeY;
 	private readonly IReadOnlyList<ushort> blockdata;
+	private readonly int sizePerLayer;
 
 	public XZ SizeXZ => new XZ(sizeX, sizeZ);
 	public int SizeY => sizeY;
+	public Rect Bounds => new Rect(XZ.Zero, SizeXZ);
 
 	private Snippet(IReadOnlyList<ushort> blockdata, XZ sizeXZ, int sizeY)
 	{
@@ -33,6 +43,8 @@ private Snippet(IReadOnlyList<ushort> blockdata, XZ sizeXZ, int sizeY)
 		{
 			throw new ArgumentException($"blockdata too short, needed {totalSize} but got {blockdata.Count}");
 		}
+
+		sizePerLayer = sizeX * sizeZ;
 	}
 
 	public static Snippet Create(IStage stage, Rect bounds, int floorY = 0)
@@ -76,4 +88,39 @@ public static Snippet Create(IStage stage, Rect bounds, int floorY = 0)
 		Array.Resize(ref blockdata, numBlocks);
 		return new Snippet(blockdata, bounds.Size, actualSizeY);
 	}
+
+	IBlockdataColumn I2DSampler<IBlockdataColumn>.Sample(XZ xz)
+	{
+		if (Bounds.Contains(xz))
+		{
+			int index = xz.Z * SizeXZ.X + xz.X;
+			return new Column(this, index);
+		}
+		throw new ArgumentOutOfRangeException(nameof(xz));
+	}
+
+	sealed class Column : IBlockdataColumn
+	{
+		private readonly Snippet snippet;
+		private readonly int indexStart;
+
+		public Column(Snippet snippet, int indexStart)
+		{
+			this.snippet = snippet;
+			this.indexStart = indexStart;
+		}
+
+		public int YStart => 0;
+		public int YEnd => snippet.sizeY;
+
+		public ushort GetBlock(int y)
+		{
+			if (y >= YStart && y < snippet.sizeY)
+			{
+				int index = indexStart + y * snippet.sizePerLayer;
+				return snippet.blockdata[index];
+			}
+			throw new ArgumentOutOfRangeException(nameof(y));
+		}
+	}
 }

From 5988202fc7bc65f34ba63f7847e1483eb29cbb7c Mon Sep 17 00:00:00 2001
From: Ryan Kramer <default.kramer@gmail.com>
Date: Thu, 15 Jan 2026 17:17:51 -0600
Subject: [PATCH 4/6] filldown

---
 .../Persistence/V1/ProjectV1.cs               |  9 +++++--
 .../ExtractedSnippetResourceEditor.xaml       |  3 +++
 .../Resources/ExtractedSnippetResourceVM.cs   | 15 ++++++++---
 .../ScriptNodes/PutGroundNodeVM.cs            |  5 ++--
 .../ScriptNodes/PutSnippetNodeVM.cs           |  3 ++-
 .../Mutations/PutSnippetMutation.cs           | 27 ++++++++++++++++---
 6 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs b/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs
index 6469d89..9b2e3c0 100644
--- a/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs
+++ b/src/Blocktavius.AppDQB2/Persistence/V1/ProjectV1.cs
@@ -139,10 +139,14 @@ sealed record RectV1
 	public required int X1 { get; init; }
 	public required int Z1 { get; init; }
 
-	public Rect ToCoreRect() // TODO - make Inclusive() and Exclusive() versions of this function, since that's what we usually want
+	/// <summary>
+	/// Most of the time the user is entering all 4 values inclusively, but core algorithms
+	/// want the end to be exclusive.
+	/// </summary>
+	public Rect ToCoreRectInclusive()
 	{
 		var start = new XZ(Math.Min(X0, X1), Math.Min(Z0, Z1));
-		var end = new XZ(Math.Max(X0, X1), Math.Max(Z0, Z1));
+		var end = new XZ(Math.Max(X0, X1) + 1, Math.Max(Z0, Z1) + 1);
 		return new Rect(start, end);
 	}
 }
@@ -155,4 +159,5 @@ sealed record ExtractedSnippetV1
 	public required string? SourceStgdatFilename { get; init; }
 	public required string? AreaPersistentId { get; init; }
 	public required RectV1? CustomRectArea { get; init; }
+	public required int? FloorY { get; init; }
 }
diff --git a/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceEditor.xaml b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceEditor.xaml
index ea797f9..c3c6c59 100644
--- a/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceEditor.xaml
+++ b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceEditor.xaml
@@ -21,6 +21,9 @@
                   SelectedItem="{Binding SourceStage}"
                   DisplayMemberPath="Name" Margin="0,0,0,10"/>
 
+        <TextBlock Text="Floor Y:" FontWeight="Bold"></TextBlock>
+        <xctk:IntegerUpDown Value="{Binding FloorY}" Minimum="0" Maximum="95" Margin="0,0,0,10"></xctk:IntegerUpDown>
+
         <GroupBox Header="Area" Margin="0,10,0,0">
             <StackPanel>
                 <TextBlock Text="Pre-defined Area:" Margin="0,5,0,0"/>
diff --git a/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs
index b4a83a8..6a48217 100644
--- a/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs
+++ b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs
@@ -21,6 +21,13 @@ public string Name
 		set => ChangeProperty(ref _name, value);
 	}
 
+	private int _floorY = 1;
+	public int FloorY
+	{
+		get => _floorY;
+		set => ChangeProperty(ref _floorY, value);
+	}
+
 	public string PersistentId { get; private set; } = Guid.NewGuid().ToString();
 
 	private SlotVM? _sourceSlot;
@@ -55,6 +62,7 @@ public ExtractedSnippetV1 ToPersistModel()
 			SourceStgdatFilename = this.SourceStage?.Filename,
 			AreaPersistentId = this.AreaDefiner.Area?.PersistentId,
 			CustomRectArea = this.AreaDefiner.RebuildCustomRect(),
+			FloorY = this.FloorY,
 		};
 	}
 
@@ -64,6 +72,7 @@ public static ExtractedSnippetResourceVM Load(ExtractedSnippetV1 persistModel, R
 		{
 			PersistentId = persistModel.PersistentId ?? Guid.NewGuid().ToString(),
 			Name = persistModel.Name ?? "Unnamed Snippet",
+			FloorY = persistModel.FloorY ?? 1,
 		};
 
 		// Lookup Source Slot
@@ -93,8 +102,6 @@ public static ExtractedSnippetResourceVM Load(ExtractedSnippetV1 persistModel, R
 		return vm;
 	}
 
-	public const int TODO_Y_ADJUST = 1; // skip bedrock
-
 	public Snippet? LoadSnippet(StageRebuildContext context)
 	{
 		if (SourceStage == null)
@@ -102,7 +109,7 @@ public static ExtractedSnippetResourceVM Load(ExtractedSnippetV1 persistModel, R
 			return null;
 		}
 
-		var bounds = AreaDefiner.RebuildCustomRect()?.ToCoreRect();
+		var bounds = AreaDefiner.RebuildCustomRect()?.ToCoreRectInclusive();
 		IArea? area = null;
 		if (bounds == null && true == AreaDefiner.Area?.IsArea(context.ImageCoordTranslation, out var areaWrapper))
 		{
@@ -122,7 +129,7 @@ public static ExtractedSnippetResourceVM Load(ExtractedSnippetV1 persistModel, R
 
 		// TODO!!! Need to respect area if not null here!
 		// Probably Snippet.Create should accept an IArea or a Rect
-		var snippet = Snippet.Create(loadResult.Stage, bounds, floorY: TODO_Y_ADJUST);
+		var snippet = Snippet.Create(loadResult.Stage, bounds, floorY: FloorY);
 		return snippet;
 	}
 }
diff --git a/src/Blocktavius.AppDQB2/ScriptNodes/PutGroundNodeVM.cs b/src/Blocktavius.AppDQB2/ScriptNodes/PutGroundNodeVM.cs
index 3b13f14..dc774a3 100644
--- a/src/Blocktavius.AppDQB2/ScriptNodes/PutGroundNodeVM.cs
+++ b/src/Blocktavius.AppDQB2/ScriptNodes/PutGroundNodeVM.cs
@@ -153,7 +153,7 @@ private void RebuildLongStatus()
 		}
 
 		List<IArea> areas = new();
-		var customRect = RebuildCustomRect()?.ToCoreRect();
+		var customRect = RebuildCustomRect()?.ToCoreRectInclusive();
 		if (Area != null)
 		{
 			if (Area.IsArea(context.ImageCoordTranslation, out var areaWrapper))
@@ -168,8 +168,7 @@ private void RebuildLongStatus()
 		}
 		else if (customRect != null)
 		{
-			// make end inclusive
-			areas.Add(new Rect(customRect.start, customRect.end.Add(1, 1)).AsArea());
+			areas.Add(customRect.AsArea());
 		}
 
 		if (areas.Count == 0)
diff --git a/src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs b/src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs
index ecec4a7..cab53f8 100644
--- a/src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs
+++ b/src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs
@@ -142,8 +142,9 @@ private void RebuildLongStatus()
 		return new PutSnippetMutation()
 		{
 			Snippet = translated,
-			AdjustY = this.AdjustY + ExtractedSnippetResourceVM.TODO_Y_ADJUST,
+			AdjustY = this.AdjustY,
 			BlocksToCopy = toCopy,
+			//AgressiveFilldown = true,
 		};
 	}
 }
diff --git a/src/Blocktavius.DQB2/Mutations/PutSnippetMutation.cs b/src/Blocktavius.DQB2/Mutations/PutSnippetMutation.cs
index b1f1510..73d3325 100644
--- a/src/Blocktavius.DQB2/Mutations/PutSnippetMutation.cs
+++ b/src/Blocktavius.DQB2/Mutations/PutSnippetMutation.cs
@@ -14,9 +14,13 @@ public sealed class PutSnippetMutation : StageMutation
 	public int AdjustY { get; set; } = 0;
 	public bool OverwriteBedrock { get; set; } = false;
 
+	// TODO what to name this? Should probably be an enum... Or maybe a flag in a MaskedBlockLookup
+	public bool AgressiveFilldown { get; set; } = false;
+
 	internal override void Apply(IMutableStage stage)
 	{
 		int floorY = OverwriteBedrock ? 0 : 1;
+		bool agressiveFilldown = this.AgressiveFilldown;
 
 		var bounds = Snippet.Bounds;
 		foreach (var offset in stage.ChunksInUse)
@@ -30,7 +34,11 @@ internal override void Apply(IMutableStage stage)
 			foreach (var xz in intersection.Enumerate())
 			{
 				var column = Snippet.Sample(xz);
-				for (int y = column.YStart; y < column.YEnd; y++)
+
+				int fillDownStart = -1;
+				ushort fillDownBlock = 0;
+
+				for (int y = column.YEnd - 1; y >= column.YStart; y--)
 				{
 					int adjustedY = y + AdjustY;
 					if (adjustedY >= floorY && adjustedY < DQB2Constants.MaxElevation)
@@ -39,9 +47,22 @@ internal override void Apply(IMutableStage stage)
 						if (BlocksToCopy[block])
 						{
 							chunk.SetBlock(new Point(xz, adjustedY), block);
+							fillDownBlock = (ushort)(block & Block.Mask_CanonicalBlockId); // mask off chisel during filldown
+							fillDownStart = adjustedY - 1;
+						}
+						else if (agressiveFilldown && fillDownStart >= 0)
+						{
+							// The previous block (above) passed the filter, this block did not.
+							// This specific pattern is what AgressiveFilldown acts on.
+							break;
 						}
 					}
 				}
+
+				for (int y = fillDownStart; y >= 1; y--) // filldown does not touch the Y=0 layer
+				{
+					chunk.SetBlock(new Point(xz, y), fillDownBlock);
+				}
 			}
 		}
 	}
@@ -49,9 +70,9 @@ internal override void Apply(IMutableStage stage)
 	private static readonly MaskedBlockLookup<bool> DefaultBlocksToCopy = new();
 	static PutSnippetMutation()
 	{
-		foreach (var key in DefaultBlocksToCopy.Keys)
+		foreach (var block in Block.IterateSimpleBlocks())
 		{
-			DefaultBlocksToCopy[key] = true;
+			DefaultBlocksToCopy[block.BlockIdCanonical] = true;
 		}
 		DefaultBlocksToCopy[0] = false; // exclude vacancy
 		DefaultBlocksToCopy[1] = false; // exclude bedrock

From 40de5187fa1aae35c911b4319edda92095a7c3c7 Mon Sep 17 00:00:00 2001
From: Ryan Kramer <default.kramer@gmail.com>
Date: Sat, 17 Jan 2026 18:43:32 -0600
Subject: [PATCH 5/6] fix agressive filldown

---
 src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs | 2 +-
 src/Blocktavius.DQB2/Mutations/PutSnippetMutation.cs    | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs b/src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs
index cab53f8..f7c0fe7 100644
--- a/src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs
+++ b/src/Blocktavius.AppDQB2/ScriptNodes/PutSnippetNodeVM.cs
@@ -143,7 +143,7 @@ private void RebuildLongStatus()
 		{
 			Snippet = translated,
 			AdjustY = this.AdjustY,
-			BlocksToCopy = toCopy,
+			//BlocksToCopy = toCopy,
 			//AgressiveFilldown = true,
 		};
 	}
diff --git a/src/Blocktavius.DQB2/Mutations/PutSnippetMutation.cs b/src/Blocktavius.DQB2/Mutations/PutSnippetMutation.cs
index 73d3325..118240e 100644
--- a/src/Blocktavius.DQB2/Mutations/PutSnippetMutation.cs
+++ b/src/Blocktavius.DQB2/Mutations/PutSnippetMutation.cs
@@ -59,9 +59,12 @@ internal override void Apply(IMutableStage stage)
 					}
 				}
 
-				for (int y = fillDownStart; y >= 1; y--) // filldown does not touch the Y=0 layer
+				if (agressiveFilldown)
 				{
-					chunk.SetBlock(new Point(xz, y), fillDownBlock);
+					for (int y = fillDownStart; y >= 1; y--) // filldown does not touch the Y=0 layer
+					{
+						chunk.SetBlock(new Point(xz, y), fillDownBlock);
+					}
 				}
 			}
 		}

From decf7f8958178d5a3d04908a555bc11bd472ce48 Mon Sep 17 00:00:00 2001
From: Ryan Kramer <default.kramer@gmail.com>
Date: Thu, 5 Feb 2026 11:46:44 -0600
Subject: [PATCH 6/6] bad deadlock fix

---
 src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs
index 6a48217..09c49af 100644
--- a/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs
+++ b/src/Blocktavius.AppDQB2/Resources/ExtractedSnippetResourceVM.cs
@@ -121,7 +121,7 @@ public static ExtractedSnippetResourceVM Load(ExtractedSnippetV1 persistModel, R
 			return null;
 		}
 
-		var loadResult = context.StageLoader.LoadStage(SourceStage.StgdatFile).GetAwaiter().GetResult();
+		var loadResult = Task.Run(async () => await context.StageLoader.LoadStage(SourceStage.StgdatFile)).GetAwaiter().GetResult();
 		if (loadResult?.Stage == null)
 		{
 			return null;