arbitrary enum display names

fix buhnautica

SCHIZO/SwarmControl/Models/Game/EnumDefinitionModel.cs

@@ -1,8 +1,15 @@
 using System;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Serialization;
 
 namespace SwarmControl.Models.Game;
 public class EnumDefinitionModel(Type enumType)
 {
     public string Name { get; set; } = enumType.Name;
-    public string[] Values { get; set; } = Enum.GetNames(enumType); // enumType.GetEnumNames(); // Nautilus only patches Enum.GetNames
+    public string[] Values { get; set; } = enumType.GetFields(BindingFlags.Public | BindingFlags.Static)
+        .Select(f => f.GetCustomAttribute<EnumMemberAttribute>() is { } customDisplayName
+            ? customDisplayName.Value
+            : f.Name)
+        .ToArray();
 }

SCHIZO/SwarmControl/Redeems/CommonTechTypes.cs

@@ -1,3 +1,5 @@
+using System.Runtime.Serialization;
+
 namespace SCHIZO.SwarmControl.Redeems;
 
 public enum CommonTechTypes
@@ -7,7 +9,9 @@ public enum CommonTechTypes
     Ermshark,
     Tutel,
     Anneel,
+    [EnumMember(Value = "Neuro fumo")]
     NeuroFumoItem,
+    [EnumMember(Value = "Evil fumo")]
     EvilFumoItem,
 
     // resources
@@ -18,6 +22,7 @@ public enum CommonTechTypes
     Silver,
     Lead,
     Gold,
+    [EnumMember(Value = "Scrap Metal")]
     ScrapMetal,
     Lithium,
     Magnetite,
@@ -26,6 +31,7 @@ public enum CommonTechTypes
     Diamond,
 
     // creatures
+    [EnumMember(Value = "Arctic Peeper")]
     ArcticPeeper,
     Bladderfish,
 

SCHIZO/SwarmControl/Redeems/Enums/AggressiveCreature.cs

@@ -1,9 +1,13 @@
+using System.Runtime.Serialization;
+
 namespace SCHIZO.SwarmControl.Redeems.Enums;
 
 public enum AggressiveCreature
 {
     Ermshark,
+    [EnumMember(Value = "Lily Paddler")]
     LilyPaddler,
     Cryptosuchus,
+    [EnumMember(Value = "Squid Shark")]
     SquidShark,
 }

SCHIZO/SwarmControl/Redeems/Enums/CommonItems.cs

@@ -0,0 +1,29 @@
+using System.Runtime.Serialization;
+
+namespace SCHIZO.SwarmControl.Redeems.Enums;
+
+public enum CommonItems
+{
+    Salt,
+    Quartz,
+    Titanium,
+    Copper,
+    Silver,
+    Lead,
+
+    [EnumMember(Value = "Neuro fumo")]
+    NeuroFumoItem,
+    [EnumMember(Value = "Evil fumo")]
+    EvilFumoItem,
+
+    Gold,
+    [EnumMember(Value = "Table Coral")]
+    JeweledDiskPiece,
+    [EnumMember(Value = "Ribbon Plant")]
+    GenericRibbon,
+
+    [EnumMember(Value = "Filtered Water")]
+    FilteredWater,
+    [EnumMember(Value = "Nutrient Block")]
+    NutrientBlock
+}

SCHIZO/SwarmControl/Redeems/Enums/PassiveCreature.cs

@@ -1,12 +1,16 @@
-namespace SCHIZO.SwarmControl.Redeems.Enums;
+using System.Runtime.Serialization;
+
+namespace SCHIZO.SwarmControl.Redeems.Enums;
 
 public enum PassiveCreature
 {
     Ermfish,
     Anneel,
     Tutel,
+    [EnumMember(Value = "Arctic Peeper")]
     ArcticPeeper,
     Bladderfish,
     Boomerang,
+    [EnumMember(Value = "Spinner Fish")]
     SpinnerFish,
 }

SCHIZO/SwarmControl/Redeems/Helpful/GiveCommonResource.cs

@@ -9,7 +9,7 @@ namespace SCHIZO.SwarmControl.Redeems.Helpful;
     DisplayName = "Give Common Resource",
     Export = false /// deprecated in favor of <see cref="SeaMonkeyDeliverySystem"/>
 )]
-internal class GiveCommonResource : ItemFiltered<CommonResources>
+internal class GiveCommonResource : ItemFiltered<CommonItems>
 {
     protected override string SpawnThingName => "Item";
 }

SCHIZO/SwarmControl/Redeems/Helpful/SeaMonkeyDeliverySystem.BelowZero.cs

@@ -22,7 +22,7 @@ namespace SCHIZO.SwarmControl.Redeems.Helpful;
 internal class SeaMonkeyDeliverySystem : Command, IParameters
 {
     public IReadOnlyList<Parameter> Parameters => [
-        new Parameter(new("item", "Item", "Item you wish delivered."), typeof(CommonResources))
+        new Parameter(new("item", "Item", "Item you wish delivered."), typeof(CommonItems))
     ];
 
     protected override object ExecuteCore(CommandExecutionContext ctx)
@@ -32,7 +32,7 @@ protected override object ExecuteCore(CommandExecutionContext ctx)
         TechType item;
         try
         {
-            if (!ctx.Input.GetNamedArguments().TryGetValue("item", out CommonResources itemFiltered))
+            if (!ctx.Input.GetNamedArguments().TryGetValue("item", out CommonItems itemFiltered))
                 return CommonResults.Error("Invalid item");
             item = (TechType) Enum.Parse(typeof(TechType), itemFiltered.ToString());
         }

SCHIZO/SwarmControl/Redeems/Misc/BigErm.cs

@@ -18,9 +18,8 @@ namespace SCHIZO.SwarmControl.Redeems.Misc;
 #nullable enable
 [Redeem(Name = "redeem_bigerm",
     DisplayName = "Big Erm",
-    Description = "It's time to Get Big",
-    RegisterConsoleCommand = true
-    )]
+    Description = "It's time to Get Big"
+)]
 internal class BigErm : Command, IParameters
 {
     public IReadOnlyList<Parameter> Parameters => [];

SCHIZO/SwarmControl/Redeems/Misc/MidasTouch.cs

@@ -29,6 +29,7 @@ public sealed class MidasTouch : Command, IParameters
         TechType.Kyanite,
         TechType.Nickel,
 
+#if BELOWZERO // cba
         TechType.TwistyBridgesMushroomChunk,
         TechType.GenericRibbon,
         TechType.JeweledDiskPiece, // table coral
@@ -53,6 +54,7 @@ public sealed class MidasTouch : Command, IParameters
         TechType.BigFilteredWater,
         TechType.DisinfectedWater,
         TechType.FilteredWater,
+#endif
     ];
 
     public IReadOnlyList<Parameter> Parameters => [];