Remove certain flame pins when flames are vanilla and charms are rand…

…omized, bump version
syyePhenomenol · Mar 19, 2022 · f8d1e82 · f8d1e82
1 parent 9fd31cc
commit f8d1e82
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/MapModS/Data/DataLoader.cs b/MapModS/Data/DataLoader.cs
@@ -247,25 +247,9 @@ public static void SetUsedPinDefs()
                 //MapModS.Instance.Log(locationName);
                 //MapModS.Instance.Log(pinDef.locationPoolGroup);
             }
-
-            List<GeneralizedPlacement> missingPlacements = new();
-
-            if (!RandomizerMod.RandomizerMod.RS.GenerationSettings.PoolSettings.GrimmkinFlames)
-            {
-                // These vanilla placements are not in Context.Vanilla for some reason. This is a temporary fix
-                missingPlacements = new()
-                {
-                    new(null, RandomizerMod.RandomizerMod.RS.Context.LM.GetLogicDef("Grimmkin_Flame-City_Storerooms")),
-                    new(null, RandomizerMod.RandomizerMod.RS.Context.LM.GetLogicDef("Grimmkin_Flame-Greenpath")),
-                    new(null, RandomizerMod.RandomizerMod.RS.Context.LM.GetLogicDef("Grimmkin_Flame-Crystal_Peak")),
-                    new(null, RandomizerMod.RandomizerMod.RS.Context.LM.GetLogicDef("Grimmkin_Flame-King's_Pass")),
-                    new(null, RandomizerMod.RandomizerMod.RS.Context.LM.GetLogicDef("Grimmkin_Flame-Resting_Grounds")),
-                    new(null, RandomizerMod.RandomizerMod.RS.Context.LM.GetLogicDef("Grimmkin_Flame-Kingdom's_Edge"))
-                };
-            }
 
             // Vanilla placements
-            foreach (GeneralizedPlacement placement in RandomizerMod.RandomizerMod.RS.Context.Vanilla.Concat(missingPlacements))
+            foreach (GeneralizedPlacement placement in RandomizerMod.RandomizerMod.RS.Context.Vanilla)
             {
                 if (RandomizerMod.RandomizerData.Data.IsLocation(placement.Location.Name)
                     && !RandomizerMod.RandomizerMod.RS.TrackerData.clearedLocations.Contains(placement.Location.Name)

diff --git a/MapModS/MapModS.cs b/MapModS/MapModS.cs
@@ -16,7 +16,7 @@ public class MapModS : Mod, ILocalSettings<LocalSettings>, IGlobalSettings<Globa
     {
         public static MapModS Instance;
 
-        public override string GetVersion() => "2.3.1";
+        public override string GetVersion() => "2.3.2";
 
         public override int LoadPriority() => 10;