Skip to content

Commit d02f086

Browse files
Kvan7Kvan7
authored
v0.4.2 (#274)
* Unique rollable value parsing #225 * Controlled Metamorphosis - search by ring size #256 * [Not Recognized Modifier] - +2 Charm Slots #257 * Acknowledgement option to hide "is BETA" warning #269 * Fixes map not recognized for base text * version bump * Request: option to select/populate all stats #246
1 parent 5e9b4f4 commit d02f086

Some content is hidden

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

62 files changed

+272045
-835417
lines changed

‎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.4.1.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.4.2.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/data/cmn-Hant/stats.ndjson‎

Lines changed: 2818 additions & 2819 deletions
Large diffs are not rendered by default.

‎dataParser/data/en/stats.ndjson‎

Lines changed: 2819 additions & 2820 deletions
Large diffs are not rendered by default.

‎dataParser/data/ja/stats.ndjson‎

Lines changed: 2818 additions & 2819 deletions
Large diffs are not rendered by default.

‎dataParser/data/ko/stats.ndjson‎

Lines changed: 2819 additions & 2820 deletions
Large diffs are not rendered by default.

‎dataParser/data/ru/stats.ndjson‎

Lines changed: 2819 additions & 2820 deletions
Large diffs are not rendered by default.

‎dataParser/vendor/client/modTiers/modTierBuilder.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ def modTierBuilder(mod_data):
8686
def modTierBuilderB(mod_data, base_item_types, gold_mod_prices, tags):
8787
gold_with_readable_tags = {
8888
mod_data[gold_row["Mod"]]["Id"]: {
89-
tags[tag]["Id"] if "armour" not in tags[tag]["Id"] else "body_armour"
89+
tags[tag]["Id"]
90+
if "armour" not in tags[tag]["Id"] or "armour" == tags[tag]["Id"]
91+
else "body_armour"
9092
for tag in gold_row["Tags"]
9193
if tag
9294
}
@@ -171,7 +173,6 @@ def modTierBuilderB(mod_data, base_item_types, gold_mod_prices, tags):
171173
sorted_row = {
172174
"explicit": [],
173175
"implicit": {},
174-
"unique": [],
175176
"corruption": [],
176177
"crafted": [],
177178
"jewel": [],
@@ -190,9 +191,11 @@ def modTierBuilderB(mod_data, base_item_types, gold_mod_prices, tags):
190191
sorted_row["implicit"][base_type] = modGroupToOutputTier(mod_group)
191192
elif "unique" in mod_id:
192193
if "jewel" in mod_id:
193-
sorted_row["uniquejewel"].append(modGroupToOutputTier(mod_group))
194+
# sorted_row["uniquejewel"].append(modGroupToOutputTier(mod_group))
195+
continue
194196
else:
195-
sorted_row["unique"].append(modGroupToOutputTier(mod_group))
197+
# sorted_row["unique"].append(modGroupToOutputTier(mod_group))
198+
continue
196199
elif "crafted" in mod_id:
197200
sorted_row["crafted"].append(modGroupToOutputTier(mod_group))
198201
elif "jewel" in mod_id:
@@ -208,7 +211,7 @@ def modTierBuilderB(mod_data, base_item_types, gold_mod_prices, tags):
208211
if len(mod_group["mod_allowed_base_types"]) > 0:
209212
sorted_row["explicit"].append(modGroupToOutputTier(mod_group))
210213
else:
211-
sorted_row["unique"].append(modGroupToOutputTier(mod_group))
214+
# sorted_row["unique"].append(modGroupToOutputTier(mod_group))
212215
logger.debug(f"No base type for {mod_group['mods_id']}")
213216
output_data.append((tuple(all_stats), sorted_row, one_id))
214217
logger.info(f"Created {len(output_data)} mod groups.")

‎dataParser/vendor/client/overrideData/__init__.py‎

Whitespace-only changes.

‎dataParser/vendor/client/overrideData/matchersOverwride.json‎

Lines changed: 338 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,338 @@
1+
{
2+
"copy-me-default": {
3+
"en": [
4+
{
5+
"string": ""
6+
}
7+
],
8+
"ja": [
9+
{
10+
"string": ""
11+
}
12+
],
13+
"es": [
14+
{
15+
"string": ""
16+
}
17+
],
18+
"cmn-Hant": [
19+
{
20+
"string": ""
21+
}
22+
],
23+
"de": [
24+
{
25+
"string": ""
26+
}
27+
],
28+
"ru": [
29+
{
30+
"string": ""
31+
}
32+
],
33+
"th": [
34+
{
35+
"string": ""
36+
}
37+
],
38+
"fr": [
39+
{
40+
"string": ""
41+
}
42+
],
43+
"pt": [
44+
{
45+
"string": ""
46+
}
47+
],
48+
"ko": [
49+
{
50+
"string": ""
51+
}
52+
]
53+
},
54+
"Controlled Metamorphosis": {
55+
"en": [
56+
{
57+
"string": "Only affects Passives in Small Ring"
58+
},
59+
{
60+
"string": "Only affects Passives in Medium-Small Ring"
61+
},
62+
{
63+
"string": "Only affects Passives in Medium Ring"
64+
},
65+
{
66+
"string": "Only affects Passives in Medium-Large Ring"
67+
},
68+
{
69+
"string": "Only affects Passives in Large Ring"
70+
},
71+
{
72+
"string": "Only affects Passives in Very Large Ring"
73+
},
74+
{
75+
"string": "Only affects Passives in Massive Ring"
76+
}
77+
],
78+
"ja": [
79+
{
80+
"string": "小型リング内のパッシブにのみ影響する"
81+
},
82+
{
83+
"string": "中小型リング内のパッシブにのみ影響する"
84+
},
85+
{
86+
"string": "中型リング内のパッシブにのみ影響する"
87+
},
88+
{
89+
"string": "中大型リング内のパッシブにのみ影響する"
90+
},
91+
{
92+
"string": "大型リング内のパッシブにのみ影響する"
93+
},
94+
{
95+
"string": "特大リング内のパッシブにのみ影響する"
96+
},
97+
{
98+
"string": "巨大リング内のパッシブにのみ影響する"
99+
}
100+
],
101+
"es": [
102+
{
103+
"string": "Solo afecta a las pasivas en un anillo pequeño"
104+
},
105+
{
106+
"string": "Solo afecta a las pasivas en un anillo mediano-pequeño"
107+
},
108+
{
109+
"string": "Solo afecta a las pasivas en un anillo mediano"
110+
},
111+
{
112+
"string": "Solo afecta a las pasivas en un anillo mediano-grande"
113+
},
114+
{
115+
"string": "Solo afecta a las pasivas en un anillo grande"
116+
},
117+
{
118+
"string": "Solo afecta a las pasivas en un anillo muy grande"
119+
},
120+
{
121+
"string": "Solo afecta a las pasivas en un anillo enorme"
122+
}
123+
],
124+
"cmn-Hant": [
125+
{
126+
"string": "只會影響小範圍內的天賦"
127+
},
128+
{
129+
"string": "只會影響中至小範圍內的天賦"
130+
},
131+
{
132+
"string": "只會影響中範圍內的天賦"
133+
},
134+
{
135+
"string": "只會影響中至大範圍內的天賦"
136+
},
137+
{
138+
"string": "只會影響大範圍內的天賦"
139+
},
140+
{
141+
"string": "只會影響極大範圍內的天賦"
142+
},
143+
{
144+
"string": "只會影響巨大範圍內的天賦"
145+
}
146+
],
147+
"de": [
148+
{
149+
"string": "Beeinflusst nur Passive in kleinem Ring"
150+
},
151+
{
152+
"string": "Beeinflusst nur Passive in mittlerem-kleinem Ring"
153+
},
154+
{
155+
"string": "Beeinflusst nur Passive in mittlerem Ring"
156+
},
157+
{
158+
"string": "Beeinflusst nur Passive in mittlerem-großem Ring"
159+
},
160+
{
161+
"string": "Beeinflusst nur Passive in großem Ring"
162+
},
163+
{
164+
"string": "Beeinflusst nur Passive in sehr großem Ring"
165+
},
166+
{
167+
"string": "Beeinflusst nur Passive in massivem Ring"
168+
}
169+
],
170+
"ru": [
171+
{
172+
"string": "Влияет только на пассивные умения внутри малого кольца"
173+
},
174+
{
175+
"string": "Влияет только на пассивные умения внутри средне-малого кольца"
176+
},
177+
{
178+
"string": "Влияет только на пассивные умения внутри среднего кольца"
179+
},
180+
{
181+
"string": "Влияет только на пассивные умения внутри средне-большого кольца"
182+
},
183+
{
184+
"string": "Влияет только на пассивные умения внутри большого кольца"
185+
},
186+
{
187+
"string": "Влияет только на пассивные умения внутри очень большого кольца"
188+
},
189+
{
190+
"string": "Влияет только на пассивные умения внутри огромного кольца"
191+
}
192+
],
193+
"th": [
194+
{
195+
"string": "ส่งผลต่อพาสซีฟในวงแหวนขนาด เล็ก เท่านั้น"
196+
},
197+
{
198+
"string": "ส่งผลต่อพาสซีฟในวงแหวนขนาด กลาง-เล็ก เท่านั้น"
199+
},
200+
{
201+
"string": "ส่งผลต่อพาสซีฟในวงแหวนขนาด กลาง เท่านั้น"
202+
},
203+
{
204+
"string": "ส่งผลต่อพาสซีฟในวงแหวนขนาด กลาง-ใหญ่ เท่านั้น"
205+
},
206+
{
207+
"string": "ส่งผลต่อพาสซีฟในวงแหวนขนาด ใหญ่ เท่านั้น"
208+
},
209+
{
210+
"string": "ส่งผลต่อพาสซีฟในวงแหวนขนาด ใหญ่มาก เท่านั้น"
211+
},
212+
{
213+
"string": "ส่งผลต่อพาสซีฟในวงแหวนขนาด มหึมา เท่านั้น"
214+
}
215+
],
216+
"fr": [
217+
{
218+
"string": "Affecte uniquement les Talents situés dans un petit anneau"
219+
},
220+
{
221+
"string": "Affecte uniquement les Talents situés dans un anneau légèrement moyen"
222+
},
223+
{
224+
"string": "Affecte uniquement les Talents situés dans un anneau moyen"
225+
},
226+
{
227+
"string": "Affecte uniquement les Talents situés dans un anneau grandement moyen"
228+
},
229+
{
230+
"string": "Affecte uniquement les Talents situés dans un grand anneau"
231+
},
232+
{
233+
"string": "Affecte uniquement les Talents situés dans un très grand anneau"
234+
},
235+
{
236+
"string": "Affecte uniquement les Talents situés dans un anneau gigantesque"
237+
}
238+
],
239+
"pt": [
240+
{
241+
"string": "Só afeta as Passivas em um Círculo Pequeno"
242+
},
243+
{
244+
"string": "Só afeta as Passivas em um Círculo Médio-Pequeno"
245+
},
246+
{
247+
"string": "Só afeta as Passivas em um Círculo Médio"
248+
},
249+
{
250+
"string": "Só afeta as Passivas em um Círculo Médio"
251+
},
252+
{
253+
"string": "Só afeta as Passivas em um Círculo Grande"
254+
},
255+
{
256+
"string": "Só afeta as Passivas em um Círculo Muito Grande"
257+
},
258+
{
259+
"string": "Só afeta as Passivas em um Círculo Massivo"
260+
}
261+
],
262+
"ko": [
263+
{
264+
"string": "좁은 반경의 패시브 스킬에만 영향을 미침"
265+
},
266+
{
267+
"string": "중간 반경-좁은 반경의 패시브 스킬에만 영향을 미침"
268+
},
269+
{
270+
"string": "중간 반경의 패시브 스킬에만 영향을 미침"
271+
},
272+
{
273+
"string": "중간 반경-넓은 반경의 패시브 스킬에만 영향을 미침"
274+
},
275+
{
276+
"string": "넓은 반경의 패시브 스킬에만 영향을 미침"
277+
},
278+
{
279+
"string": "아주 넓은 반경의 패시브 스킬에만 영향을 미침"
280+
},
281+
{
282+
"string": "거대한 반경의 패시브 스킬에만 영향을 미침"
283+
}
284+
]
285+
},
286+
"Charm Slots": {
287+
"en": [
288+
{
289+
"string": "# Charm Slots"
290+
}
291+
],
292+
"ja": [
293+
{
294+
"string": "チャームスロット #"
295+
}
296+
],
297+
"es": [
298+
{
299+
"string": "# espacios para viales"
300+
}
301+
],
302+
"cmn-Hant": [
303+
{
304+
"string": "# 護符欄位"
305+
}
306+
],
307+
"de": [
308+
{
309+
"string": "# Phiolen-Plätze"
310+
}
311+
],
312+
"ru": [
313+
{
314+
"string": "# ячейки для оберегов"
315+
}
316+
],
317+
"th": [
318+
{
319+
"string": "ช่องใส่ของขลัง #"
320+
}
321+
],
322+
"fr": [
323+
{
324+
"string": "# Emplacements de Charme"
325+
}
326+
],
327+
"pt": [
328+
{
329+
"string": "# Espaços para Patuás"
330+
}
331+
],
332+
"ko": [
333+
{
334+
"string": "호신부 슬롯 #개"
335+
}
336+
]
337+
}
338+
}

0 commit comments

Comments
 (0)