From 3b5c3c7a019dd0da1e87ce6e013bc0062b478d8e Mon Sep 17 00:00:00 2001
From: Efrain <mimo4325@gmail.com>
Date: Sat, 27 Mar 2021 11:26:18 -0500
Subject: [PATCH] Post merge fix

---
 .../calculator_asc_materials_item_bloc.dart        | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/application/calculator_asc_materials_item/calculator_asc_materials_item_bloc.dart b/lib/application/calculator_asc_materials_item/calculator_asc_materials_item_bloc.dart
index 94268b277..9b7ccc3a5 100644
--- a/lib/application/calculator_asc_materials_item/calculator_asc_materials_item_bloc.dart
+++ b/lib/application/calculator_asc_materials_item/calculator_asc_materials_item_bloc.dart
@@ -242,15 +242,25 @@ class CalculatorAscMaterialsItemBloc extends Bloc<CalculatorAscMaterialsItemEven
 
   List<CharacterSkill> _getCharacterSkillsToUse(CharacterFileModel character, TranslationCharacterFile translation) {
     final skills = <CharacterSkill>[];
-    for (final e in translation.skills) {
+    for (var i = 0; i < translation.skills.length; i++) {
+      final e = translation.skills[i];
       final related = character.skills.firstWhereOrNull((el) => el.key == e.key);
       if (related == null || related.type == CharacterSkillType.others) {
         continue;
       }
 
-      final enableTuple = _calculatorService.isSkillEnabled(minSkillLevel, maxSkillLevel, minAscensionLevel, maxAscensionLevel);
+      final enableTuple = _calculatorService.isSkillEnabled(
+        minSkillLevel,
+        maxSkillLevel,
+        minAscensionLevel,
+        maxAscensionLevel,
+        minSkillLevel,
+        maxSkillLevel,
+      );
       final skill = CharacterSkill.skill(
+        key: e.key,
         name: e.title,
+        position: i,
         currentLevel: minSkillLevel,
         desiredLevel: maxSkillLevel,
         isCurrentDecEnabled: enableTuple.item1,