Merge branch 'update-glyphs' into feature/paladin

Author: hillerstorm

assets/database/db.bin

@@ -75,7 +75,6 @@ enum PaladinMinorGlyph {
     GlyphOfTheFallingAvenger = 80584;
     GlyphOfTheRighteousRetreat = 80585;
     GlyphOfBladedJudgment = 80586;
-    GlyphOfRighteousRetreat = 85716;
     GlyphOfTheExorcist = 104107;
     GlyphOfPillarOfLight = 104108;
 }

assets/database/db.json

@@ -5,7 +5,6 @@ import (
 )
 
 func init() {
-
 	// Keep these in order by item ID
 	// Agile Primal Diamond
 	core.NewItemEffect(76884, core.ApplyMetaGemCriticalDamageEffect)

assets/database/leftover_db.bin

@@ -142,14 +142,13 @@ func main() {
 
 	db := database.NewWowDatabase()
 	db.Encounters = core.PresetEncounters
-	db.GlyphIDs = getGlyphIDsFromJson(fmt.Sprintf("%s/glyph_id_map.json", inputsDir))
 	db.ReforgeStats = reforgeStats.ToProto()
 
 	iconsMap, _ := database.LoadArtTexturePaths("./tools/DB2ToSqlite/listfile.csv")
 	var instance = dbc.GetDBC()
 	instance.LoadSpellScaling()
 
-	database.GenerateProtos(instance)
+	database.GenerateProtos(instance, db)
 
 	for _, item := range instance.Items {
 		parsed := item.ToUIItem()