fix: various item database name fixes

fix: removed unused import in main.dart
feat: reimplemented file importing logic of EnchantmentsManager

Author: onerdna

assets/enchantments/medium.toml

@@ -1,3 +1,5 @@
+tier = "medium"
+
 [shockingStrike]
 name = "Shocking Strike"
 description = "This enchantment is used only by the raid-bosses Tenebris, Banshee, Gatekeeper, and Power Mode Megalith. Currently has no known weapons that work with this enchantment, the game's Anti-Cheat instantly discards it."

assets/enchantments/mythical.toml

@@ -1,3 +1,5 @@
+tier = "mythical"
+
 [stone_fetters]
 name = "Stone Fetters"
 id = "PERK_DRAGON_SET_STONE"

assets/enchantments/perk.toml

@@ -1,3 +1,5 @@
+tier = "perk"
+
 # For the rest of perks
 [invisibility]
 name = "Invisibility"

assets/enchantments/simple.toml

@@ -1,3 +1,5 @@
+tier = "simple"
+
 [critical_protection]
 name = "Critical Protection"
 description = "This enchantment is currently available to only two helms: both versions of Fur-Ear Flap helm from New Year 2018 and 2021. The helm Iron Mask which was obtainable from the Starter Pack prior to version 1.6.1 was also initially enchanted with Critical Protection. This enchantment can still be applied to the listed helmets with Stalker. For the rest of helms and armor, it is being removed by Anti-Cheat system."

assets/item_database/armor.toml

@@ -254,7 +254,7 @@ enchantments = [ "damage_absorption",]
 name = "Outworld Vest"
 
 [ARMOR_FACELESS_TUNIC]
-name = "Faceless's Tunic"
+name = "Faceless Tunic"
 
 [ARMOR_MEMBRANE_CUIRASS]
 name = "Membrane Cuirass"
@@ -431,7 +431,7 @@ name = "Candy's Body"
 traits = [ "unobtainable",]
 
 [BODY_FEAR]
-name = "Tenebris's Body"
+name = "Tenebris' Body"
 traits = [ "unobtainable",]
 
 [BODY_HUNTER]
@@ -494,7 +494,7 @@ description = "Wasp seems to wear a highly-stylized feminine Snake Harness, with
 traits = [ "unobtainable",]
 
 [ARMOR_HUNTRESS]
-name = "Huntress's Armor"
+name = "Widow's Armor"
 description = "Widow seems to wear a highly-stylized feminine Snake Harness, which has draping sleeves and a skirt."
 traits = [ "unobtainable",]
 
@@ -504,7 +504,7 @@ description = "Shogun wears a type of Centurion Mail, which is bigger in size, h
 traits = [ "unobtainable",]
 
 [BODY_FUTURE_MAY]
-name = "Future May's Body"
+name = "Blackness' Body"
 traits = [ "unobtainable",]
 
 [BODY_TITAN]
@@ -552,7 +552,7 @@ name = ""
 traits = [ "unobtainable",]
 
 [ARMOR_BIG_SHROUD]
-name = ""
+name = "Shroud's Armor"
 description = "Shroud wears an armor that resembles an enlarged version of Half-Life Armor."
 traits = [ "unobtainable",]
 
@@ -583,11 +583,11 @@ name = "Megalith's Body"
 traits = [ "unobtainable",]
 
 [BODY_FUNGUS]
-name = "Fungus's Body"
+name = "Fungus' Body"
 traits = [ "unobtainable",]
 
 [BODY_FISH]
-name = "Fish's Body"
+name = "Vortex's Body"
 traits = [ "unobtainable",]
 
 [BODY_HUNGER]
@@ -619,11 +619,11 @@ name = "Whisper's Body"
 traits = [ "unobtainable",]
 
 [BODY_PRISTESS]
-name = "Pristess's Body"
+name = "Pristess' Body"
 traits = [ "unobtainable",]
 
 [ARMOR_HYPERION]
-name = "Cronos's Armor"
+name = "Cronos' Armor"
 traits = [ "unobtainable",]
 
 [ARMOR_XMAS14_SANTA]

