Skip to content

Commit 7f3b5b8

Browse files
Kvan7Kvan7
authored
Merge pull request #700 from Kvan7:dev
v0.12.4
2 parents 7046bce + f83ffa9 commit 7f3b5b8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1881
-1414
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ body:
5959
label: Version
6060
description: What version of EE2 are you running? You can see this in Settings -> About
6161
options:
62+
- 0.12.4
6263
- 0.12.3
6364
- 0.12.2
6465
- 0.12.1

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ![Perfect Jewelers Orb](./renderer/public/images/jeweler.png) Exiled Exchange 2
22

3-
![GitHub Downloads (specific asset, latest release)](https://img.shields.io/github/downloads/kvan7/exiled-exchange-2/latest/Exiled-Exchange-2-Setup-0.12.3.exe?style=plastic&link=https%3A%2F%2Ftooomm.github.io%2Fgithub-release-stats%2F%3Fusername%3Dkvan7%26repository%3DExiled-Exchange-2)
3+
![GitHub Downloads (specific asset, latest release)](https://img.shields.io/github/downloads/kvan7/exiled-exchange-2/latest/Exiled-Exchange-2-Setup-0.12.4.exe?style=plastic&link=https%3A%2F%2Ftooomm.github.io%2Fgithub-release-stats%2F%3Fusername%3Dkvan7%26repository%3DExiled-Exchange-2)
44
![GitHub Tag](https://img.shields.io/github/v/tag/kvan7/exiled-exchange-2?style=plastic&label=latest%20version)
55
![GitHub commits since latest release (branch)](https://img.shields.io/github/commits-since/kvan7/exiled-exchange-2/latest/dev?style=plastic)
66

‎dataParser/vendor/client/overrideData/data.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ number of stackable unique jewels [1]
1111

1212

1313
Megalomaniac Diamond
14-
Allocates Passive Skill
14+
Allocates Passive Skill
1515
Allocates Passive Skill
1616
Allocates Passive Skill
1717

@@ -2101,4 +2101,4 @@ Ab Aeterno Grand Cuisses
21012101
(15–30)% increased Movement Speed
21022102
(60–80)% increased Armour, Evasion and Energy Shield
21032103
Dodge Roll avoids all Hits
2104-
10% less Movement and Skill Speed per Dodge Roll in the past 20 seconds
2104+
10% less Movement and Skill Speed per Dodge Roll in the past 20 seconds

‎dataParser/vendor/client/tables/index.ts‎

Lines changed: 84 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,129 @@
1-
import * as fs from 'node:fs';
2-
import * as path from 'node:path';
1+
import * as fs from "node:fs";
2+
import * as path from "node:path";
33

44
interface ArmourTypeRow {
5-
BaseItemTypesKey: number;
6-
Armour: number;
7-
Evasion: number;
8-
EnergyShield: number;
5+
BaseItemTypesKey: number;
6+
Armour: number;
7+
Evasion: number;
8+
EnergyShield: number;
99
}
1010

1111
export function ArmourTypes(): ArmourTypeRow[] {
12-
const data = fs.readFileSync(path.join(__dirname, 'ArmourTypes.json'), { encoding: 'utf-8' });
13-
return JSON.parse(data) as ArmourTypeRow[];
12+
const data = fs.readFileSync(path.join(__dirname, "ArmourTypes.json"), {
13+
encoding: "utf-8",
14+
});
15+
return JSON.parse(data) as ArmourTypeRow[];
1416
}
1517

16-
1718
interface BaseItemTypeRow {
18-
_index: number;
19-
Id: string;
20-
Width: number;
21-
Height: number;
22-
Name: string;
23-
DropLevel: number;
24-
Implicit_ModsKeys: string[];
25-
ItemVisualIdentity: number;
26-
IsCorrupted: boolean;
27-
ItemClassesKey: string;
28-
SiteVisibility: number;
29-
TagsKeys: string[];
19+
_index: number;
20+
Id: string;
21+
Width: number;
22+
Height: number;
23+
Name: string;
24+
DropLevel: number;
25+
Implicit_ModsKeys: string[];
26+
ItemVisualIdentity: number;
27+
IsCorrupted: boolean;
28+
ItemClassesKey: string;
29+
SiteVisibility: number;
30+
TagsKeys: string[];
3031
}
3132

32-
export function BaseItemTypes(lang: string = 'en'): BaseItemTypeRow[] {
33-
const data = fs.readFileSync(path.join(__dirname, 'BaseItemTypes.json'), { encoding: 'utf-8' });
34-
return JSON.parse(data) as BaseItemTypeRow[];
33+
export function BaseItemTypes(lang: string = "en"): BaseItemTypeRow[] {
34+
const data = fs.readFileSync(path.join(__dirname, "BaseItemTypes.json"), {
35+
encoding: "utf-8",
36+
});
37+
return JSON.parse(data) as BaseItemTypeRow[];
3538
}
3639

3740
interface ItemClassRow {
38-
Id: string;
41+
Id: string;
3942
}
4043

4144
export function ItemClasses(): ItemClassRow[] {
42-
const data = fs.readFileSync(path.join(__dirname, 'ItemClasses.json'), { encoding: 'utf-8' });
43-
return JSON.parse(data) as ItemClassRow[];
45+
const data = fs.readFileSync(path.join(__dirname, "ItemClasses.json"), {
46+
encoding: "utf-8",
47+
});
48+
return JSON.parse(data) as ItemClassRow[];
4449
}
4550

4651
interface ItemVisualIdentityRow {
47-
_index: number;
48-
Id: string;
49-
DDSFile: string;
50-
AOFile: string;
52+
_index: number;
53+
Id: string;
54+
DDSFile: string;
55+
AOFile: string;
5156
}
5257

5358
export function ItemVisualIdentity(): ItemVisualIdentityRow[] {
54-
const data = fs.readFileSync(path.join(__dirname, 'ItemVisualIdentity.json'), { encoding: 'utf-8' });
55-
return JSON.parse(data) as ItemVisualIdentityRow[];
59+
const data = fs.readFileSync(
60+
path.join(__dirname, "ItemVisualIdentity.json"),
61+
{ encoding: "utf-8" }
62+
);
63+
return JSON.parse(data) as ItemVisualIdentityRow[];
5664
}
5765

5866
interface TagRow {
59-
Id: string;
60-
DisplayString: string;
67+
Id: string;
68+
DisplayString: string;
6169
}
6270

6371
export function Tags(): TagRow[] {
64-
const data = fs.readFileSync(path.join(__dirname, 'Tags.json'), { encoding: 'utf-8' });
65-
return JSON.parse(data) as TagRow[];
72+
const data = fs.readFileSync(path.join(__dirname, "Tags.json"), {
73+
encoding: "utf-8",
74+
});
75+
return JSON.parse(data) as TagRow[];
6676
}
6777

6878
interface UniqueStashLayoutRow {
69-
WordsKey: number;
70-
ShowIfEmptyChallengeLeague: boolean;
71-
RenamedVersion: number;
72-
UniqueStashTypesKey: number;
73-
ItemVisualIdentityKey: number;
74-
ShowIfEmptyStandard: boolean;
75-
IsAlternateArt: boolean;
79+
WordsKey: number;
80+
ShowIfEmptyChallengeLeague: boolean;
81+
RenamedVersion: number;
82+
UniqueStashTypesKey: number;
83+
ItemVisualIdentityKey: number;
84+
ShowIfEmptyStandard: boolean;
85+
IsAlternateArt: boolean;
7686
}
7787

7888
export function UniquesStashLayout(): UniqueStashLayoutRow[] {
79-
const data = fs.readFileSync(path.join(__dirname, 'UniquesStashLayout.json'), { encoding: 'utf-8' });
80-
return JSON.parse(data) as UniqueStashLayoutRow[];
89+
const data = fs.readFileSync(
90+
path.join(__dirname, "UniquesStashLayout.json"),
91+
{ encoding: "utf-8" }
92+
);
93+
return JSON.parse(data) as UniqueStashLayoutRow[];
8194
}
8295

8396
interface WordRow {
84-
_index: number;
85-
Wordlist: number;
86-
Text: string;
87-
SpawnWeight_Tags: number[];
88-
SpawnWeight_Values: number[];
89-
Text2: string;
97+
_index: number;
98+
Wordlist: number;
99+
Text: string;
100+
SpawnWeight_Tags: number[];
101+
SpawnWeight_Values: number[];
102+
Text2: string;
90103
}
91104

92-
export function Words(lang: string = 'en'): WordRow[] {
93-
const data = fs.readFileSync(path.join(__dirname, 'Words.json'), { encoding: 'utf-8' });
94-
return JSON.parse(data) as WordRow[];
105+
export function Words(lang: string = "en"): WordRow[] {
106+
const data = fs.readFileSync(path.join(__dirname, "Words.json"), {
107+
encoding: "utf-8",
108+
});
109+
return JSON.parse(data) as WordRow[];
95110
}
96111

97112
interface StatsRow {
98-
Id: string;
99-
IsLocal: boolean;
100-
IsWeaponLocal: boolean;
101-
Semantics: number;
102-
Text: string;
103-
IsVirtual: boolean;
104-
HASH32: number;
105-
BelongsActiveSkillsKey: string[];
106-
IsScalable: boolean;
113+
Id: string;
114+
IsLocal: boolean;
115+
IsWeaponLocal: boolean;
116+
Semantics: number;
117+
Text: string;
118+
IsVirtual: boolean;
119+
HASH32: number;
120+
BelongsActiveSkillsKey: string[];
121+
IsScalable: boolean;
107122
}
108123

109124
export function Stats(): StatsRow[] {
110-
const data = fs.readFileSync(path.join(__dirname, 'Stats.json'), { encoding: 'utf-8' });
111-
return JSON.parse(data) as StatsRow[];
112-
}
125+
const data = fs.readFileSync(path.join(__dirname, "Stats.json"), {
126+
encoding: "utf-8",
127+
});
128+
return JSON.parse(data) as StatsRow[];
129+
}

‎docs/.vitepress/config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default defineConfig({
2020
},
2121
themeConfig: {
2222
// logo: 'TODO', https://github.com/vuejs/vitepress/issues/1401
23-
appVersion: '0.12.3',
23+
appVersion: '0.12.4',
2424
github: {
2525
releasesUrl: 'https://github.com/Kvan7/Exiled-Exchange-2/releases'
2626
},

‎exiled-exchange-2.code-workspace‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
"name": "main",
99
"path": "main"
1010
},
11-
{
12-
"name": "Data Parser",
13-
"path": "dataParser"
14-
},
1511
{
1612
"name": "docs",
1713
"path": "docs"
@@ -57,6 +53,7 @@
5753
"heistweapon",
5854
"ilvl",
5955
"Invictus",
56+
"Jewelery",
6057
"Kalandra",
6158
"keybind",
6259
"keybinds",
@@ -69,6 +66,7 @@
6966
"onesword",
7067
"onlineleague",
7168
"pdps",
69+
"Poedb",
7270
"Poeninja",
7371
"runedagger",
7472
"stormcloud's",

‎main/package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎main/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "exiled-exchange-2",
3-
"version": "0.12.3",
3+
"version": "0.12.4",
44
"private": true,
55
"scripts": {
66
"dev": "node build/script.mjs",

‎main/src/shortcuts/HostClipboard.ts‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -94,66 +94,52 @@ export class HostClipboard {
9494
}
9595

9696
function isPoeItem(text: string) {
97-
return LANGUAGE_DETECTOR.find(
98-
({ firstLine, uncutSkillGemLine }) =>
99-
text.startsWith(firstLine) || text.startsWith(uncutSkillGemLine),
100-
);
97+
return LANGUAGE_DETECTOR.find(({ firstLine }) => text.startsWith(firstLine));
10198
}
10299

103100
const LANGUAGE_DETECTOR = [
104101
{
105102
lang: "en",
106103
firstLine: "Item Class: ",
107-
uncutSkillGemLine: "Rarity: Currency",
108104
},
109105
{
110106
lang: "ru",
111107
firstLine: "Класс предмета: ",
112-
uncutSkillGemLine: "Редкость: Валюта",
113108
},
114109
{
115110
lang: "fr",
116111
firstLine: "Classe d'objet: ",
117-
uncutSkillGemLine: "Rarity: unsupported",
118112
},
119113
{
120114
lang: "de",
121115
firstLine: "Gegenstandsklasse: ",
122-
uncutSkillGemLine: "Seltenheit: Währung",
123116
},
124117
{
125118
lang: "pt",
126119
firstLine: "Classe do Item: ",
127-
uncutSkillGemLine: "Rarity: unsupported",
128120
},
129121
{
130122
lang: "es",
131123
firstLine: "Clase de objeto: ",
132-
uncutSkillGemLine: "Rareza: Objetos monetarios",
133124
},
134125
{
135126
lang: "th",
136127
firstLine: "ชนิดไอเทม: ",
137-
uncutSkillGemLine: "Rarity: unsupported",
138128
},
139129
{
140130
lang: "ko",
141131
firstLine: "아이템 종류: ",
142-
uncutSkillGemLine: "아이템 희귀도: 화폐",
143132
},
144133
{
145134
lang: "cmn-Hant",
146135
firstLine: "物品種類: ",
147-
uncutSkillGemLine: "稀有度: 通貨",
148136
},
149137
{
150138
lang: "cmn-Hans",
151139
firstLine: "物品类别: ",
152-
uncutSkillGemLine: "Rarity: unsupported",
153140
},
154141
{
155142
lang: "ja",
156143
firstLine: "アイテムクラス: ",
157-
uncutSkillGemLine: "レアリティ: カレンシー",
158144
},
159145
];

‎main/src/shortcuts/text-box.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ export function stashSearch(
6363
overlay.assertGameActive();
6464
clipboard.writeText(text);
6565
uIOhook.keyTap(Key.F, [Key.Ctrl]);
66+
// HACK: While https://www.pathofexile.com/forum/view-thread/3854775
67+
uIOhook.keyTap(Key.Backspace);
68+
6669
uIOhook.keyTap(Key.V, [
6770
process.platform === "darwin" ? Key.Meta : Key.Ctrl,
6871
]);

0 commit comments

Comments
 (0)