- Added new items to the item database: Order's Oath, Veil of Dawn, Winds Harmony, Path of Heresy, Seer's Staff, Song of the Tide

- Introduced minor changes to the text search bar
- Added support for upgrade and recipe deliveries
- Bumped the version to 1.2.2

Author: onerdna

assets/item_database.toml

@@ -3804,6 +3804,42 @@ description = "Striking Falcon is a weapon that can be purchased in a special of
 traits = ["offer"]
 enchantments = ["precision"]
 
+[WEAPON_ORDERS_OATH_25]
+name = "Order's Oath"
+description = "Order's Oath is a weapon that can be purchased in a special offer in Shadow Fight 2. It can be purchased for real money."
+traits = ["offer"]
+enchantments = ["bleeding"]
+
+[HELM_VEIL_OF_DAWN_25]
+name = "Veil of Dawn"
+description = ""
+traits = ["offer"]
+enchantments = ["shielding"]
+
+[RANGED_WINDS_HARMONY_25]
+name = "Winds Harmony"
+description = ""
+traits = ["offer"]
+enchantments = ["precision"]
+
+[RANGED_PATH_OF_HERESY_25]
+name = "Path of Heresy"
+description = ""
+traits = ["offer"]
+enchantments = ["stun"]
+
+[WEAPON_SEERS_STAFF_25]
+name = "Seer's Staff"
+description = "Seer's Staff is a weapon that can be purchased in a special offer in Shadow Fight 2. It can be purchased for real money."
+traits = ["offer"]
+enchantments = ["weakness"]
+
+[MAGIC_SONG_OF_THE_TIDE_25]
+name = "Song of the Tide"
+description = "Song of the Tide is a magic in Shadow Fight 2. This magic was available in a weekly offer for real money. The player makes a water wave with both hands, simultaneously extending both arms, then leans forward and launches magic at the enemy. Song of the Tide will move horizontally across the battlefield. When the magic hits the target, the opponent is thrown back and takes 45 points of damage."
+traits = ["offer"]
+enchantments = ["frenzy"]
+
 [HELM_HOAXEN_25]
 name = "Сhimera Paradox"
 description = ""

lib/enchantment.dart

@@ -45,6 +45,23 @@ extension EnchantmentTierExtension on EnchantmentTier {
         return 0xFF441752;
     }
   }