assets/item_database/helm.toml

@@ -263,7 +263,7 @@ name = "Navigator's Breath Mask"
 enchantments = [ "damage_return",]
 
 [HELM_FACELESS_MASK]
-name = "Faceless's Mask"
+name = "Faceless Mask"
 
 [HELM_VISOR]
 name = "Elders' Visor"
@@ -470,7 +470,7 @@ name = "Street Tempest"
 traits = [ "summer_fest_25",]
 
 [HEAD_FEAR]
-name = "Tenebris's Head"
+name = "Tenebris' Head"
 traits = [ "unobtainable",]
 
 [BERSTUUK_HEAD]
@@ -584,11 +584,11 @@ name = "Megalith's Head"
 traits = [ "unobtainable",]
 
 [HEAD_FUNGUS]
-name = "Fungus's Head"
+name = "Fungus' Head"
 traits = [ "unobtainable",]
 
 [HEAD_FISH]
-name = "Fish's Head"
+name = "Vortex's Head"
 traits = [ "unobtainable",]
 
 [HEAD_FATUM]
@@ -665,7 +665,7 @@ name = "Brick's Head"
 traits = [ "unobtainable",]
 
 [HEAD_HYPERION]
-name = "Cronos's Head"
+name = "Cronos' Head"
 traits = [ "unobtainable",]
 
 [HEAD_INVISIBLE]
@@ -677,7 +677,7 @@ name = "Raksha's Head"
 traits = [ "unobtainable",]
 
 [HEAD_PRISTESS]
-name = "Pristess's Head"
+name = "Pristess' Head"
 traits = [ "unobtainable",]
 
 [HEAD_FOREST_SPIRIT]

assets/item_database/ranged.toml

@@ -335,7 +335,7 @@ traits = [ "offer", "summer21",]
 enchantments = [ "lifesteal",]
 
 [RANGED_BP_S5_TIME_SHIFTER]
-name = "Chronos's Razor"
+name = "Chronos' Razor"
 traits = [ "set_chronos", "xmas22",]
 enchantments = [ "time_shift",]
 

lib/logic/enchantment.dart

@@ -16,6 +16,8 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+import 'dart:convert';
+
 import 'package:flutter/services.dart';
 import 'package:stalker/logic/equipment_type.dart';
 import 'package:toml/toml.dart';
@@ -24,19 +26,6 @@ import 'package:xml/xml.dart';
 enum EnchantmentTier { simple, medium, mythical, perk }
 
 extension EnchantmentTierExtension on EnchantmentTier {
-  String get fileName {
-    switch (this) {
-      case EnchantmentTier.simple:
-        return "simple";
-      case EnchantmentTier.medium:
-        return "medium";
-      case EnchantmentTier.mythical:
-        return "mythical";
-      case EnchantmentTier.perk:
-        return "perk";
-    }
-  }
-
   int get color {
     switch (this) {
       case EnchantmentTier.simple:
@@ -121,10 +110,16 @@ class EnchantmentsManager {
 
   static Future<void> loadFromFiles() async {
     enchantments.clear();
-    for (final tier in EnchantmentTier.values) {
-      final tomlString = await rootBundle
-          .loadString("assets/enchantments/${tier.fileName}.toml");
+    final manifestContent = await rootBundle.loadString('AssetManifest.json');
+    final Map<String, dynamic> manifestMap = json.decode(manifestContent);
+
+    for (final file in manifestMap.keys
+        .where((key) => key.startsWith("assets/enchantments"))
+        .toList()) {
+      final tomlString = await rootBundle.loadString(file);
       final tomlMap = TomlDocument.parse(tomlString).toMap();
+      final tier = EnchantmentTier.values.byName(tomlMap["tier"]);
+      tomlMap.remove("tier");
       enchantments.addAll(tomlMap.entries.map((e) {
         final id = e.key;
         final data = e.value as Map<String, dynamic>;

lib/main.dart

@@ -18,7 +18,6 @@
 
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:log_plus/log_plus.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:signals/signals_flutter.dart';