Add LimitCategory to items

Author: 1337LutZ

assets/database/db.bin

@@ -47,7 +47,7 @@ message UINPC {
 // Contains all information about an Item needed by the UI.
 // Generally this will include everything needed by the sim, plus some
 // additional data for displaying / filtering.
-// Next tag: 30.
+// Next tag: 32.
 message UIItem {
 	int32 id = 1;
 	string name = 2;
@@ -75,6 +75,8 @@ message UIItem {
 	int32 phase = 16;
 	ItemQuality quality = 17;
 	bool unique = 18;
+	// How many of that item can be equipped at once.
+	int32 limit_category = 32;
 	string name_description = 19;
 
 	// Classes that are allowed to use the item. Empty indicates no special class restrictions.

assets/database/db.json

@@ -42,6 +42,7 @@ type Item struct {
 	SocketModifier         []float64 // Todo: Figure out if this is socket modifier in disguise or something else - I call it that for now.
 	NameDescription        string    // Contains information for i.E. Thunderforging. Normal = Thunderforged, HC = Heroic Thunderforged
 	UpgradeID              int
+	LimitCategory          int
 }
 
 func (item *Item) ToUIItem() *proto.UIItem {
@@ -67,6 +68,7 @@ func (item *Item) ToScaledUIItem(itemLevel int) *proto.UIItem {
 		GemSockets:          item.GetGemSlots(),
 		SocketBonus:         NullFloat(item.GetGemBonus().ToProtoArray()),
 		NameDescription:     item.NameDescription,
+		LimitCategory:       int32(item.LimitCategory),
 	}
 
 	item.ParseItemFlags(uiItem)

assets/database/leftover_db.bin

@@ -58,6 +58,7 @@ func ScanRawItemData(rows *sql.Rows) (dbc.Item, error) {
 		&raw.ItemSubClass,
 		&raw.NameDescription,
 		&raw.UpgradeID,
+		&raw.LimitCategory,
 	)
 	if err != nil {
 		panic(err)
@@ -129,7 +130,8 @@ func LoadAndWriteRawItems(dbHelper *DBHelper, filter string, inputsDir string) (
 			 i.ClassID,
 			 i.SubClassID,
 			 COALESCE(ind.Description_lang, ''),
-			 COALESCE(riu.ItemUpgradeID, 0)
+			 COALESCE(riu.ItemUpgradeID, 0),
+			s.LimitCategory
 		FROM Item i
 		JOIN ItemSparse s ON i.ID = s.ID
 		JOIN ItemClass ic ON i.ClassID = ic.ClassID

assets/database/leftover_db.json

@@ -95,7 +95,7 @@ export class BulkTab extends SimTab {
 		super(parentElem, simUI, { identifier: 'bulk-tab', title: i18n.t('bulk_tab.title') });
 
 		this.simUI = simUI;
-		this.playerCanDualWield = this.simUI.player.getPlayerSpec().canDualWield && (this.simUI.player.getClass() !== Class.ClassHunter);
+		this.playerCanDualWield = this.simUI.player.getPlayerSpec().canDualWield && this.simUI.player.getClass() !== Class.ClassHunter;
 		this.playerIsFuryWarrior = this.simUI.player.getSpec() === Spec.SpecFuryWarrior;
 
 		const setupTabBtnRef = ref<HTMLButtonElement>();
@@ -482,7 +482,13 @@ export class BulkTab extends SimTab {
 
 			const pickerGroup = this.pickerGroups.get(bulkItemSlot)!;
 			const allItemOptions: EquippedItem[] = Array.from(pickerGroup.pickers.values()).map(picker => picker.item);
-			all2HWeapons = all2HWeapons.concat(allItemOptions.filter(equippedItem => ![RangedWeaponType.RangedWeaponTypeUnknown, RangedWeaponType.RangedWeaponTypeWand].includes(equippedItem.item.rangedWeaponType) || (equippedItem.item.handType == HandType.HandTypeTwoHand)));
+			all2HWeapons = all2HWeapons.concat(
+				allItemOptions.filter(
+					equippedItem =>
+						![RangedWeaponType.RangedWeaponTypeUnknown, RangedWeaponType.RangedWeaponTypeWand].includes(equippedItem.item.rangedWeaponType) ||
+						equippedItem.item.handType == HandType.HandTypeTwoHand,
+				),
+			);
 		}
 
 		for (const twoHandWeapon of all2HWeapons) {
@@ -517,7 +523,9 @@ export class BulkTab extends SimTab {
 		const oneHandGroup = this.pickerGroups.get(BulkSimItemSlot.ItemSlotHandWeapon);
 
 		if (oneHandGroup?.pickers.size) {
-			const allOneHandWeapons: EquippedItem[] = Array.from(oneHandGroup.pickers.values()).map(picker => picker.item).filter(item => !all2HWeapons.includes(item));
+			const allOneHandWeapons: EquippedItem[] = Array.from(oneHandGroup.pickers.values())
+				.map(picker => picker.item)
+				.filter(item => !all2HWeapons.includes(item));
 
 			for (let i = 0; i < allOneHandWeapons.length; i++) {
 				for (let j = i; j < allOneHandWeapons.length; j++) {
@@ -555,7 +563,10 @@ export class BulkTab extends SimTab {
 		}
 
 		for (const [bulkItemSlot, pickerGroup] of this.pickerGroups.entries()) {
-			if ((pickerGroup.pickers.size == 0) || [BulkSimItemSlot.ItemSlotMainHand, BulkSimItemSlot.ItemSlotOffHand, BulkSimItemSlot.ItemSlotHandWeapon].includes(bulkItemSlot)) {
+			if (
+				pickerGroup.pickers.size == 0 ||
+				[BulkSimItemSlot.ItemSlotMainHand, BulkSimItemSlot.ItemSlotOffHand, BulkSimItemSlot.ItemSlotHandWeapon].includes(bulkItemSlot)
+			) {
 				continue;
 			}
 
@@ -596,10 +607,7 @@ export class BulkTab extends SimTab {
 
 				const numOptions: number = pickerGroup.pickers.size;
 
-				if (
-					numOptions > 1 &&
-					[BulkSimItemSlot.ItemSlotFinger, BulkSimItemSlot.ItemSlotTrinket].includes(bulkItemSlot)
-				) {
+				if (numOptions > 1 && [BulkSimItemSlot.ItemSlotFinger, BulkSimItemSlot.ItemSlotTrinket].includes(bulkItemSlot)) {
 					numCombinations *= binomialCoefficient(numOptions, 2);
 				} else {
 					numCombinations *= Math.max(numOptions, 1);
@@ -787,8 +795,8 @@ export class BulkTab extends SimTab {
 						updatedGear = updatedGear.withEquippedItem(
 							itemSlot,
 							equippedItemInSlot
-								? equippedItemInSlot.withItem(equippedItem.item)
-								: new EquippedItem({ item: equippedItem.item, challengeMode: challengeModeEnabled }),
+								? equippedItemInSlot.withItem(equippedItem.item).withUpgrade(equippedItem._upgrade)
+								: equippedItem.withChallengeMode(challengeModeEnabled),
 							this.playerIsFuryWarrior,
 						);
 
@@ -882,7 +890,6 @@ export class BulkTab extends SimTab {
 			} finally {
 				this.simUI.player.setGear(TypedEvent.nextEventID(), this.originalGear!);
 				await this.simUI.sim.updateCharacterStats(TypedEvent.nextEventID());
-
 				this.isRunning = false;
 				if (!waitAbort) this.bulkSimButton.disabled = false;
 				if (isAborted) {
@@ -891,6 +898,7 @@ export class BulkTab extends SimTab {
 						body: i18n.t('bulk_tab.notifications.bulk_sim_cancelled'),
 					});
 				}
+				this.simUI.resultsViewer.hideAll();
 				this.isPending = false;
 			}
 		});

proto/ui.proto

@@ -103,11 +103,14 @@ abstract class BaseGear {
 	}
 
 	private removeUniqueItems(gear: Partial<InternalGear>, newItem: EquippedItem) {
-		if (newItem.item.unique) {
+		if (newItem.item.unique || newItem.item.limitCategory) {
 			this.getItemSlots()
 				.map(slot => Number(slot) as ItemSlot)
 				.forEach(slot => {
-					if (gear[slot]?.item.id == newItem.item.id) {
+					if (
+						(newItem.item.limitCategory && gear[slot]?.item.limitCategory == newItem.item.limitCategory) ||
+						(newItem.item.unique && gear[slot]?.item.id == newItem.item.id)
+					) {
 						gear[slot] = null;
 					}
 				});