Skip to content

Commit

Permalink
support Memory Lines
Browse files Browse the repository at this point in the history
  • Loading branch information
SnosMe committed Aug 23, 2022
1 parent 062a982 commit 1c7183c
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 8 deletions.
1 change: 1 addition & 0 deletions renderer/public/data/cmn-Hant/client_strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ export default {
VEILED_MODS: ['被選召的', '教團之'],
INCURSION_MODS: ['瓜特利斯的', '柔派克的', '塔普塔特的', '特卡蒂的', '麥塔爾的', '麥塔爾之', '希特克拉多的', '希特克拉多之', '特卡蒂之', '瓜特利斯之', '普希瓦爾之'],
RELIC_UNIQUE: '古典傳奇',
UNMODIFIABLE: '不可調整的',
// ---
CHAT_SYSTEM: /^: (?<body>.+)$/,
CHAT_TRADE: /^\$(?:<(?<guild_tag>.+?)> )?(?<char_name>.+?): (?<body>.+)$/,
Expand Down
1 change: 1 addition & 0 deletions renderer/public/data/en/client_strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ export default {
VEILED_MODS: ['Chosen', 'of the Order'],
INCURSION_MODS: ["Guatelitzi's", "Xopec's", "Topotante's", "Tacati's", "Matatl's", 'of Matatl', "Citaqualotl's", 'of Citaqualotl', 'of Tacati', 'of Guatelitzi', 'of Puhuarte'],
RELIC_UNIQUE: 'Relic Unique',
UNMODIFIABLE: 'Unmodifiable',
// ---
CHAT_SYSTEM: /^: (?<body>.+)$/,
CHAT_TRADE: /^\$(?:<(?<guild_tag>.+?)> )?(?<char_name>.+?): (?<body>.+)$/,
Expand Down
1 change: 1 addition & 0 deletions renderer/public/data/ru/client_strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ export default {
'Ситаквалотля', 'Мататля', 'Такати', 'Гвателитзи', 'Пухварте'
],
RELIC_UNIQUE: 'Уникальная Реликвия',
UNMODIFIABLE: 'Неизменяемый',
// ---
CHAT_SYSTEM: /^: (?<body>.+)$/,
CHAT_TRADE: /^\$(?:<(?<guild_tag>.+?)> )?(?<char_name>.+?): (?<body>.+)$/,
Expand Down
1 change: 1 addition & 0 deletions renderer/src/assets/data/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ export interface TranslationDict {
VEILED_MODS: string[]
INCURSION_MODS: string[]
RELIC_UNIQUE: string
UNMODIFIABLE: string
// ---
CHAT_SYSTEM: RegExp
CHAT_TRADE: RegExp
Expand Down
1 change: 1 addition & 0 deletions renderer/src/parser/ParsedItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export interface ParsedItem {
stackSize?: { value: number, max: number }
isUnidentified: boolean
isCorrupted: boolean
isUnmodifiable: boolean
isMirrored?: boolean
influences: ItemInfluence[]
logbookAreaMods?: ParsedModifier[][]
Expand Down
6 changes: 3 additions & 3 deletions renderer/src/parser/Parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -351,10 +351,10 @@ function parseCorrupted (section: string[], item: ParsedItem) {
if (section[0] === _$.CORRUPTED) {
item.isCorrupted = true
return 'SECTION_PARSED'
}
if (item.category === ItemCategory.Sentinel) {
} else if (section[0] === _$.UNMODIFIABLE) {
item.isCorrupted = true
return 'PARSER_SKIPPED'
item.isUnmodifiable = true
return 'SECTION_PARSED'
}
return 'SECTION_SKIPPED'
}
Expand Down
3 changes: 2 additions & 1 deletion renderer/src/parser/meta.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ export enum ItemCategory {
Currency = 'Currency',
DivinationCard = 'Divination Card',
Voidstone = 'Voidstone',
Sentinel = 'Sentinel'
Sentinel = 'Sentinel',
MemoryLine = 'Memory Line'
}

export const WEAPON_ONE_HANDED_MELEE = new Set([
Expand Down
2 changes: 1 addition & 1 deletion renderer/src/web/price-check/CheckedItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export default defineComponent({
(item.rarity === ItemRarity.Unique) ||
(item.category === ItemCategory.Map) ||
(item.category === ItemCategory.HeistBlueprint) ||
(!CATEGORY_TO_TRADE_ID.has(item.category!)) ||
(!CATEGORY_TO_TRADE_ID.has(item.category!) && item.category !== ItemCategory.MemoryLine) ||
(item.isUnidentified) ||
(item.isVeiled)
)
Expand Down
3 changes: 2 additions & 1 deletion renderer/src/web/price-check/filters/FilterModifierTiers.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ export default defineComponent({
filter.tag === FilterTag.Property
) && (
item.category !== ItemCategory.Jewel &&
item.category !== ItemCategory.ClusterJewel
item.category !== ItemCategory.ClusterJewel &&
item.category !== ItemCategory.MemoryLine
)) {
if (tier === 1) out.push({ type: 'tier-1', tier })
else if (tier === 2) out.push({ type: 'tier-2', tier })
Expand Down
5 changes: 3 additions & 2 deletions renderer/src/web/price-check/filters/create-item-filters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,12 @@ export function createFilters (
}
}

if (
if (!item.isUnmodifiable && (
item.rarity === ItemRarity.Normal ||
item.rarity === ItemRarity.Magic ||
item.rarity === ItemRarity.Rare ||
item.rarity === ItemRarity.Unique
) {
)) {
filters.corrupted = {
value: item.isCorrupted
}
Expand Down Expand Up @@ -245,6 +245,7 @@ export function createFilters (
item.category !== ItemCategory.Jewel && /* https://pathofexile.gamepedia.com/Jewel#Affixes */
item.category !== ItemCategory.HeistBlueprint &&
item.category !== ItemCategory.HeistContract &&
item.category !== ItemCategory.MemoryLine &&
item.info.refName !== 'Expedition Logbook'
) {
if (item.category === ItemCategory.ClusterJewel) {
Expand Down

0 comments on commit 1c7183c

Please sign in to comment.