Allow g.e trading hat/mask

oldschoolgg · Oct 13, 2023 · 00812a6 · 00812a6
1 parent e396277
commit 00812a6
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/src/lib/customItems/customItems.ts b/src/lib/customItems/customItems.ts
@@ -9358,7 +9358,8 @@ setCustomItem(
 	{
 		customItemData: {
 			cantDropFromMysteryBoxes: true,
-			isSuperUntradeable: true
+			isSuperUntradeable: true,
+			superTradeableButTradeableOnGE: true
 		}
 	},
 	100_000
@@ -9410,7 +9411,8 @@ setCustomItem(
 	{
 		customItemData: {
 			cantDropFromMysteryBoxes: true,
-			isSuperUntradeable: true
+			isSuperUntradeable: true,
+			superTradeableButTradeableOnGE: true
 		}
 	},
 	100_000

diff --git a/src/lib/customItems/util.ts b/src/lib/customItems/util.ts
@@ -34,6 +34,14 @@ export function setCustomItem(id: number, name: string, baseItem: string, newIte
 	if (hasSet.some(i => i.name === name) && name !== 'Smokey') {
 		throw new Error(`Tried to add 2 custom items with same name, called ${name}`);
 	}
+	if (
+		newItemData &&
+		newItemData.customItemData &&
+		newItemData.customItemData.superTradeableButTradeableOnGE &&
+		!newItemData.customItemData.isSuperUntradeable
+	) {
+		throw new Error('Tried to add a custom item with superTradeableButTradeableOnGE, but not isSuperUntradeable');
+	}
 	const data = deepMerge({ ...getOSItem(baseItem) }, { ...newItemData, name, id });
 	data.price = price || 1;
 

diff --git a/src/lib/grandExchange.ts b/src/lib/grandExchange.ts
@@ -17,7 +17,7 @@ import {
 	assert,
 	generateGrandExchangeID,
 	getInterval,
-	isSuperUntradeable,
+	isGEUntradeable,
 	itemNameFromID,
 	makeComponents,
 	toKMB
@@ -295,7 +295,7 @@ class GrandExchangeSingleton {
 			return { error: 'Invalid item.' };
 		}
 
-		if (isSuperUntradeable(item.id)) {
+		if (isGEUntradeable(item.id)) {
 			return { error: 'Invalid item.' };
 		}
 

diff --git a/src/lib/itemMods.ts b/src/lib/itemMods.ts
@@ -4,6 +4,7 @@ export interface CustomItemData {
 	cantDropFromMysteryBoxes?: boolean;
 	cantBeDropped?: true;
 	isDiscontinued?: true;
+	superTradeableButTradeableOnGE?: true;
 }
 
 declare module 'oldschooljs/dist/meta/types' {

diff --git a/src/lib/util.ts b/src/lib/util.ts
@@ -319,6 +319,17 @@ export function isSuperUntradeable(item: number | Item) {
 	return id >= 40_000 && id <= 45_000;
 }
 
+export function isGEUntradeable(item: number | Item) {
+	const fullItem = typeof item === 'number' ? Items.get(item) : item;
+	if (!fullItem || !fullItem.customItemData || !fullItem.customItemData.superTradeableButTradeableOnGE) {
+		return isSuperUntradeable(item);
+	}
+	if (fullItem.customItemData.isSuperUntradeable && fullItem.customItemData.superTradeableButTradeableOnGE) {
+		return false;
+	}
+	return isSuperUntradeable(item);
+}
+
 export function birdhouseLimit(user: MUser) {
 	let base = 4;
 	if (user.bitfield.includes(BitField.HasScrollOfTheHunt)) base += 4;