Expanding ship.canAwardEquipment to allow other contexts

OoliteProject · Oct 3, 2023 · 0b7c566 · 0b7c566
1 parent c90ee13
commit 0b7c566
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/Core/Scripting/OOJSShip.m b/src/Core/Scripting/OOJSShip.m
@@ -2569,6 +2569,7 @@ static JSBool ShipCanAwardEquipment(JSContext *context, uintN argc, jsval *vp)
 
 	ShipEntity					*thisEnt = nil;
 	NSString					*key = nil;
+	NSString					*ctx = @"scripted";
 	BOOL						result;
 	BOOL						exists;
 
@@ -2583,12 +2584,21 @@ static JSBool ShipCanAwardEquipment(JSContext *context, uintN argc, jsval *vp)
 
 	if (exists)
 	{
+		if (argc > 1)
+		{
+			ctx = OOStringFromJSValue(context, OOJS_ARGV[1]);
+			if (![ctx isEqualToString:@"scripted"] && ![ctx isEqualToString:@"purchase"] && ![ctx isEqualToString:@"newShip"] && ![ctx isEqualToString:@"npc"])
+			{
+				OOJSReportBadArguments(context, @"Ship", @"canAwardEquipment", MIN(argc, 2U), OOJS_ARGV, nil, @"context");
+				return NO;
+			}
+		}
 		result = YES;
 
 		// can't add fuel as equipment.
 		if ([key isEqualToString:@"EQ_FUEL"])  result = NO;
 
-		if (result)  result = [thisEnt canAddEquipment:key inContext:@"scripted"];
+		if (result)  result = [thisEnt canAddEquipment:key inContext:ctx];
 	}
 	else
 	{