+
+  String get recipeDeliveryName {
+    switch (this) {
+      case EnchantmentTier.simple:
+        return "Simple";
+      case EnchantmentTier.medium:
+        return "Medium";
+      case EnchantmentTier.mythical:
+        return "Mythical"; // either Mythical or Mythic, not tested
+    }
+  }
+
+  static EnchantmentTier? tierFromRecipeName(String recipeDeliveryName) {
+    return EnchantmentTier.values
+        .where((c) => c.recipeDeliveryName == recipeDeliveryName)
+        .firstOrNull;
+  }
 }
 
 class Enchantment {

lib/equipment.dart

@@ -22,6 +22,40 @@ import 'package:stalker/item_database.dart';
 import 'package:stalker/record.dart';
 import 'package:xml/xml.dart';
 
+class UpgradeDelivery {
+  DateTime time = DateTime.fromMillisecondsSinceEpoch(0);
+  int level = 0;
+  int upgrade = 0;
+
+  String get upgradeLevel {
+    return "$level${upgrade == 0 ? "00" : upgrade * 10}";
+  }
+
+  UpgradeDelivery(this.time, this.level, this.upgrade);
+  UpgradeDelivery.fromXml(String upgradeLevel, String deliveryTime) {
+    time = DateTime.fromMillisecondsSinceEpoch(int.parse(deliveryTime) * 1000);
+    level = int.parse(upgradeLevel.substring(0, upgradeLevel.length - 2));
+    upgrade = int.parse(upgradeLevel.substring(
+        upgradeLevel.length - 2, upgradeLevel.length - 1));
+  }
+}
+
+class RecipeDelivery {
+  DateTime time = DateTime.fromMillisecondsSinceEpoch(0);
+  late EnchantmentTier tier;
+  int itemLevel = 0;
+  int playerLevel = 0;
+
+  RecipeDelivery(this.tier, this.time, this.itemLevel, this.playerLevel);
+  RecipeDelivery.fromXml(
+      String tier, String deliveryTime, String itemLevel, String playerLevel) {
+    time = DateTime.fromMillisecondsSinceEpoch(int.parse(deliveryTime) * 1000);
+    this.itemLevel = int.parse(itemLevel);
+    this.playerLevel = int.parse(playerLevel);
+    this.tier = EnchantmentTierExtension.tierFromRecipeName(tier)!;
+  }
+}
+
 class Equipment {
   final EquipmentType type;
   final String id;
@@ -30,6 +64,8 @@ class Equipment {
   final String? acquireType;
   int level = 0;
   int upgrade = 0;
+  UpgradeDelivery? upgradeDelivery;
+  RecipeDelivery? recipeDelivery;
   static const minLevel = 1;
   static const maxLevel = 52;
   static const minUpgrade = 0;
@@ -38,13 +74,15 @@ class Equipment {
   List<AppliedEnchantment> enchantments = [];
 
   Equipment.fromUpgradeString(this.type, this.id, String upgradeLevel,
-      {this.acquireType}) {
-    if (int.parse(upgradeLevel) < 0 || int.parse(upgradeLevel) > maxLevel * 100 + maxUpgrade * 100) {
+      {this.acquireType, this.upgradeDelivery, this.recipeDelivery}) {
+    if (int.parse(upgradeLevel) < 0 ||
+        int.parse(upgradeLevel) > maxLevel * 100 + maxUpgrade * 100) {
       upgradeLevel = "100";
     }
     level = int.parse(upgradeLevel.substring(0, upgradeLevel.length - 2));
     upgrade = int.parse(upgradeLevel.substring(
         upgradeLevel.length - 2, upgradeLevel.length - 1));
+
     name = ItemDatabase.getName(id);
     description = ItemDatabase.getDescription(id);
   }
@@ -59,6 +97,25 @@ class Equipment {
   }
 
   XmlElement toXml(Record record) {
+    List<XmlElement> children = [
+      if (enchantments.isNotEmpty)
+        XmlElement(XmlName("Enchantments"), [],
+            enchantments.map((e) => e.toXml(type))),
+      if (recipeDelivery != null)
+        XmlElement(XmlName("RecipeDelivery"), [
+          XmlAttribute(
+              XmlName("Name"), recipeDelivery!.tier.recipeDeliveryName),
+          XmlAttribute(
+              XmlName("ItemLevel"), recipeDelivery!.itemLevel.toString()),
+          XmlAttribute(
+              XmlName("PlayerLevel"), recipeDelivery!.playerLevel.toString()),
+          XmlAttribute(
+              XmlName("DeliveryTime"),
+              (recipeDelivery!.time.millisecondsSinceEpoch / 1000)
+                  .toInt()
+                  .toString()),
+        ], [])
+    ];
     return XmlElement(
         XmlName("Item"),
         [
@@ -67,15 +124,17 @@ class Equipment {
               XmlName("Equipped"), record.isEquipped(this) ? "1" : "0"),
           XmlAttribute(XmlName("Count"), "1"),
           XmlAttribute(XmlName("UpgradeLevel"), _upgradeLevel),
-          XmlAttribute(XmlName("DeliveryTime"), "-1"),
-          XmlAttribute(XmlName("DeliveryUpgradeLevel"), "-1"),
+          XmlAttribute(
+              XmlName("DeliveryTime"),
+              upgradeDelivery == null
+                  ? "-1"
+                  : (upgradeDelivery!.time.millisecondsSinceEpoch / 1000)
+                      .toInt()
+                      .toString()),
+          XmlAttribute(XmlName("DeliveryUpgradeLevel"),
+              upgradeDelivery == null ? "-1" : upgradeDelivery!.upgradeLevel),
           XmlAttribute(XmlName("AcquireType"), acquireType ?? "Upgrade"),
         ],
-        enchantments.isEmpty
-            ? []
-            : [
-                XmlElement(XmlName("Enchantments"), [],
-                    enchantments.map((e) => e.toXml(type)))
-              ]);
+        children);
   }
 }

lib/pages/edit_xml/edit_xml.dart

@@ -80,13 +80,22 @@ class _EditXmlPageState extends State<EditXmlPage> {
               spacing: 8,
               children: [
                 Expanded(
-                  child: TextSearchBar(onSubmitted: (query) {
-                    if (query.trim().isEmpty) return;
-                    setState(() {
-                      _updateMatches(query.trim());
-                      _jumpToMatch(currentMatchIndex);
-                    });
-                  }),
+                  child: TextSearchBar(
+                    onSubmitted: (query) {
+                      if (query.trim().isEmpty) return;
+                      setState(() {
+                        _updateMatches(query.trim());
+                        _jumpToMatch(currentMatchIndex);
+                      });
+                    },
+                    onCleared: () {
+                      setState(() {
+                        currentMatchIndex = 0;
+                        searchMatches.clear();
+                      });
+                      focusNode.unfocus();
+                    },
+                  ),
                 ),
                 Column(children: [
                   Row(children: [

lib/pages/edit_xml/text_search_bar.dart

@@ -2,27 +2,41 @@ import 'package:flutter/material.dart';
 
 class TextSearchBar extends StatefulWidget {
   final void Function(String) onSubmitted;
+  final VoidCallback onCleared;
 
-  const TextSearchBar({super.key, required this.onSubmitted});
+  const TextSearchBar(
+      {super.key, required this.onSubmitted, required this.onCleared});
 
   @override
   State<TextSearchBar> createState() => _TextSearchBarState();
 }
 
 class _TextSearchBarState extends State<TextSearchBar> {
   final controller = TextEditingController();
+  final FocusNode focusNode = FocusNode();
 
   @override
   void dispose() {
     super.dispose();
     controller.dispose();
+    focusNode.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
     return SearchBar(
         hintText: "Search...",
         onSubmitted: widget.onSubmitted,
-        controller: controller);
+        controller: controller,
+        focusNode: focusNode,
+        trailing: [
+          IconButton(
+              onPressed: () {
+                controller.clear();
+                focusNode.unfocus();
+                widget.onCleared();
+              },
+              icon: const Icon(Icons.clear))
+        ]);
   }
 }