From 2c5f8d2b2097fdaa9fba12347abcd064969e2719 Mon Sep 17 00:00:00 2001
From: Discordian <therealdiscordian@gmail.com>
Date: Thu, 9 Nov 2023 17:20:10 -0500
Subject: [PATCH 1/2] create_new_sitem function for handling new properties on
 stackables, added into buying from merchants & sending items to players

---
 .DS_Store      | Bin 32772 -> 28676 bytes
 node/server.js |  24 ++++++++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 55df46adb6c5d43b264dc05f491fdc75e54db0ba..3a5c9b701c4a51a612bb681153bb2cc625011d1a 100644
GIT binary patch
delta 144
zcmZo^U}|~5I6;ajfqSBiF>59R0|VQ}knQ}8BAa;<ez9#{DZt9PnOorq@8%+L8>Y?N
z25^?cA9+?L1_lO}%{&E{**4z~Q)5(TVBlZ?gA8s41_oCK1_2%hh6HW~1_d4l1_K@j
n1_vGnh5(+8g^!sh^XEjeFfuR{OwP#Z-TX7>8RO>rVXBM(emf*k

delta 504
zcmZp9z}V8jG(n1~fM=qNF>3(>0|WcUknQ~S{0s~XtPI5rB@BrS$qd;!>4w3{`MDr@
z1_ri}|ERLL`7SO=Ir&Kp3=A9!cjqo#n{&t!T}2836$KecHgF0AFrXT+`Ma11=f;Lu
zw$0oMM|d|D+AwYAHh?i4{>Za})N^m<5%|T%jpXjh!s16JUrjgC<OInxFl2BuFfh0>
zFbME4Fck1GFevaaFc|PKFgWlqFa+>0FeGqqEWFP=nLj6Ta!yX~=C3KQ7==K-LUqjK
zH`*Hff<l7Af+C_KV&Wnak`mIBb*+y~HVBg7U|?Wi0x93jlW>`hM9p&X0{q1p`Q@I;
z`FR0Fsb!g|<q?_5`FX*aRjJDMA0`{vNXaNW<bMErhC_gnGbArDH<eS_A*BH<G&$Br
qR{Ad^JEJ6{5~DVw38NXKJ);MsC!;r`4`U!>(By7i#myTdg4qFv#B_lG

diff --git a/node/server.js b/node/server.js
index cb7cc21..7dce9ae 100644
--- a/node/server.js
+++ b/node/server.js
@@ -1673,6 +1673,20 @@ function create_new_item(name, quantity) {
 	return new_item;
 }
 
+function create_new_sitem(item, quantity) {
+	let s_item = create_new_item(item.name, quantity);
+	if (item.v) {
+		s_item.v = item.v;
+	}
+	if (item.data) {
+		s_item.data = item.data;
+	}
+	if (item.p) {
+		s_item.p = item.p;
+	}
+	return s_item;
+}
+
 function aadd_item(player, new_item) {
 	// admin [24/06/23]
 	add_item(player, new_item, { announce: false });
@@ -6990,13 +7004,7 @@ function init_io() {
 				}
 
 				if (item.q) {
-					s_item = create_new_item(item.name, data.q);
-					if (item.v) {
-						s_item.v = item.v;
-					}
-					if (item.data) {
-						s_item.data = item.data;
-					}
+					s_item = create_new_sitem(item, data.q);
 					num = add_item(receiver, s_item, { announce: false });
 				} else {
 					s_item = item;
@@ -7460,7 +7468,7 @@ function init_io() {
 			}
 
 			if (item.q) {
-				num = add_item(player, create_new_item(item.name, data.q), { announce: false });
+				num = add_item(player, create_new_sitem(item, data.q), { announce: false });
 			} else {
 				num = add_item(player, item, { announce: false });
 			}

From 2d2669a96ce949fc774a0196dd7743c98ad160fc Mon Sep 17 00:00:00 2001
From: Discordian <therealdiscordian@gmail.com>
Date: Thu, 9 Nov 2023 17:37:17 -0500
Subject: [PATCH 2/2] revert .DS_Store changes

---
 .DS_Store | Bin 28676 -> 32772 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 3a5c9b701c4a51a612bb681153bb2cc625011d1a..55df46adb6c5d43b264dc05f491fdc75e54db0ba 100644
GIT binary patch
delta 504
zcmZp9z}V8jG(n1~fM=qNF>3(>0|WcUknQ~S{0s~XtPI5rB@BrS$qd;!>4w3{`MDr@
z1_ri}|ERLL`7SO=Ir&Kp3=A9!cjqo#n{&t!T}2836$KecHgF0AFrXT+`Ma11=f;Lu
zw$0oMM|d|D+AwYAHh?i4{>Za})N^m<5%|T%jpXjh!s16JUrjgC<OInxFl2BuFfh0>
zFbME4Fck1GFevaaFc|PKFgWlqFa+>0FeGqqEWFP=nLj6Ta!yX~=C3KQ7==K-LUqjK
zH`*Hff<l7Af+C_KV&Wnak`mIBb*+y~HVBg7U|?Wi0x93jlW>`hM9p&X0{q1p`Q@I;
z`FR0Fsb!g|<q?_5`FX*aRjJDMA0`{vNXaNW<bMErhC_gnGbArDH<eS_A*BH<G&$Br
qR{Ad^JEJ6{5~DVw38NXKJ);MsC!;r`4`U!>(By7i#myTdg4qFv#B_lG

delta 144
zcmZo^U}|~5I6;ajfqSBiF>59R0|VQ}knQ}8BAa;<ez9#{DZt9PnOorq@8%+L8>Y?N
z25^?cA9+?L1_lO}%{&E{**4z~Q)5(TVBlZ?gA8s41_oCK1_2%hh6HW~1_d4l1_K@j
n1_vGnh5(+8g^!sh^XEjeFfuR{OwP#Z-TX7>8RO>rVXBM(emf*k