Skip to content

[Feature] Add Sha-Touched Gems #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
InDebt merged 2 commits into from
May 16, 2025
Merged

[Feature] Add Sha-Touched Gems #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55f6890
[Feature] Add Sha-Touched Gems
May 15, 2025
977b0be
Merge remote-tracking branch 'origin/master' into feature/sha-touched…
May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified assets/database/db.bin
View file
Open in desktop
Binary file not shown.
71 changes: 34 additions & 37 deletions assets/database/db.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified assets/database/leftover_db.bin
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions assets/database/leftover_db.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19063,10 +19063,10 @@
{"id":32833,"name":"Purified Jaggal Pearl","icon":"inv_misc_gem_pearl_08","color":7,"stats":[0,0,0,3,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"id":32836,"name":"Purified Shadow Pearl","icon":"inv_misc_gem_pearl_07","color":7,"stats":[0,0,0,4,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"id":33131,"name":"Crimson Sun","icon":"inv_jewelcrafting_crimsonspinel_02","color":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,32,32,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4,"unique":true,"requiredProfession":7},
{"id":33132,"name":"Delicate Fire Ruby","icon":"inv_jewelcrafting_crimsonspinel_02","color":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4,"unique":true,"requiredProfession":7},
{"id":33132,"name":"Delicate Fire Ruby","icon":"inv_jewelcrafting_crimsonspinel_02","color":2,"stats":[0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4,"unique":true,"requiredProfession":7},
{"id":33133,"name":"Don Julio's Heart","icon":"inv_jewelcrafting_crimsonspinel_02","color":2,"stats":[0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4,"unique":true,"requiredProfession":7},
{"id":33134,"name":"Kailee's Rose","icon":"inv_jewelcrafting_crimsonspinel_02","color":2,"stats":[0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4,"unique":true,"requiredProfession":7},
{"id":33135,"name":"Falling Star","icon":"inv_jewelcrafting_empyreansapphire_02","color":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4,"unique":true,"requiredProfession":7},
{"id":33135,"name":"Falling Star","icon":"inv_jewelcrafting_empyreansapphire_02","color":3,"stats":[0,0,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4,"unique":true,"requiredProfession":7},
{"id":33137,"name":"Sparkling Falling Star","icon":"inv_jewelcrafting_empyreansapphire_02","color":3,"stats":[18,18,18,18,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4,"unique":true,"requiredProfession":7},
{"id":33138,"name":"Mystic Bladestone","icon":"inv_jewelcrafting_lionseye_02","color":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4,"unique":true,"requiredProfession":7},
{"id":33139,"name":"Brilliant Bladestone","icon":"inv_jewelcrafting_crimsonspinel_02","color":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4,"unique":true,"requiredProfession":7},
Expand Down
1 change: 1 addition & 0 deletions proto/common.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@ enum GemColor {
GemColorPurple = 7;
GemColorPrismatic = 8;
GemColorCogwheel = 9;
GemColorShaTouched = 10;
}

enum SpellSchool {
Expand Down
13 changes: 8 additions & 5 deletions tools/database/dbc/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,12 @@ const (
Yellow GemType = 0x4
Blue GemType = 0x8
// Combined colors:
Orange GemType = Red | Yellow // 0x6
Purple GemType = Red | Blue // 0xa
Green GemType = Yellow | Blue // 0xc
Prismatic GemType = Red | Yellow | Blue // 0xe
Cogwheel GemType = 0x20
Orange GemType = Red | Yellow // 0x6
Purple GemType = Red | Blue // 0xa
Green GemType = Yellow | Blue // 0xc
Prismatic GemType = Red | Yellow | Blue // 0xe
ShaTouched GemType = 0x10
Cogwheel GemType = 0x20
)

func (gem GemType) ToProto() proto.GemColor {
Expand All @@ -252,6 +253,8 @@ func (gem GemType) ToProto() proto.GemColor {
return proto.GemColor_GemColorGreen
case Prismatic:
return proto.GemColor_GemColorPrismatic
case ShaTouched:
return proto.GemColor_GemColorShaTouched
case Cogwheel:
return proto.GemColor_GemColorCogwheel
default:
Expand Down
3 changes: 2 additions & 1 deletion tools/database/dbc/maps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,11 @@ var MapSocketTypeToGemColor = map[int]proto.GemColor{
2: proto.GemColor_GemColorRed,
3: proto.GemColor_GemColorYellow,
4: proto.GemColor_GemColorBlue,
5: proto.GemColor_GemColorPurple,
5: proto.GemColor_GemColorShaTouched,
6: proto.GemColor_GemColorCogwheel,
7: proto.GemColor_GemColorPrismatic,
}

var MapInventoryTypeToItemType = map[int]proto.ItemType{
0: proto.ItemType_ItemTypeUnknown,
INVTYPE_HEAD: proto.ItemType_ItemTypeHead,
Expand Down
2 changes: 1 addition & 1 deletion tools/database/dbc/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func processEnchantmentEffects(
continue
}
if spellEffect.EffectType == E_APPLY_AURA && spellEffect.EffectAura == A_MOD_STAT {

outStats[spellEffect.EffectMiscValues[0]] += float64(spellEffect.EffectBasePoints)
}

school := SpellSchool(spellEffect.EffectMiscValues[0])
Expand Down
6 changes: 5 additions & 1 deletion ui/core/proto_utils/gems.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ socketToMatchingColors.set(GemColor.GemColorPrismatic, [
GemColor.GemColorPrismatic,
]);
socketToMatchingColors.set(GemColor.GemColorCogwheel, [GemColor.GemColorCogwheel]);
socketToMatchingColors.set(GemColor.GemColorShaTouched, [GemColor.GemColorShaTouched]);

export function gemColorMatchesSocket(gemColor: GemColor, socketColor: GemColor) {
return gemColor == socketColor || (socketToMatchingColors.has(socketColor) && socketToMatchingColors.get(socketColor)!.includes(gemColor));
Expand All @@ -39,8 +40,10 @@ export function gemEligibleForSocket(gem: Gem, socketColor: GemColor) {
return gem.color == GemColor.GemColorMeta;
case GemColor.GemColorCogwheel:
return gem.color == GemColor.GemColorCogwheel;
case GemColor.GemColorShaTouched:
return gem.color == GemColor.GemColorShaTouched;
default:
return gem.color != GemColor.GemColorMeta && gem.color != GemColor.GemColorCogwheel;
return gem.color != GemColor.GemColorMeta && gem.color != GemColor.GemColorCogwheel && gem.color != GemColor.GemColorShaTouched;
}
}

Expand Down Expand Up @@ -320,6 +323,7 @@ const emptyGemSocketIcons: Partial<Record<GemColor, string>> = {
[GemColor.GemColorYellow]: 'https://wow.zamimg.com/images/icons/socket-yellow.gif',
[GemColor.GemColorPrismatic]: 'https://wow.zamimg.com/images/icons/socket-prismatic.gif',
[GemColor.GemColorCogwheel]: 'https://wow.zamimg.com/images/icons/socket-cogwheel.gif',
[GemColor.GemColorShaTouched]: 'https://wow.zamimg.com/images/icons/socket-hydraulic.gif',
};
export function getEmptyGemSocketIconUrl(color: GemColor): string {
if (emptyGemSocketIcons[color]) return emptyGemSocketIcons[color] as string;
Expand Down
4 changes: 2 additions & 2 deletions ui/core/talents/priest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const priestGlyphsConfig: GlyphsConfig = {
},
[PriestMajorGlyph.GlyphOfHolyNova]: {
name: "Glyph of Holy Nova",
description: "Teaches you the ability Holy Nova.\u000D\u000A\u000D\u000A Causes an explosion of holy light around the caster, causing 2444 Holy damage to all enemy targets within 10 yards and healing up to 5 targets within 10 yards for 473.\u000D\u000A\u000D\u000A Healing is divided among the number of targets healed. These effects cause no threat.",
description: "Teaches you the ability Holy Nova.\u000D\u000A\u000D\u000A Causes an explosion of holy light around the caster, causing 2477 Holy damage to all enemy targets within 10 yards and healing up to 5 targets within 10 yards for 525.\u000D\u000A\u000D\u000A Healing is divided among the number of targets healed. These effects cause no threat.",
iconUrl: "https://wow.zamimg.com/images/wow/icons/large/spell_holy_holynova.jpg",
},
[PriestMajorGlyph.GlyphOfInnerFire]: {
Expand Down Expand Up @@ -97,7 +97,7 @@ export const priestGlyphsConfig: GlyphsConfig = {
},
[PriestMajorGlyph.GlyphOfDispelMagic]: {
name: "Glyph of Dispel Magic",
description: "Your Dispel Magic spell also damages your target for 4861 Holy damage when you successfully dispel a magical effect.",
description: "Your Dispel Magic spell also damages your target for 4937 Holy damage when you successfully dispel a magical effect.",
iconUrl: "https://wow.zamimg.com/images/wow/icons/large/spell_nature_nullifydisease.jpg",
},
[PriestMajorGlyph.GlyphOfSmite]: {
Expand Down
Loading