Skip to content

Commit a9025cd

Browse files
onerdnaonerdna
committed
Fix: prevent equipment name text overflow in inventory view
Feat: add "Equipment Manager" button to equipment page Chore: bump version to 1.2.3
1 parent b72cbf7 commit a9025cd

File tree

11 files changed

+631
-210
lines changed

11 files changed

+631
-210
lines changed

‎assets/images/weapons.png‎

15.4 KB
Loading

‎assets/traits.toml‎

Lines changed: 88 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
[boss]
2-
display = "Boss Weapon"
3-
color = "0xFFFFD66B"
4-
51
[unobtainable]
62
display = "Unobtainable"
73
color = "0xFFFF3F33"
84

5+
[deceased]
6+
display = "Deceased"
7+
color = "0xFFD3D3D3"
8+
9+
[boss]
10+
display = "Boss Weapon"
11+
color = "0xFFFFD66B"
12+
913
[special_edition]
1014
display = "Special Edition"
1115
color = "0xFFE7EFC7"
@@ -18,6 +22,86 @@ color = "0xFF00CAFF"
1822
display = "Challenger Weapon"
1923
color = "0xFFFFAAAA"
2024

25+
[offer]
26+
display = "Offer Exclusive Item"
27+
color = "0xFFDC8BE0"
28+
29+
[replica]
30+
display = "Replica"
31+
color = "0xFF7F8CAA"
32+
33+
[gift]
34+
display = "Gift"
35+
color = "0xFF3F7D58"
36+
37+
[anniversary10]
38+
display = "10th Anniversary"
39+
color = "0xFF254D70"
40+
41+
[ram_navami21]
42+
display = "Ram Navami 2021"
43+
color = "0xFFFFE082"
44+
45+
[independence21]
46+
display = "Independence Day 2021"
47+
color = "0xFFFFE082"
48+
49+
[summer21]
50+
display = "Summer 2021"
51+
color = "0xFFFFE082"
52+
53+
[set_monk]
54+
display = "Monk Set"
55+
color = "0xFF3CB371"
56+
57+
[set_sentinel]
58+
display = "Sentinel Set"
59+
color = "0xFFCD5C5C"
60+
61+
[set_warlock]
62+
display = "Warlock Set"
63+
color = "0xFF8B0000"
64+
65+
[set_forest_guardian]
66+
display = "Forest Guardian Set"
67+
color = "0xFF4B0082"
68+
69+
[set_skanda]
70+
display = "Skanda Set"
71+
color = "0xFFFFD700"
72+
73+
[set_creators_of_the_wind]
74+
display = "Creator of the Winds Set"
75+
color = "0xFF708090"
76+
77+
[set_director]
78+
display = "Director Set"
79+
color = "0xFF808080"
80+
81+
[set_chronos]
82+
display = "Chronos Set"
83+
color = "0xFF1E90FF"
84+
85+
[set_neo_wanderer]
86+
display = "Neo-Wanderer Set"
87+
color = "0xFF00FFFF"
88+
89+
[set_spore_soul]
90+
display = "Spore Soul Set"
91+
color = "0xFFFFFF00"
92+
93+
[set_volcano]
94+
display = "Volcano Set"
95+
color = "0xFFFF4500"
96+
97+
[set_karcer]
98+
display = "Karcer Set"
99+
color = "0xFFFFFFFF"
100+
101+
[set_dragon]
102+
display = "Dragon Set"
103+
color = "0xFFFF3F33"
104+
21105
[hw14]
22106
display = "Halloween 2014"
23107
color = "0xFFFB9E3A"
@@ -213,87 +297,3 @@ color = "0xFFE57373"
213297
[chny24]
214298
display = "Chinese New Year 2024"
215299
color = "0xFFE57373"
216-
217-
[ram_navami21]
218-
display = "Ram Navami 2021"
219-
color = "0xFFFFE082"
220-
221-
[independence21]
222-
display = "Independence Day 2021"
223-
color = "0xFFFFE082"
224-
225-
[summer21]
226-
display = "Summer 2021"
227-
color = "0xFFFFE082"
228-
229-
[offer]
230-
display = "Offer Exclusive Item"
231-
color = "0xFFDC8BE0"
232-
233-
[replica]
234-
display = "Replica"
235-
color = "0xFF7F8CAA"
236-
237-
[gift]
238-
display = "Gift"
239-
color = "0xFF3F7D58"
240-
241-
[set_monk]
242-
display = "Monk Set"
243-
color = "0xFF3CB371"
244-
245-
[set_sentinel]
246-
display = "Sentinel Set"
247-
color = "0xFFCD5C5C"
248-
249-
[set_warlock]
250-
display = "Warlock Set"
251-
color = "0xFF8B0000"
252-
253-
[set_forest_guardian]
254-
display = "Forest Guardian Set"
255-
color = "0xFF4B0082"
256-
257-
[set_skanda]
258-
display = "Skanda Set"
259-
color = "0xFFFFD700"
260-
261-
[set_creators_of_the_wind]
262-
display = "Creator of the Winds Set"
263-
color = "0xFF708090"
264-
265-
[set_director]
266-
display = "Director Set"
267-
color = "0xFF808080"
268-
269-
[set_chronos]
270-
display = "Chronos Set"
271-
color = "0xFF1E90FF"
272-
273-
[set_neo_wanderer]
274-
display = "Neo-Wanderer Set"
275-
color = "0xFF00FFFF"
276-
277-
[set_spore_soul]
278-
display = "Spore Soul Set"
279-
color = "0xFFFFFF00"
280-
281-
[set_volcano]
282-
display = "Volcano Set"
283-
color = "0xFFFF4500"
284-
285-
[set_karcer]
286-
display = "Karcer Set"
287-
color = "0xFFFFFFFF"
288-
289-
[set_dragon]
290-
display = "Dragon Set"
291-
color = "0xFFFF3F33"
292-
293-
[anniversary10]
294-
display = "10th Anniversary"
295-
color = "0xFF254D70"
296-
297-
[deceased]
298-
display = "Deceased"
299-
color = "0xFFD3D3D3"

