⚡️ (mapScript) 优化mapPatches的加载逻辑，自动解析依赖

Author: way-zer

scripts/mapScript/lib/ScriptMapGenerator.kt

@@ -58,6 +58,7 @@ class ScriptMapGenerator(val script: Script, val width: Int, val height: Int) {
             script.logger.log(Level.SEVERE, "loadGenerator出错", e)
             MapManager.loadMap()
         }
+        if (script.enabled) return// Already enabled inside WorldLoadEvent
         MindustryDispatcher.safeBlocking {
             ScriptManager.enableScript(script, true)
         }
@@ -92,6 +93,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/module.kts

@@ -59,14 +59,18 @@ fun getToLoadMapScripts(): List<ScriptInfo> {
         ScriptRegistry.getScriptInfo(scriptId) ?: null.also {
             delayBroadcast("[red]该服务器不存在对应地图脚本，请联系管理员: {id}".with("id" to scriptId))
         }
-    }
+    }.flatMap {
+        listOf(it) + ScriptRegistry.allScripts { dep ->
+            !dep.enabled && it.dependsOn(dep, includeSoft = true)
+        }
+    }.toSet().toList()
 }
 
-listen<EventType.ContentPatchLoadEvent> {
+listen<EventType.ContentPatchLoadEvent> { e ->
     val patches = getToLoadMapScripts().flatMap { it.inst?.mapPatches.orEmpty() }
     if (patches.isEmpty()) return@listen
     logger.info("Patches loaded: ${patches.size}")
-    it.patches.addAll(patches)
+    e.patches.addAll(patches)
 }
 
 listen<EventType.WorldLoadEvent> {

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/metadata/mapScript.metadata

@@ -1,56 +1,77 @@
 ID mapScript
 FQ_NAME mapScript.Module
-+DEPENDS coreMindustry 
-+DEPENDS wayzer/maps 
++DEPENDS coreMindustry
 +DEPENDS wayzer/maps 获取地图信息
 +IMPORT DefaultImport mapScript.lib.*
 +SOFT_DEPENDS wayzer/map/mapInfo 显示地图信息
 
 ID mapScript/1001
 FQ_NAME mapScript._1001
-+DEPENDS coreMindustry/utilMapRule 
-+DEPENDS coreMindustry/utilMapRule 参数平衡
 +DEPENDS mapScript module
 +DEPENDS mapScript/shared/hexed 
 
 ID mapScript/1002
 FQ_NAME mapScript._1002
 +DEPENDS mapScript module
-+DEPENDS mapScript/shared/hexed 
++DEPENDS mapScript/shared/hexed
 +SOFT_DEPENDS mapScript/tags/autoExchange 等价交换
 
 ID mapScript/1003
 FQ_NAME mapScript._1003
-+DEPENDS coreMindustry/utilMapRule 
-+DEPENDS coreMindustry/utilMapRule 参数平衡
 +DEPENDS mapScript module
-+DEPENDS mapScript/shared/hexed 
++DEPENDS mapScript/shared/hexed
+
+ID mapScript/1004
+FQ_NAME mapScript._1004
++DEPENDS mapScript module
++DEPENDS mapScript/shared/hexed
++SOFT_DEPENDS mapScript/13545 CoreWar
+
+ID mapScript/1005
+FQ_NAME mapScript._1005
++DEPENDS mapScript module
++DEPENDS mapScript/14562 填海造陆
++DEPENDS mapScript/shared/hexed
 
 ID mapScript/1009
 FQ_NAME mapScript._1009
-+DEPENDS coreMindustry/utilMapRule 
-+DEPENDS coreMindustry/utilMapRule 参数平衡
 +DEPENDS mapScript module
-+DEPENDS mapScript/shared/hexed 
++DEPENDS mapScript/shared/hexed
+
+ID mapScript/13545
+FQ_NAME mapScript._13545
++DEPENDS coreMindustry/menu 调用菜单
++DEPENDS coreMindustry/util/spawnAround
++DEPENDS mapScript module
 
 ID mapScript/shared/hexed
 FQ_NAME mapScript.shared.Hexed
 +DEPENDS mapScript module
-+DEPENDS wayzer/map/betterTeam
 +DEPENDS wayzer/map/betterTeam 队伍分配
 
 ID mapScript/shared/posMark
 FQ_NAME mapScript.shared.PosMark
 +DEPENDS mapScript module
 
+ID mapScript/tags/TDDrop
+FQ_NAME mapScript.tags.TDDrop
++DEPENDS mapScript module
+
+
 ID mapScript/tags/autoExchange
 FQ_NAME mapScript.tags.AutoExchange
-+DEPENDS coreMindustry/utilMapRule
-+DEPENDS coreMindustry/utilMapRule 修改核心容量
 +DEPENDS mapScript module
 
-ID mapScript/tags/voidProduce
-FQ_NAME mapScript.tags.VoidProduce
-+DEPENDS coreMindustry/contentsTweaker
+ID mapScript/tags/limitAir
+FQ_NAME mapScript.tags.LimitAir
++DEPENDS mapScript module
+
+ID mapScript/tags/mapRule
+FQ_NAME mapScript.tags.MapRule
++DEPENDS mapScript module
+
+ID mapScript/tags/towerDefend
+FQ_NAME mapScript.tags.TowerDefend
 +DEPENDS mapScript module
++SOFT_DEPENDS mapScript/tags/TDDrop 掉落