Fix address for starting player, and disable broken rewards.

pixeltris · May 19, 2020 · dd15e29 · dd15e29
1 parent 3606db6
commit dd15e29
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 11 deletions.
diff --git a/Lotd/NativeScript/MemTools.Addresses.LotdLE_v2.cs b/Lotd/NativeScript/MemTools.Addresses.LotdLE_v2.cs
@@ -35,7 +35,7 @@ public Addresses_LotdLE_v2()
                 modePlayerControllerAddress = (IntPtr)0x140C8D218;
                 modeAIModeAddress = (IntPtr)0x140C8D39C;
                 modeStartingLifePointsAddress = (IntPtr)0x140C8D370;
-                modeStartingPlayerAddress = (IntPtr)0x140C8D388;
+                modeStartingPlayerAddress = (IntPtr)0x140C8D384;
                 modeTurnTimeLimitEnabledAddress = (IntPtr)0x140C8D364;
                 modeTurnTimeLimitAddress = (IntPtr)0x140C8D368;
                 modeTutorialDuelAddress = (IntPtr)0x140C8D1EA;

diff --git a/Lotd/NativeScript/MemTools.cs b/Lotd/NativeScript/MemTools.cs
@@ -1102,7 +1102,7 @@ public void StartDuel(StartDuelInfo duelInfo)
 
             if (addresses.modeMasterRules != IntPtr.Zero)
             {
-                WriteValue<byte>(addresses.modeChallengeDuelAddress, (byte)(duelInfo.MasterRules5 ? 1 : 0));
+                WriteValue<byte>(addresses.modeMasterRules, (byte)(duelInfo.MasterRules5 ? 1 : 0));
             }
 
             // Set the controllers for each player (AI / player)

diff --git a/Lotd/UI/DuelStarterForm.cs b/Lotd/UI/DuelStarterForm.cs
@@ -48,6 +48,13 @@ public DuelStarterForm()
             startingPlayerComboBox.SelectedIndex = 0;
             duelKindComboBox.SelectedIndex = 0;
 
+            if (Program.Version != GameVersion.Lotd)
+            {
+                // Rewards are handled differently on LE?
+                duelRewardsCheckBox.Checked = false;
+                duelRewardsCheckBox.Enabled = false;
+            }
+
             ReloadDecks();
 
             filterDeckXyzCheckBox.CheckStateChanged += FilterDeckCheckBox_CheckStateChanged;

diff --git a/Lotd/YdkHelper.cs b/Lotd/YdkHelper.cs
@@ -202,6 +202,31 @@ public static void GenerateIdMap()
                     name = name.Replace("α", "Alpha");
                     alternativeName = true;
                 }
+                if (name.Contains("Ω"))
+                {
+                    name = name.Replace("Ω", "Omega");
+                    alternativeName = true;
+                }
+                if (name.Contains("Ür"))
+                {
+                    name = name.Replace("Ür", "Ur");
+                    alternativeName = true;
+                }
+                if (name.Contains("Cú"))
+                {
+                    name = name.Replace("Cú", "Cu");
+                    alternativeName = true;
+                }
+                if (name.Contains("ñ"))
+                {
+                    name = name.Replace("ñ", "n");
+                    alternativeName = true;
+                }
+                if (name.Contains("é"))
+                {
+                    name = name.Replace("é", "e");
+                    alternativeName = true;
+                }
                 if (name.Contains("The"))
                 {
                     name = name.Replace("The", "the");
@@ -226,20 +251,14 @@ public static void GenerateIdMap()
             AddAlternativeCard(alternativeCardNames, 8858, "Vampiric Koala");//Vampire Koala
             // Link Evolution (2020)
             AddAlternativeCard(alternativeCardNames, 6992, "Cu Chulainn the Awakened");//Cú Chulainn the Awakened
-            AddAlternativeCard(alternativeCardNames, 7331, "Fiendish Engine Omega");//Fiendish Engine Ω
-            AddAlternativeCard(alternativeCardNames, 7760, "Machine Lord Ur");//Machine Lord Ür
-            AddAlternativeCard(alternativeCardNames, 7790, "Beast Machine King Barbaros Ur");//Beast Machine King Barbaros Ür
             AddAlternativeCard(alternativeCardNames, 8330, "Falchion Beta");//Falchionβ
-            AddAlternativeCard(alternativeCardNames, 9683, "Damage Vaccine Omega MAX");//Damage Vaccine Ω MAX
-            AddAlternativeCard(alternativeCardNames, 10771, "Marina, Princess of Sunflowers");//Mariña, Princess of Sunflowers
-            AddAlternativeCard(alternativeCardNames, 10925, "Chirubime, Princess of Autumn Leaves");//Chirubimé, Princess of Autumn Leaves
             AddAlternativeCard(alternativeCardNames, 12865, "Abyss Actor - Twinkle Littlestar");//Abyss Actor - Twinkle Little Star
             AddAlternativeCard(alternativeCardNames, 12996, "Gandora Giga Rays the Dragon of Destruction");//Gigarays Gandora the Dragon of Destruction
             AddAlternativeCard(alternativeCardNames, 13017, "Number F0: Utopic Future - Future Slash");//Number F0: Utopic Future Slash
             AddAlternativeCard(alternativeCardNames, 13018, "Raidraptor - Revolution Falcon - Airraid");//Raidraptor - Revolution Falcon
             AddAlternativeCard(alternativeCardNames, 13203, "Tri-gate Wizard");//Tri-Gate Wizard
             AddAlternativeCard(alternativeCardNames, 13453, "Fire Opalhead");//Fire Opal Head
-            AddAlternativeCard(alternativeCardNames, 13457, "Linklebell");//Linkerbell <--- not on ygoprodeck?
+            AddAlternativeCard(alternativeCardNames, 13457, "Linklebell");//Linkerbell
             AddAlternativeCard(alternativeCardNames, 13840, "Hope Magician");//Magician of Hope
             AddAlternativeCard(alternativeCardNames, 14221, "Utopic Onomatopeia");//Utopic Onomatopoeia
             AddAlternativeCard(alternativeCardNames, 14341, "Performapal Kuribohrder");//Performapal Kuribohble
@@ -250,6 +269,8 @@ public static void GenerateIdMap()
             // These card ids were moved in Link Evolution
             //73578229 6276
             //69832741 5280
+            AddCardManually(73578229, 6276);
+            AddCardManually(69832741, 5280);
 
             // These card ids were changed in Link Evolution (tokens only)
             //14470846 3917 -> 13300
@@ -295,6 +316,12 @@ public static void GenerateIdMap()
             }
         }
 
+        private static void AddCardManually(long ydkId, long officialId)
+        {
+            ydkIdToOfficialId[ydkId] = officialId;
+            officialIdToYdkId[officialId] = ydkId;
+        }
+
         private static void AddAlternativeCard(Dictionary<string, CardInfo> alternativeCardNames, short id, string name)
         {
             CardInfo card;

diff --git a/Lotd/YdkIds.txt b/Lotd/YdkIds.txt
@@ -1,3 +1,5 @@
+73578229 6276
+69832741 5280
 27551 7636
 32864 4138
 41546 12409
@@ -10262,5 +10264,3 @@
 43892409 11151
 94977270 11257
 10802916 9702
-73578229 6276
-69832741 5280