‎lib/logic/equipment.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ class Equipment {
6666
int upgrade = 0;
6767
UpgradeDelivery? upgradeDelivery;
6868
RecipeDelivery? recipeDelivery;
69+
6970
static const minLevel = 1;
7071
static const maxLevel = 52;
7172
static const minUpgrade = 0;

‎lib/logic/equipment_type.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,6 @@ extension EquipmentTypeExtension on EquipmentType {
4949
return "Helm";
5050
}
5151
}
52+
53+
String get display => slot;
5254
}

‎lib/logic/item_database.dart‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ class ItemTrait {
2626
final String id;
2727
final int color;
2828

29+
@override
30+
bool operator ==(Object other) => other is ItemTrait && other.id == id;
31+
2932
const ItemTrait(this.id, this.display, this.color);
3033
}
3134

@@ -57,9 +60,13 @@ class ItemDatabase {
5760
return itemTraits.map((e) => traits.where((t) => t.id == e).first);
5861
}
5962

60-
static Iterable<String> getEquipment(EquipmentType type) => dictionary.entries
61-
.where((e) => EquipmentTypeExtension.fromId(e.key) == type)
62-
.map((e) => e.key);
63+
static Iterable<String> getEquipmentByType(EquipmentType type) =>
64+
dictionary.entries
65+
.where((e) => EquipmentTypeExtension.fromId(e.key) == type)
66+
.map((e) => e.key);
67+
68+
static Iterable<String> getAllEquipment() =>
69+
dictionary.entries.map((e) => e.key);
6370

6471
static Iterable<Enchantment> getEnchantments(String id) {
6572
final enchantments =

‎lib/pages/about.dart‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,10 @@ class _AboutPageState extends State<AboutPage> {
195195
(
196196
"Treasure icons created by kliwir art - Flaticon",
197197
"https://www.flaticon.com/free-icons/treasure"
198+
),
199+
(
200+
"Weapon icons created by Smashicons - Flaticon",
201+
"https://www.flaticon.com/free-icons/weapon"
198202
)
199203
].map(
200204
(e) => Column(

0 commit comments

Comments
 (0)