Merge pull request #3459 from jarveson/jake/hide-unavailable-items

db: hide unavailable items
wowsims · Aug 14, 2023 · db4018d · db4018d
2 parents dd39296 + 3cf8874
commit db4018d
Show file tree

Hide file tree

Showing 8 changed files with 1,503 additions and 2,100 deletions.
diff --git a/assets/database/db.bin b/assets/database/db.bin
diff --git a/assets/database/db.json b/assets/database/db.json
diff --git a/assets/database/leftover_db.bin b/assets/database/leftover_db.bin
diff --git a/assets/database/leftover_db.json b/assets/database/leftover_db.json
diff --git a/assets/db_inputs/wowhead_gearplannerdb.txt b/assets/db_inputs/wowhead_gearplannerdb.txt
diff --git a/tools/database/gen_db/main.go b/tools/database/gen_db/main.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"strconv"
 	"strings"
 
 	"github.com/wowsims/wotlk/sim"
@@ -75,7 +76,12 @@ func main() {
 
 	for _, response := range itemTooltips {
 		if response.IsEquippable() {
-			db.MergeItem(response.ToItemProto())
+			// Only included items that are in wowheads gearplanner db
+			// Wowhead doesnt seem to have a field/flag to signify 'not available / in game' but their gearplanner db has them filtered
+			item := response.ToItemProto()
+			if _, ok := wowheadDB.Items[strconv.Itoa(int(item.Id))]; ok {
+				db.MergeItem(item)
+			}
 		} else if response.IsGem() {
 			db.MergeGem(response.ToGemProto())
 		}

diff --git a/tools/database/overrides.go b/tools/database/overrides.go
@@ -264,6 +264,12 @@ var ItemDenyList = map[int32]struct{}{
 	34578: {}, // Battlemaster's Determination
 	34579: {}, // Battlemaster's Audacity
 	34580: {}, // Battlemaster's Perseverence
+
+	// '10 man' onyxia head rewards
+	49312: {},
+	49313: {},
+	49314: {},
+
 	50251: {}, // 'one hand shadows edge'
 	53500: {}, // Tectonic Plate
 

diff --git a/tools/database/wowhead_db.go b/tools/database/wowhead_db.go
@@ -2,6 +2,7 @@ package database
 
 import (
 	"encoding/json"
+	"fmt"
 	"log"
 	"strings"
 
@@ -50,6 +51,8 @@ func ParseWowheadDB(dbContents string) WowheadDatabase {
 		}
 	}
 
+	fmt.Printf("\n--\nWowhead DB items loaded: %d\n--\n", len(wowheadDB.Items))
+
 	return wowheadDB
 }