🐛 (mapScript) 通过soft依赖无法加载mapPatches

Author: way-zer

scripts/mapScript/1002.kts

@@ -1,5 +1,4 @@
 @file:Depends("mapScript/shared/hexed")
-@file:Depends("mapScript/tags/autoExchange", "等价交换", soft = true)
 
 package mapScript
 
@@ -16,7 +15,7 @@ import kotlin.time.Duration.Companion.minutes
 
 val generator = HexedGenerator(4, 5, 144, 34)
 registerGenerator(
-    "HEXed PVP 超大区块", "WayZer", """插件控制的随机pvp图[@pvpProtect=480]""",
+    "HEXed PVP 超大区块", "WayZer", """插件控制的随机pvp图[@pvpProtect=480][@autoExchange]""",
     mode = Gamemode.pvp,
     filter = setOf("all", "display", "pvp", "hexed"),
     width = generator.width, height = generator.height

scripts/mapScript/1004.kts

@@ -1,5 +1,4 @@
 @file:Depends("mapScript/shared/hexed")
-@file:Depends("mapScript/13545", "CoreWar", soft = true)
 
 package mapScript
 
@@ -21,7 +20,7 @@ val generator = HexedGenerator(4, 5, 78)
 registerGenerator(
     "HEXed * CoreWar", "WayZer", """
         塔防掉落[@TDDrop=all]
-        招兵买马(CoreWar)模式 @13545
+        招兵买马(CoreWar)模式 [@coreWar]
         [@pvpProtect=0]
         """.trimIndent(),
     mode = Gamemode.pvp,

scripts/mapScript/lib/ScriptMapGenerator.kt

@@ -92,6 +92,8 @@ class ScriptMapGenerator(val script: Script, val width: Int, val height: Int) {
             )
         }
 
+        override fun toString(): String = "ScriptGeneratorMap"
+
         override suspend fun loadMap(info: MapInfo) {
             val generator = knownMaps[info.id]?.generator ?: return MapManager.loadMap()
             generator.load()

scripts/mapScript/tags/autoExchange.kts

@@ -30,7 +30,7 @@ val cores = content?.run {
 @Language("JSON5")
 val patch = """
 {
-    "name": "CoreWar",
+    "name": "AutoExchange",
     ${cores.joinToString("\n")}
 }
 """.trimIndent()

scripts/mapScript/13545.kts scripts/mapScript/tags/coreWar.ktsscripts/mapScript/13545.kts renamed to scripts/mapScript/tags/coreWar.kts

@@ -3,7 +3,7 @@
 
 /**@author WayZer*/
 
-package mapScript
+package mapScript.tags
 
 import arc.util.Align
 import coreLibrary.lib.util.loop
@@ -13,6 +13,7 @@ import mindustry.net.Administration
 import mindustry.world.blocks.storage.CoreBlock
 import org.intellij.lang.annotations.Language
 
+registerMapTag("@coreWar")
 modeIntroduce(
     "招兵买马 CoreWar", """
     点击核心可以打开菜单

scripts/mapScript/13545.menu.kt scripts/mapScript/tags/coreWar.menu.ktscripts/mapScript/13545.menu.kt renamed to scripts/mapScript/tags/coreWar.menu.kt

@@ -1,4 +1,4 @@
-package mapScript
+package mapScript.tags
 
 import arc.math.Mathf
 import cf.wayzer.scriptAgent.contextScript
@@ -25,7 +25,7 @@ import kotlin.reflect.KMutableProperty0
 private val confirmed = mutableSetOf<String>()
 
 class CoreWarMenu(val player: Player, val build: Building) : MenuBuilder<Unit>(followup = true) {
-    private val script = contextScript<_13545>()
+    private val script = contextScript<CoreWar>()
     private val isErekir = build.block in arrayOf(Blocks.coreAcropolis, Blocks.coreBastion, Blocks.coreCitadel)
     private val item = if (isErekir) Items.beryllium else Items.copper
     private fun Building.getResource() = items.get(item)