From ff473bf4652b1379c1ec6c150112d477d89bd3be Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sat, 28 May 2022 22:21:47 -0500
Subject: [PATCH] [nostalgia/sample_project] Add new type descriptors

---
 ...rinkingtea.nostalgia.core.NostalgiaGraphic | 108 ------------------
 ...rinkingtea.nostalgia.core.NostalgiaPalette |  16 ---
 .../net.drinkingtea.nostalgia.core.TileSheet  |  94 +--------------
 ...nkingtea.nostalgia.core.TileSheet.SubSheet |  27 +++++
 .../net.drinkingtea.ox.FileAddress            |  14 +++
 .../net.drinkingtea.ox.FileAddress.Data       |  18 +++
 sample_project/Palettes/Charset.npal          | Bin 63 -> 53 bytes
 sample_project/Palettes/Dirt.npal             |   2 +-
 sample_project/TileSheets/Charset.ng          | Bin 836 -> 903 bytes
 sample_project/TileSheets/Dirt.ng             | Bin 109 -> 106 bytes
 10 files changed, 63 insertions(+), 216 deletions(-)
 delete mode 100644 sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaGraphic
 delete mode 100644 sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaPalette
 create mode 100644 sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet
 create mode 100644 sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress
 create mode 100644 sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data

diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaGraphic b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaGraphic
deleted file mode 100644
index 6ba7203d..00000000
--- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaGraphic
+++ /dev/null
@@ -1,108 +0,0 @@
-O1;net.drinkingtea.ox.DescriptorType;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "bpp",
-			"type" : 
-			{
-				"fieldList" : [],
-				"length" : 1,
-				"primitiveType" : 1,
-				"typeName" : "B:int8_t"
-			}
-		},
-		{
-			"fieldName" : "rows",
-			"type" : 
-			{
-				"fieldList" : [],
-				"length" : 4,
-				"primitiveType" : 1,
-				"typeName" : "B:int32_t"
-			}
-		},
-		{
-			"fieldName" : "columns",
-			"typeName" : "B:int32_t"
-		},
-		{
-			"fieldName" : "defaultPalette",
-			"type" : 
-			{
-				"fieldList" : 
-				[
-					{
-						"fieldName" : "type",
-						"typeName" : "B:int8_t"
-					},
-					{
-						"fieldName" : "data",
-						"type" : 
-						{
-							"fieldList" : 
-							[
-								{
-									"fieldName" : "path",
-									"type" : 
-									{
-										"fieldList" : [],
-										"primitiveType" : 4,
-										"typeName" : "B:string"
-									}
-								},
-								{
-									"fieldName" : "constPath",
-									"typeName" : "B:string"
-								},
-								{
-									"fieldName" : "inode",
-									"type" : 
-									{
-										"fieldList" : [],
-										"length" : 8,
-										"typeName" : "B:uint64_t"
-									}
-								}
-							],
-							"primitiveType" : 6,
-							"typeName" : "net.drinkingtea.ox.FileAddress.Data"
-						}
-					}
-				],
-				"primitiveType" : 5,
-				"typeName" : "net.drinkingtea.ox.FileAddress"
-			}
-		},
-		{
-			"fieldName" : "pal",
-			"type" : 
-			{
-				"fieldList" : 
-				[
-					{
-						"fieldName" : "colors",
-						"type" : 
-						{
-							"fieldList" : [],
-							"length" : 2,
-							"typeName" : "B:uint16_t"
-						}
-					}
-				],
-				"primitiveType" : 5,
-				"typeName" : "net.drinkingtea.nostalgia.core.NostalgiaPalette"
-			}
-		},
-		{
-			"fieldName" : "pixels",
-			"type" : 
-			{
-				"fieldList" : [],
-				"length" : 1,
-				"typeName" : "B:uint8_t"
-			}
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.NostalgiaGraphic"
-}
diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaPalette b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaPalette
deleted file mode 100644
index cfb86842..00000000
--- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaPalette
+++ /dev/null
@@ -1,16 +0,0 @@
-O1;net.drinkingtea.ox.DescriptorType;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "colors",
-			"type" : 
-			{
-				"fieldList" : [],
-				"length" : 2,
-				"typeName" : "B:uint16_t"
-			}
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.NostalgiaPalette"
-}
diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet
index a90a9331..2137fde6 100644
--- a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet
+++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet
@@ -3,103 +3,15 @@ O1;net.drinkingtea.ox.DescriptorType;1;{
 	[
 		{
 			"fieldName" : "bpp",
-			"type" : 
-			{
-				"fieldList" : [],
-				"length" : 1,
-				"primitiveType" : 1,
-				"typeName" : "B:int8_t"
-			}
+			"typeName" : "B:int8_t"
 		},
 		{
 			"fieldName" : "defaultPalette",
-			"type" : 
-			{
-				"fieldList" : 
-				[
-					{
-						"fieldName" : "type",
-						"typeName" : "B:int8_t"
-					},
-					{
-						"fieldName" : "data",
-						"type" : 
-						{
-							"fieldList" : 
-							[
-								{
-									"fieldName" : "path",
-									"type" : 
-									{
-										"fieldList" : [],
-										"primitiveType" : 4,
-										"typeName" : "B:string"
-									}
-								},
-								{
-									"fieldName" : "constPath",
-									"typeName" : "B:string"
-								},
-								{
-									"fieldName" : "inode",
-									"type" : 
-									{
-										"fieldList" : [],
-										"length" : 8,
-										"typeName" : "B:uint64_t"
-									}
-								}
-							],
-							"primitiveType" : 6,
-							"typeName" : "net.drinkingtea.ox.FileAddress.Data"
-						}
-					}
-				],
-				"primitiveType" : 5,
-				"typeName" : "net.drinkingtea.ox.FileAddress"
-			}
+			"typeName" : "net.drinkingtea.ox.FileAddress"
 		},
 		{
 			"fieldName" : "subsheet",
-			"type" : 
-			{
-				"fieldList" : 
-				[
-					{
-						"fieldName" : "name",
-						"typeName" : "B:string"
-					},
-					{
-						"fieldName" : "rows",
-						"type" : 
-						{
-							"fieldList" : [],
-							"length" : 4,
-							"primitiveType" : 1,
-							"typeName" : "B:int32_t"
-						}
-					},
-					{
-						"fieldName" : "columns",
-						"typeName" : "B:int32_t"
-					},
-					{
-						"fieldName" : "subsheets",
-						"typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet"
-					},
-					{
-						"fieldName" : "pixels",
-						"type" : 
-						{
-							"fieldList" : [],
-							"length" : 1,
-							"typeName" : "B:uint8_t"
-						}
-					}
-				],
-				"primitiveType" : 5,
-				"typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet"
-			}
+			"typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet"
 		}
 	],
 	"primitiveType" : 5,
diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet
new file mode 100644
index 00000000..39b9101b
--- /dev/null
+++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet
@@ -0,0 +1,27 @@
+O1;net.drinkingtea.ox.DescriptorType;1;{
+	"fieldList" : 
+	[
+		{
+			"fieldName" : "name",
+			"typeName" : "B:string"
+		},
+		{
+			"fieldName" : "rows",
+			"typeName" : "B:int32_t"
+		},
+		{
+			"fieldName" : "columns",
+			"typeName" : "B:int32_t"
+		},
+		{
+			"fieldName" : "subsheets",
+			"typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet"
+		},
+		{
+			"fieldName" : "pixels",
+			"typeName" : "B:uint8_t"
+		}
+	],
+	"primitiveType" : 5,
+	"typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet"
+}
diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress
new file mode 100644
index 00000000..5ca39075
--- /dev/null
+++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress
@@ -0,0 +1,14 @@
+O1;net.drinkingtea.ox.DescriptorType;1;{
+	"fieldList" : 
+	[
+		{
+			"fieldName" : "type",
+			"typeName" : "B:int8_t"
+		},
+		{
+			"fieldName" : "data"
+		}
+	],
+	"primitiveType" : 5,
+	"typeName" : "net.drinkingtea.ox.FileAddress"
+}
diff --git a/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data
new file mode 100644
index 00000000..ca616968
--- /dev/null
+++ b/sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data
@@ -0,0 +1,18 @@
+O1;net.drinkingtea.ox.DescriptorType;1;{
+	"fieldList" : 
+	[
+		{
+			"fieldName" : "path"
+		},
+		{
+			"fieldName" : "constPath",
+			"typeName" : "B:string"
+		},
+		{
+			"fieldName" : "inode",
+			"typeName" : "B:uint64_t"
+		}
+	],
+	"primitiveType" : 6,
+	"typeName" : "net.drinkingtea.ox.FileAddress.Data"
+}
diff --git a/sample_project/Palettes/Charset.npal b/sample_project/Palettes/Charset.npal
index c9e15bccb09835dc02540cfa8d367dec28e7badf..a36ba8e9076eccdac3174830a8da5dff8a7d4fc8 100644
GIT binary patch
delta 24
fcmcCFouDKfkeHKNQj%(IXwAsN%*?>@`#(DXRBr~r

delta 34
pcmXrDpP(e`mtS0xn3JBF7?7BgT2hi~ZD`HN!pzLT^7}tK7XZQ?3U&Yh

diff --git a/sample_project/Palettes/Dirt.npal b/sample_project/Palettes/Dirt.npal
index 99468746..8be698b1 100644
--- a/sample_project/Palettes/Dirt.npal
+++ b/sample_project/Palettes/Dirt.npal
@@ -1 +1 @@
-M2;net.drinkingtea.nostalgia.core.NostalgiaPalette;1;
ûÿ³Ö
+M2;net.drinkingtea.nostalgia.core.Palette;1;
ûÿ³Ö
\ No newline at end of file
diff --git a/sample_project/TileSheets/Charset.ng b/sample_project/TileSheets/Charset.ng
index 487bb983cf97ecf4998fed283753340ba9ee8b82..797a97e0aaa4d752b1f1fad83f3691f208569e1d 100644
GIT binary patch
delta 154
zcmX@Y*3Ldb$uA@`Cp9=DHMPXr$eNvliBU&CATcMkq$IUi-#H_(s5rGmFRvgmhm#{H
zKfi>7U!2P+CowOZiOGQh2*kx4a|$vN6+#ONQj4Tm7<nf~WNa2;%w^;i=kqJgO-d~)
z=3-%Fop?ZFawAhcP%yYMHz_}-n2m#xZQ=_ZmV~@#Y?GLs`4kkCl$aEN089Y@R6Z$5

delta 65
zcmZo?Kf*RaN!%~LxFj(rJu}h0D6t?TGuhhETAzbQV4{H}8>0jR5KJt{m>k5UF`127
TXXA}r#>rJo^^?t*of)|Rf`bxN

diff --git a/sample_project/TileSheets/Dirt.ng b/sample_project/TileSheets/Dirt.ng
index 7f79822a3c481cdf0d6820a54a71c4b2064e7e49..8fa39b5381605c2c65fb8bef96ce8b9a72602af1 100644
GIT binary patch
delta 77
zcmd1JnxNznl9`hloROMZVr^v2&cVc}rXP@)lUh=eTCDGqSyZBzSCE(^&JmQKU&6w|
c$fUsFz{tSF!05ohz|^3?z`>*d224y$07nE7DF6Tf

delta 62
zcmd1GouDM{mtS0xn3JBF=w6gqkdc{eZD_5}!NM}pKunI2NrAzEk%5VU(}973sX>8(
OgGm7hfCLj06BhsitPBYN