Normalize Brilliance card data to exclude underscores to prevent look…

…up disparity

Agronet stores some cards as "quickstep", but Brilliance has "quick_step".
This way, it doesn't matter if one or the other has underscores or dashes.

src/main/kotlin/org/trackedout/RunContext.kt

@@ -10,6 +10,8 @@ data object RunContext {
     var runId = UUID.randomUUID().toString()
     var initialized = false
 
+    // Note that all keys are stored without underscores or dashes, e.g. "quickstep" and "suitup"
+    // This is due to a disparity between what Agronet vs Brilliance calls the card
     var brillianceCards = mapOf<String, BrillianceCard>()
 
     private val playerContextMap: ConcurrentMap<String, PlayerContext> = Maps.newConcurrentMap()

src/main/kotlin/org/trackedout/actions/AddDeckToPlayerInventoryAction.kt

@@ -90,15 +90,15 @@ class AddDeckToPlayerInventoryAction(
         cardCount.forEach { (cardName, countInDeck) ->
             player.debug("- ${countInDeck}x $cardName")
             val card = Cards.findCard(cardName)!!
-            val maxCopies = RunContext.brillianceCards[card.key]?.maxCopies
+            val maxCopies = RunContext.brillianceCards[card.key.replace("_", "").replace("-", "")]?.maxCopies
             var count = min(countInDeck, maxCopies ?: countInDeck)
             logger.info("$playerName's shulker should contain ${count}x $cardName (deck has $countInDeck, max copies is $maxCopies, deck contains $totalCards cards)")
 
             if (countInDeck > (maxCopies ?: 0)) {
                 // If the player has more copies of a card than they should, log the new count that we're giving them
                 modificationLog["new-card-count-${cardName.replace("_", "-")}"] = "$count"
                 logger.warn("$playerName has too many copies of $cardName in their deck, truncating to $count")
-                player.sendMessage("You have too many copies of $cardName in your deck, truncating to $count", Formatting.RED)
+                player.sendMessage("You have too many copies of $cardName in your deck (max is $maxCopies and you have ${countInDeck}), truncating to $count", Formatting.RED)
             }
 
             // If the new cards would take the total over 40, truncate the count to only fill up to 40

src/main/kotlin/org/trackedout/data/BrillianceScoreboards.kt

@@ -7,6 +7,8 @@ data class BrillianceScoreboardDescription(
     val auto: Int,
     val target: String,
     val category: String,
+    val displayText: String? = null,
     val description: String,
+    val canEditForRunTypes: List<String>? = null,
     val values: Map<String, String>? = mapOf(),
 )

src/main/kotlin/org/trackedout/listeners/AgroNetPlayerConnectionListener.kt

@@ -51,7 +51,7 @@ class AgroNetPlayerConnectionListener(
         }
 
         parseBrillianceData<Map<String, BrillianceCard>>(resourceManager, "cards.json") { map ->
-            RunContext.brillianceCards = map
+            RunContext.brillianceCards = map.mapKeys { it.key.replace("-", "").replace("_", "") }
             println("Card data from Brilliance: ${RunContext.brillianceCards}")
         }
     }