Merge pull request #398 from danocmx/fix/pumpkin-patch-exception

danocmx · Oct 16, 2024 · 8afd0b3 · 8afd0b3
2 parents b4df947 + 216ee25
commit 8afd0b3
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/parseString/Attributes/getEffect.ts b/src/parseString/Attributes/getEffect.ts
@@ -19,16 +19,16 @@ export default function (name: string, attributes: Attributes): string | void {
 	for (let i = 0; i < effectsKeys.length; i++) {
 		let effect: string | number = effectsKeys[i];
 
+		if (!name.includes(`${effect} `)) {
+			continue;
+		}
+
 		// New type of exception
 		if (effect === 'Smoking' && name.includes('Smoking Smoking Skid Lid')) {
 			return 'Smoking';
 		}
 
-		if (
-			effect === 'Haunted Ghosts' &&
-			name.includes('Haunted Ghosts ') &&
-			attributes.wear
-		) {
+		if (isEffectTexture(attributes, effect)) {
 			continue;
 		}
 
@@ -38,11 +38,7 @@ export default function (name: string, attributes: Attributes): string | void {
 				return exception[1];
 		}
 
-		if (
-			!isNumber(effect) &&
-			name.includes(`${effect} `) &&
-			!isException(name, effect)
-		) {
+		if (!isNumber(effect) && !isHatNameException(name, effect)) {
 			return effect;
 		}
 	}
@@ -72,9 +68,20 @@ const HAT_NAME_EXCEPTIONS: [string, string][] = [
 	['Cool Warm Sweater', 'Cool'],
 ];
 
-function isException(name: string, effect: string): boolean {
+function isHatNameException(name: string, effect: string): boolean {
 	return HAT_NAME_EXCEPTIONS.some((exception) => {
 		const [exceptionName, exceptionEffect] = exception;
 		return name.includes(exceptionName) && effect === exceptionEffect;
 	});
 }
+
+export const TEXTURE_EFFECT_EXCEPTION: string[] = ['Haunted Ghosts', 'Pumpkin Patch'];
+
+function isEffectTexture(
+	attributes: Attributes,
+	effectOrTexture: string
+): boolean {
+	return !!(
+		TEXTURE_EFFECT_EXCEPTION.includes(effectOrTexture) && attributes.wear
+	);
+}
diff --git a/src/shared/getTexture.ts b/src/shared/getTexture.ts
@@ -1,6 +1,7 @@
 import isNumber from '../util/isNumber';
 
 import { ISchema } from '../types/schema';
+import { TEXTURE_EFFECT_EXCEPTION } from '../parseString/Attributes/getEffect';
 
 const TEXTURE_EXCEPTIONS = [['Health and Hell', 'Health and Hell (Green)']];
 
@@ -19,11 +20,11 @@ export default function (
 	for (let i = 0; i < textureKeys.length; i++) {
 		const texture: number | string = textureKeys[i];
 
-		if (
-			texture === 'Haunted Ghosts' &&
-			name.includes('Haunted Ghosts') &&
-			!attributes.wear
-		) {
+		if (!name.includes(`${texture} `)) {
+			continue;
+		}
+
+		if (isTextureEffect(attributes, texture)) {
 			continue;
 		}
 
@@ -55,3 +56,12 @@ function isTextureToEffectException(name: string, texture: string): boolean {
 	}
 	return false;
 }
+
+function isTextureEffect(
+	attributes: { wear: any | null },
+	effectOrTexture: string
+): boolean {
+	return !!(
+		TEXTURE_EFFECT_EXCEPTION.includes(effectOrTexture) && !attributes.wear
+	);
+}
diff --git a/test/parseString.js b/test/parseString.js
@@ -1382,6 +1382,29 @@ describe('parseString with numbers', () => {
 			quality: 6,
 		});
 	});
+
+	it('Case #52 - Pumpking Patch #1', () => {
+		const itemObject = parseString('Pumpkin Patch Taunt: Most Wanted', true, false);
+
+		assert.deepEqual(itemObject, {
+			name: 'Taunt: Most Wanted',
+			craftable: true,
+			effect: 3184,
+			quality: 5,
+		});
+	});
+
+	it('Case #52 - Pumpking Patch #1', () => {
+		const itemObject = parseString('Strange Pumpkin Patch Minigun (Factory New)', true, false);
+
+		assert.deepEqual(itemObject, {
+			name: 'Minigun',
+			craftable: true,
+			quality: 11,
+			wear: 1,
+			texture: 62
+		});
+	});
 });
 
 describe('parseString with defindexes and numbers.', () => {