Fix duplicated heroes without corrupting save.

lzh-mb-mod · Sep 23, 2022 · c20e42a · c20e42a
1 parent 00d5efd
commit c20e42a
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/source/EnhancedBattleTest/src/SinglePlayer/BattleStarter.cs b/source/EnhancedBattleTest/src/SinglePlayer/BattleStarter.cs
@@ -440,20 +440,25 @@ public static void RecoverHeroes()
                 switch (pair.Value.Value)
                 {
                     case MemberState.Leader:
-                        if (!pair.Value.Key.MobileParty.MemberRoster.Contains(pair.Key.CharacterObject))
-                        {
-                            pair.Value.Key.AddElementToMemberRoster(pair.Key.CharacterObject, 1);
-                        }
+                        if (pair.Key.PartyBelongedTo?.Party == pair.Value.Key)
+                            continue;
+                        if (pair.Value.Key.MobileParty.MemberRoster.Contains(pair.Key.CharacterObject))
+                            pair.Value.Key.AddElementToMemberRoster(pair.Key.CharacterObject, -1);
+                        pair.Value.Key.AddElementToMemberRoster(pair.Key.CharacterObject, 1, true);
                         pair.Value.Key.MobileParty.ChangePartyLeader(pair.Key);
                         break;
                     case MemberState.Prisoner:
-                        if (pair.Value.Key.MobileParty.PrisonRoster.Contains(pair.Key.CharacterObject))
+                        if (pair.Key.PartyBelongedToAsPrisoner == pair.Value.Key)
                             continue;
-                        pair.Value.Key.AddPrisoner(pair.Key.CharacterObject, 1);                        
+                        if (pair.Value.Key.MobileParty.PrisonRoster.Contains(pair.Key.CharacterObject))
+                            pair.Value.Key.AddPrisoner(pair.Key.CharacterObject, -1);
+                        pair.Value.Key.AddPrisoner(pair.Key.CharacterObject, 1);
                         break;
                     case MemberState.Original:
-                        if (pair.Value.Key.MobileParty.MemberRoster.Contains(pair.Key.CharacterObject))
+                        if (pair.Key.PartyBelongedTo?.Party == pair.Value.Key)
                             continue;
+                        if (pair.Value.Key.MobileParty.MemberRoster.Contains(pair.Key.CharacterObject))
+                            pair.Value.Key.AddElementToMemberRoster(pair.Key.CharacterObject, -1);
                         pair.Value.Key.AddElementToMemberRoster(pair.Key.CharacterObject, 1);
                         break;
                 }