✨(mapScript) 适配K2和新版本SA

Author: way-zer

scripts/bootStrap/generate.kts

@@ -37,7 +37,7 @@ suspend fun main() {
         else
             Config.args.forEach { compileOnly(it) }
     }.run {
-        val fail = conditions.values.filter { it.status == ConditionState.Status.Success }
+        val fail = conditions.values.filter { it.status != ConditionState.Status.Success }
         println("共加载${conditions.size}个脚本，失败${fail.size}个")
         printResult()
         if (System.getProperty("ScriptAgent.PreparePack") != null) {

scripts/mapScript/1005.kts

@@ -21,11 +21,11 @@ registerGenerator(
     "HEXed*[yellow]沙滩海战", "WayZer", """
         你落到了一个满是水的星球，
         不过我们有传统异能-[sky]填海造陆[]
-        
+
         另外我们有先进的技术，能够从空气中获取能量-[sky]无限火力[]
         并且只需要一点点引子就能量转换为物质-[sky](几乎)免费建筑[]
         但是纯能量速度毕竟有点慢
-        
+
         [@pvpProtect=0]
         平衡调整：削弱t4海辅治疗能力, 大治疗治疗量等于小治疗(范围更大)
         中泵30玻璃10合金，大泵30氧化物
@@ -73,8 +73,6 @@ registerGenerator(
     genRound("initHexData") { HexData.init(generator.chunkCenters, coreSchema) }
 }
 
-val base = contextScript<_14562>()
-
 @Language("JSON5")
 val patch = """{
     "name": "1005",
@@ -100,7 +98,7 @@ onEnable {
     //            """block.${it.name}.consumers:{clearItems:1,clearLiquids:1},"""
     //        }}
     HexData.extraLoadout.add {
-        coreTile.getLinkedTiles { base.myTiles[it.array()].discover() }
+        coreTile.getLinkedTiles { IslandTile.tiles[it.array()].discover() }
     }
     loop(Dispatchers.game) {
         delay(1000)

scripts/mapScript/13545.kts

@@ -6,7 +6,6 @@
 package mapScript
 
 import arc.util.Align
-import coreLibrary.lib.util.loop
 import mindustry.game.Team
 import mindustry.gen.Iconc
 import mindustry.net.Administration
@@ -34,20 +33,12 @@ val patch = """
 """.trimIndent()
 mapPatches = listOf(patch)
 
-data class TeamData(val team: Team) {
-    var blockDamageMultiplier by team.rules()::blockDamageMultiplier
-    var blockHealthMultiplier by team.rules()::blockHealthMultiplier
-    var unitDamageMultiplier by team.rules()::unitDamageMultiplier
-    var unitHealthMultiplier by team.rules()::unitHealthMultiplier
-}
-
-val teamData = mutableMapOf<Team, TeamData>()
-val Team.myData get() = teamData.getOrPut(this) { TeamData(this) }
-onDisable { teamData.clear() }
+val Team.myData get() = CoreWarTeamData.get(this)
+onDisable { CoreWarTeamData.map.clear() }
 
 registerActionFilter {
-    if(it.type == Administration.ActionType.control || it.type==Administration.ActionType.command){
-        if(it.unit.type == UnitTypes.mono)
+    if (it.type == Administration.ActionType.control || it.type == Administration.ActionType.command) {
+        if (it.unit.type == UnitTypes.mono)
             return@registerActionFilter false
     }
     true

scripts/mapScript/13545.menu.kt

@@ -1,7 +1,6 @@
 package mapScript
 
 import arc.math.Mathf
-import cf.wayzer.scriptAgent.contextScript
 import coreLibrary.lib.with
 import coreMindustry.MenuBuilder
 import coreMindustry.lib.MsgType
@@ -24,13 +23,24 @@ import kotlin.reflect.KMutableProperty0
 
 private val confirmed = mutableSetOf<String>()
 
+data class CoreWarTeamData(val team: Team) {
+    var blockDamageMultiplier by team.rules()::blockDamageMultiplier
+    var blockHealthMultiplier by team.rules()::blockHealthMultiplier
+    var unitDamageMultiplier by team.rules()::unitDamageMultiplier
+    var unitHealthMultiplier by team.rules()::unitHealthMultiplier
+
+    companion object {
+        val map = mutableMapOf<Team, CoreWarTeamData>()
+        fun get(team: Team) = map.getOrPut(team) { CoreWarTeamData(team) }
+    }
+}
+
 class CoreWarMenu(val player: Player, val build: Building) : MenuBuilder<Unit>(followup = true) {
-    private val script = contextScript<_13545>()
     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)
     private fun Building.removeResource(v: Int) = items.remove(item, v)
-    private val Team.myData get() = with(script) { myData }
+    private val Team.myData: CoreWarTeamData get() = CoreWarTeamData.get(this)
 
     @MenuBuilderDsl
     suspend fun costOption(title: String, cost: () -> Int, body: () -> Boolean) = lazyOption {

scripts/mapScript/14562.api.kt

@@ -0,0 +1,60 @@
+package mapScript
+
+import mindustry.content.Blocks
+import mindustry.world.Block
+import mindustry.world.Tile
+import mindustry.world.blocks.environment.Floor
+
+class IslandTile(val tile: Tile) {
+    companion object {
+        var waterFloor: Floor = Blocks.deepwater.asFloor()!!
+        val discoverQueue = mutableListOf<IslandTile>()
+        var tiles = emptyList<IslandTile>()
+    }
+
+    val floor: Floor = tile.floor()
+    val overlay: Block = tile.overlay()
+    var discovered = false
+
+    init {
+        if (overlay != Blocks.spawn && tile.block() == Blocks.air) {
+            tile.setBlock(Blocks.stone)//remove ore
+            tile.setFloor(waterFloor)
+            tile.setAir()
+        } else
+            discovered = true
+    }
+
+    //use in init stage, no net sync
+    fun discoverInit() {
+        if (discovered) return
+        discovered = true
+        tile.setBlock(Blocks.stone)//remove ore
+        tile.setFloor(floor)
+        tile.setOverlay(overlay)
+        tile.setAir()
+    }
+
+    fun discover(): Boolean {
+        if (discovered) return false
+        discovered = true
+        tile.setFloorNet(floor, overlay)
+        if (tile.block() == Blocks.air)
+            tile.setAir()
+        if (floor.isDeep)//auto discover
+            repeat(4) {
+                val tile = tile.nearby(it) ?: return@repeat
+                discoverQueue.add(tiles[tile.array()])
+            }
+        return true
+    }
+
+    fun unDiscover(): Boolean {
+        if (!discovered) return false
+        discovered = false
+        tile.setBlock(Blocks.stone)//remove ore
+        tile.setFloorNet(waterFloor, Blocks.air)
+        tile.setAir()
+        return true
+    }
+}

scripts/mapScript/14562.kts

@@ -3,8 +3,6 @@ package mapScript
 import mindustry.ctype.ContentType
 import mindustry.game.EventType.Trigger
 import mindustry.gen.Iconc
-import mindustry.world.Block
-import mindustry.world.Tile
 import mindustry.world.blocks.environment.Floor
 
 name = "填海造陆"
@@ -17,60 +15,6 @@ modeIntroduce(
 """.trimIndent()
 )
 
-var myTiles = emptyList<IslandTile>()
-val waterFloor by autoInit {
-    state.rules.tags.get("@waterFloor")
-        ?.let { content.getByName(ContentType.block, it) as? Floor }
-        ?: Blocks.deepwater.asFloor()!!
-}
-
-inner class IslandTile(val tile: Tile) {
-    val floor: Floor = tile.floor()
-    val overlay: Block = tile.overlay()
-    var discovered = false
-
-    init {
-        if (overlay != Blocks.spawn && tile.block() == Blocks.air) {
-            tile.setBlock(Blocks.stone)//remove ore
-            tile.setFloor(waterFloor)
-            tile.setAir()
-        } else
-            discovered = true
-    }
-
-    //use in init stage, no net sync
-    fun discoverInit() {
-        if (discovered) return
-        discovered = true
-        tile.setBlock(Blocks.stone)//remove ore
-        tile.setFloor(floor)
-        tile.setOverlay(overlay)
-        tile.setAir()
-    }
-
-    fun discover(): Boolean {
-        if (discovered) return false
-        discovered = true
-        tile.setFloorNet(floor, overlay)
-        if (tile.block() == Blocks.air)
-            tile.setAir()
-        if (floor.isDeep)//auto discover
-            repeat(4) {
-                val tile = tile.nearby(it) ?: return@repeat
-                discoverQueue.add(myTiles[tile.array()])
-            }
-        return true
-    }
-
-    fun unDiscover(): Boolean {
-        if (!discovered) return false
-        discovered = false
-        tile.setBlock(Blocks.stone)//remove ore
-        tile.setFloorNet(waterFloor, Blocks.air)
-        tile.setAir()
-        return true
-    }
-}
 
 val blocksToOpen = mapOf(
     Blocks.mechanicalPump to 1,
@@ -79,18 +23,21 @@ val blocksToOpen = mapOf(
 )
 
 onEnable {
-    myTiles = world.tiles.map(::IslandTile)
+    IslandTile.waterFloor = state.rules.tags.get("@waterFloor")
+        ?.let { content.getByName(ContentType.block, it) as? Floor }
+        ?: Blocks.deepwater.asFloor()!!
+    IslandTile.tiles = world.tiles.map(::IslandTile)
     Groups.build.filter { it.block in blocksToOpen }.forEach {
         it.tile.setAir()
         it.tile.circle(blocksToOpen[it.block]!!) { x, y ->
-            myTiles[world.packArray(x, y)].discoverInit()
+            IslandTile.tiles[world.packArray(x, y)].discoverInit()
         }
     }
 }
 
 onDisable {
-    discoverQueue.clear()
-    myTiles = emptyList()
+    IslandTile.discoverQueue.clear()
+    IslandTile.tiles = emptyList()
 }
 
 listen<EventType.BlockBuildEndEvent> {
@@ -99,31 +46,30 @@ listen<EventType.BlockBuildEndEvent> {
     when (val block = tile.block()) {
         in blocksToOpen -> {
             var any = false
-            tile.getLinkedTiles { if (myTiles[it.array()].discover()) any = true }
+            tile.getLinkedTiles { if (IslandTile.tiles[it.array()].discover()) any = true }
             if (any) {
                 launch(Dispatchers.game) {
                     delay(100)
                     Call.deconstructFinish(tile, block, null)
                 }
                 tile.circle(blocksToOpen[block]!!) { x, y ->
-                    discoverQueue.add(myTiles[world.packArray(x, y)])
+                    IslandTile.discoverQueue.add(IslandTile.tiles[world.packArray(x, y)])
                 }
             }
         }
 
         Blocks.shockMine ->
-            if (myTiles[tile.array()].unDiscover())
+            if (IslandTile.tiles[tile.array()].unDiscover())
                 launch(Dispatchers.game) {
                     delay(100)
                     Call.deconstructFinish(tile, block, null)
                 }
     }
 }
 
-val discoverQueue = mutableListOf<IslandTile>()
 listen(Trigger.update) {
     repeat(5) {
-        val tile = discoverQueue.removeFirstOrNull() ?: return@listen
+        val tile = IslandTile.discoverQueue.removeFirstOrNull() ?: return@listen
         tile.discover()
     }
 }

scripts/mapScript/lib/ContentExt.kt

@@ -14,8 +14,5 @@ fun Script.modeIntroduce(mode: String, introduce: String) {
     }
 }
 
-@ScriptDsl
-var Script.mapScriptController by DSLBuilder.dataKey<Boolean>()
-
 @ScriptDsl
 var Script.mapPatches by DSLBuilder.dataKey<List<String>>()

scripts/mapScript/lib/ScriptMapGenerator.kt

@@ -60,7 +60,7 @@ class ScriptMapGenerator(val script: Script, val width: Int, val height: Int) {
         }
         if (script.enabled) return// Already enabled inside WorldLoadEvent
         MindustryDispatcher.safeBlocking {
-            ScriptManager.enableScript(script, true)
+            ScriptManager.enableScript(script)
         }
         if (!thisContextScript().checkEnabled(script.scriptInfo)) {
             MapManager.loadMap()

scripts/mapScript/module.kts

@@ -14,39 +14,13 @@ import wayzer.MapRegistry
 
 val children get() = ScriptRegistry.allScripts { it != scriptInfo && it.dependsOn(scriptInfo) }
 
-onEnable {
-    //Disable all non-controller scripts
-    children.forEach {
-        if (it.scriptState == ScriptState.ToEnable && it.inst?.mapScriptController != true) {
-            it.stateUpdateForce(ScriptState.Loaded)
-        }
-    }
-}
-
-listen<EventType.ResetEvent> {
-    MindustryDispatcher.safeBlocking {
-        ScriptManager.transaction {
-            addAll(children)
-            disable()
-            getForState(ScriptState.ToEnable).forEach {
-                it.stateUpdateForce(ScriptState.Loaded)
-            }
-        }
-    }
-}
-
-listen<EventType.ResetEvent> {
-    //try update child scripts
-    ScriptRegistry.scanRoot()
+listen<EventType.ResetEvent> { _ ->
     MindustryDispatcher.safeBlocking {
-        ScriptManager.transaction {
-            addAll(children)
-            removeIf { it.compiledScript?.source.run { this == null || this == it.source } }
-            if (isEmpty()) return@transaction
-
-            logger.info("Unload outdated script: ${toList()}")
-            unload()//unload all updatable
-        }
+        ScriptManager.transactionV2 {
+            disable(children.filter { it.enabled })
+            execute().printResult()
+            load(keys.toList())
+        }.printResult()
     }
 }
 
@@ -78,9 +52,8 @@ listen<EventType.WorldLoadEvent> {
     val toLoad = getToLoadMapScripts()
     if (toLoad.isEmpty()) return@listen
     MindustryDispatcher.safeBlocking {
-        ScriptManager.transaction {
-            addAll(toLoad)
-            load(); enable()
+        ScriptManager.transactionV2 {
+            enable(toLoad)
         }
     }
     toLoad.forEach { checkEnabled(it) }

scripts/mapScript/shared/hexed.kts

@@ -4,6 +4,7 @@ package mapScript.shared
 
 import mindustry.world.blocks.storage.CoreBlock.CoreBuild
 import mindustry.world.modules.ItemModule
+import wayzer.map.AssignTeamEvent
 import kotlin.time.Duration.Companion.minutes
 
 listen<EventType.BlockDestroyEvent> {
@@ -20,7 +21,7 @@ listen<EventType.BlockBuildEndEvent> {
     }
 }
 
-listenTo<wayzer.map.BetterTeam.AssignTeamEvent> {
+listenTo<AssignTeamEvent> {
     team = HexData.assignTeam(player, group)
 }