- Updated README.md

- Added Moon Oath to the item database
- Improved code organization

Author: onerdna

README.md

@@ -29,22 +29,22 @@ Stalker allows users to inspect and optionally tweak various aspects of their Sh
 - Download and install the APK file from [releases](https://github.com/onerdna/stalker/releases) page
 - Install [Shizuku](https://shizuku.rikka.app/)
 - Start Shizuku service if it's not already running. There are great tutorials on the internet of doing so.
-- Launch the app, grant Shizuku permissions
-- Proceed to the additional setup step. Before that, ensure that the game is fully closed. Minimize the app (do not fully close it!), open the game and wait until it fully loads. Then, close the game, go back to the app and press "Reinitialize" button.
+- Launch the app, grant Shizuku permissions.
+- Proceed to the additional setup step. Before that, ensure that the game is fully closed. Minimize the app (do not fully close it!), open the game and wait until it fully loads. Then, close the game, go back to the app and tap "Reinitialize" button.
 
 ### ❗ Before using...
-- Fully close the game and only then open the app
-- If you make any tweaks to the save, then press "Save" button after doing any modifications
+- Completely close the game before opening the app.
+- If you make any changes, you must tap the 'Save' button for them to take effect.
 
 ## ❓ FaQ
-- **Will there be an IOS version?**
+- **Will there ever be an IOS version?**
   - No.
-- **Why the app uses Shizuku?**
-  - Shizuku is required to access save files (because it's not accessible for regular apps) and it's used to launch setup service binary.
-- **Can you add verified gems/raid consumables or damage hack?**
+- **Why does the app use Shizuku?**
+  - Shizuku is required to access save files, which aren't normally accessible to regular apps. It's also used to launch the setup service binary.
+- **Can you add verified gems, raid consumables or a damage hack?**
   - No.
-- **What setup service actually does? I'm concerned about running high-privelleged compiled binaries.**
-  - The only purpose of setup service is to tamper your user id from the game's process. After doing so, it will automatically close itself (or after two minutes of inactivity). User ID is different for each device and it's just a random string that does not contain any information about your device. I won't share the process of acquiring the ID here nor the source code of the service because it's the only possible way of doing that, so it can be patched easily by the developers if they know. 
+- **What does the setup service actually do? I'm concerned about running high-privileged compiled binaries.**
+  - The setup service’s only purpose is to tamper with your user ID inside the game’s process. Once it does that, it automatically closes — or after two minutes of inactivity. The user ID is just a random string unique to each device. It doesn’t contain any personal or device-identifiable information. I won’t share the exact method used to get the ID, or the source code for the service, because this is the only known working method. If it becomes public, the developers could easily patch it.
 
 ### ❤ Special thanks to:
 - [**Shizuku**](https://shizuku.rikka.app/)

assets/item_database.toml

@@ -3840,8 +3840,14 @@ description = "Song of the Tide is a magic in Shadow Fight 2. This magic was ava
 traits = ["offer"]
 enchantments = ["frenzy"]
 
+[WEAPON_SWORD_SUMMER_FEST_25]
+name = "Moon Oath"
+description = "Nekki Summer Fest 2025 gift"
+traits = ["gift"]
+enchantments = ["lifesteal"]
+
 [HELM_HOAXEN_25]
-name = "Сhimera Paradox"
+name = "Chimera Paradox"
 description = ""
 traits = ["offer"]
 enchantments = ["damage_absorption"]

lib/app.dart

@@ -31,16 +31,16 @@ import 'package:path_provider/path_provider.dart';
 import 'package:pub_semver/pub_semver.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:signals/signals_flutter.dart';
-import 'package:stalker/app_bar.dart';
-import 'package:stalker/enchantment.dart';
+import 'package:stalker/ui/app_bar.dart';
+import 'package:stalker/logic/enchantment.dart';
 import 'package:stalker/main.dart';
 import 'package:stalker/pages/edit_xml/edit_xml.dart';
-import 'package:stalker/pages/equipment_page.dart';
-import 'package:stalker/pages/general_page.dart';
+import 'package:stalker/pages/equipment.dart';
+import 'package:stalker/pages/general.dart';
 import 'package:stalker/pages/records/records.dart';
-import 'package:stalker/pages/report_page.dart';
-import 'package:stalker/record.dart';
-import 'package:stalker/records_manager.dart';
+import 'package:stalker/pages/report.dart';
+import 'package:stalker/logic/record.dart';
+import 'package:stalker/logic/records_manager.dart';
 import 'package:signals/signals.dart' as signals_core;
 import 'package:stalker/shizuku_api.dart';
 import 'package:stalker/shizuku_file.dart';

lib/enchantment.dart lib/logic/enchantment.dartlib/enchantment.dart renamed to lib/logic/enchantment.dart

@@ -17,7 +17,7 @@
  */
 
 import 'package:flutter/services.dart';
-import 'package:stalker/equipment_type.dart';
+import 'package:stalker/logic/equipment_type.dart';
 import 'package:toml/toml.dart';
 import 'package:xml/xml.dart';
 

lib/equipment.dart lib/logic/equipment.dartlib/equipment.dart renamed to lib/logic/equipment.dart

@@ -16,10 +16,10 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'package:stalker/enchantment.dart';
-import 'package:stalker/equipment_type.dart';
-import 'package:stalker/item_database.dart';
-import 'package:stalker/record.dart';
+import 'package:stalker/logic/enchantment.dart';
+import 'package:stalker/logic/equipment_type.dart';
+import 'package:stalker/logic/item_database.dart';
+import 'package:stalker/logic/record.dart';
 import 'package:xml/xml.dart';
 
 class UpgradeDelivery {

lib/equipment_type.dart lib/logic/equipment_type.dartlib/equipment_type.dart renamed to lib/logic/equipment_type.dart

@@ -17,8 +17,8 @@
  */
 
 import 'package:flutter/services.dart';
-import 'package:stalker/enchantment.dart';
-import 'package:stalker/equipment_type.dart';
+import 'package:stalker/logic/enchantment.dart';
+import 'package:stalker/logic/equipment_type.dart';
 import 'package:toml/toml.dart';
 
 class ItemTrait {

lib/item_database.dart lib/logic/item_database.dartlib/item_database.dart renamed to lib/logic/item_database.dart

@@ -16,9 +16,9 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'package:stalker/enchantment.dart';
-import 'package:stalker/equipment_type.dart';
-import 'package:stalker/equipment.dart';
+import 'package:stalker/logic/enchantment.dart';
+import 'package:stalker/logic/equipment_type.dart';
+import 'package:stalker/logic/equipment.dart';
 import 'package:xml/xml.dart';
 import 'package:xml/xpath.dart';
 

lib/record.dart lib/logic/record.dartlib/record.dart renamed to lib/logic/record.dart

@@ -22,7 +22,7 @@ import 'dart:io';
 import 'package:crypto/crypto.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:stalker/record.dart';
+import 'package:stalker/logic/record.dart';
 import 'package:stalker/shizuku_api.dart';
 import 'package:stalker/shizuku_file.dart';
 import 'package:toml/toml.dart';

lib/records_manager.dart lib/logic/records_manager.dartlib/records_manager.dart renamed to lib/logic/records_manager.dart

@@ -22,7 +22,7 @@ import 'package:flutter/services.dart';
 import 'package:logger/logger.dart';
 import 'package:signals/signals_flutter.dart';
 import 'package:stalker/app.dart';
-import 'package:stalker/item_database.dart';
+import 'package:stalker/logic/item_database.dart';
 import 'package:stalker/logcat.dart';
 import 'package:stalker/themes.dart';
 import 'package:toml/toml.dart';