@almadar/std 16.154.0 → 16.155.0

package/behaviors/lolo/ui/game/molecules/std-tactics-board-2d.lolo

@@ -71,6 +71,7 @@ orbital TacticsBoard2DOrbital {
   type HudStat = {
     label : string
     value : number
+    format : string
   }
   type HudButton = {
     type : string
@@ -97,6 +98,8 @@ orbital TacticsBoard2DOrbital {
     selectedUnitId : string = ""
     validMoves : [ValidMove] = []
     attackTargets : [ValidMove] = []
+    movedIds : [string] = []
+    actedIds : [string] = []
     uiPhase : string = "observation"
     turn : number = 0
     score : number = 0
@@ -159,27 +162,28 @@ orbital TacticsBoard2DOrbital {
           type: game-shell
           backgroundAsset: @config.backgroundAsset
           hudBackgroundAsset: @config.hudBackgroundAsset
-          hud: { type: game-hud, stats: (array/concat [ { label: "Result", value: @entity.result }, { label: "Phase", value: @entity.uiPhase }, { label: "Turn", value: @entity.turn }, { label: "Score", value: @entity.score } ] @config.extraStats) }
+          hud: { type: game-hud, stats: (array/concat [ { label: "Result", value: @entity.result, format: "text" }, { label: "Phase", value: @entity.uiPhase, format: "text" }, { label: "Turn", value: @entity.turn }, { label: "Score", value: @entity.score } ] @config.extraStats) }
           addons: { type: stack, direction: vertical, gap: sm, children: (array/concat [ { type: button, action: END_TURN, label: "End Turn", variant: primary }, { type: button, action: CANCEL, label: "Cancel", variant: secondary } ] @config.extraAddons) }
           children: [ { type: canvas, fit: true, camera: { pos: { x: (/ (+ (array/min @entity.tiles "x") (array/max @entity.tiles "x")) 2), y: (/ (+ (array/min @entity.tiles "y") (array/max @entity.tiles "y")) 2) } }, projection: @config.projection, showMinimap: @config.showMinimap, tileClickEvent: TILE_CLICK, unitClickEvent: UNIT_CLICK, children: [
             { type: draw-shape-layer, items: (array/map @entity.tiles (fn t { type: draw-shape, shape: "cell", position: { x: (object/get @t x), y: (object/get @t y) }, fill: "#5c94fc", stroke: "rgba(255,255,255,0.35)", strokeWidth: 1 })) }
             { type: draw-sprite-layer, items: (array/filter (array/map @entity.tiles (fn t { type: draw-sprite, position: { x: (object/get @t x), y: (object/get @t y) }, asset: (if (object/get (object/get @t terrainSprite) url) (object/get @t terrainSprite) (object/get (object/get @config.assetManifest terrains) (object/get @t terrain))), anchor: "center", width: 1, height: 1 })) (fn s (object/get (object/get @s asset) url))) }
-            { type: draw-sprite-layer, items: (array/filter (array/map @config.features (fn f { type: draw-sprite, position: { x: (object/get @f x), y: (object/get @f y) }, asset: (object/get @f assetUrl) })) (fn s (object/get (object/get @s asset) url))) }
+            { type: draw-sprite-layer, items: (array/filter (array/map @config.features (fn f { type: draw-sprite, position: { x: (object/get @f x), y: (object/get @f y) }, asset: (object/get @f assetUrl), anchor: "ground", width: 1, height: 1 })) (fn s (object/get (object/get @s asset) url))) }
             { type: draw-shape-layer, items: (array/map @entity.validMoves (fn m { type: draw-shape, shape: "cell", position: { x: (object/get @m x), y: (object/get @m z) }, fill: "rgba(74,222,128,0.4)" })) }
             { type: draw-shape-layer, items: (array/map @entity.attackTargets (fn a { type: draw-shape, shape: "cell", position: { x: (object/get @a x), y: (object/get @a z) }, fill: "rgba(239,68,68,0.4)" })) }
             { type: draw-shape-layer, items: (array/map (array/filter @entity.units (fn u (== (object/get @u id) @entity.selectedUnitId))) (fn u { type: draw-shape, shape: "ellipse", position: (object/get @u position), radiusX: 0.5, radiusY: 0.2, stroke: "rgba(0,200,255,0.8)", strokeWidth: 3 })) }
-            { type: draw-sprite-layer, items: (array/filter (array/map @entity.units (fn u (let ((unitAsset (if (object/get (object/get @u modelUrl) url) (object/get @u modelUrl) (object/get (object/get @config.assetManifest units) (object/get @u unitType)))) (unitUrl (object/get @unitAsset url)) (unitAnim (if (<= (object/get @u health) 0) "death" (if (and (== (object/get @u id) @entity.animAttackerId) (> @entity.animAtkTicksLeft 0)) "attack" (if (== (object/get @u id) @entity.animUnitId) @entity.animState "idle"))))) { type: draw-sprite, position: (object/get @u position), asset: (if (and @unitUrl (str/includes @unitUrl ".svg")) (object/merge @unitAsset { url: (str/concat (array/nth (str/split @unitUrl ".svg") 0) (str/concat "." (str/concat @unitAnim (str/concat "-" (str/concat (if (== @unitAnim "walk") (% @entity.animCounter 2) (if (== @unitAnim "idle") (% (math/floor (/ @entity.animCounter 3)) 4) 0))) ".svg")))) }) @unitAsset), id: (object/get @u id), anchor: "ground", width: 0.5, height: 0.5 }))) (fn s (object/get (object/get @s asset) url))) }
-            { type: draw-shape-layer, items: (array/map @entity.units (fn u { type: draw-shape, shape: "rect", position: (object/get @u position), anchor: "ground", offsetX: -0.25, offsetY: -0.6, width: 0.5, height: 0.12, fill: "rgba(0,0,0,0.6)" })) }
-            { type: draw-shape-layer, items: (array/map @entity.units (fn u { type: draw-shape, shape: "rect", position: (object/get @u position), anchor: "ground", offsetX: -0.25, offsetY: -0.6, width: (* 0.5 (/ (object/get @u health) (object/get @u maxHealth))), height: 0.12, fill: "#22c55e" })) }
-            { type: draw-text-layer, items: (array/map @entity.units (fn u { type: draw-text, text: (object/get @u name), position: (object/get @u position), offsetY: -0.85, color: "#ffffff" })) }
+            { type: draw-sprite-layer, items: (array/filter (array/map @entity.units (fn u (let ((unitAsset (if (object/get (object/get @u modelUrl) url) (object/get @u modelUrl) (object/get (object/get @config.assetManifest units) (object/get @u unitType)))) (unitUrl (object/get @unitAsset url)) (unitAnim (if (<= (object/get @u health) 0) "death" (if (and (== (object/get @u id) @entity.animAttackerId) (> @entity.animAtkTicksLeft 0)) "attack" (if (== (object/get @u id) @entity.animUnitId) @entity.animState "idle"))))) { type: draw-sprite, position: (object/get @u position), asset: (if (and @unitUrl (str/includes @unitUrl ".svg")) (object/merge @unitAsset { url: (str/concat (array/nth (str/split @unitUrl ".svg") 0) (str/concat "." (str/concat @unitAnim (str/concat "-" (str/concat (if (== @unitAnim "walk") (% @entity.animCounter 2) (if (== @unitAnim "idle") (% (math/floor (/ @entity.animCounter 3)) 4) 0))) ".svg")))) }) @unitAsset), id: (object/get @u id), anchor: "ground", width: 0.5, height: 0.5, opacity: (if (> (array/len (array/filter @entity.actedIds (fn aid (== @aid (object/get @u id))))) 0) 0.45 1) }))) (fn s (object/get (object/get @s asset) url))) }
+            { type: draw-shape-layer, items: (array/map (array/filter @entity.units (fn u (> (object/get @u health) 0))) (fn u { type: draw-shape, shape: "rect", position: (object/get @u position), anchor: "ground", offsetX: -0.25, offsetY: -0.6, width: 0.5, height: 0.12, fill: "rgba(0,0,0,0.6)" })) }
+            { type: draw-shape-layer, items: (array/map (array/filter @entity.units (fn u (> (object/get @u health) 0))) (fn u { type: draw-shape, shape: "rect", position: (object/get @u position), anchor: "ground", offsetX: -0.25, offsetY: -0.6, width: (* 0.5 (/ (object/get @u health) (object/get @u maxHealth))), height: 0.12, fill: "#22c55e" })) }
+            { type: draw-text-layer, items: (array/map (array/filter @entity.units (fn u (> (object/get @u health) 0))) (fn u { type: draw-text, text: (object/get @u name), position: (object/get @u position), offsetY: -0.85, color: "#ffffff" })) }
             { type: draw-text-layer, items: (array/map @entity.fx (fn f { type: draw-text, text: (object/get @f message), position: { x: (object/get @f x), y: (object/get @f z) }, color: "#ffe066" })) }
             { type: draw-sprite-layer, items: (array/filter (array/map @entity.fx (fn f { type: draw-sprite, position: { x: (object/get @f x), y: (object/get @f z) }, asset: (object/get (object/get @config.assetManifest effects) (object/get @f type)), anchor: "center", width: 0.6, height: 0.6 })) (fn s (object/get (object/get @s asset) url))) }
             { type: draw-sprite-layer, items: (array/map (array/filter (array/flatten (array/map @entity.units (fn u (array/flatten (array/map [ ["idle", 4], ["walk", 2], ["attack", 1], ["hit", 1], ["death", 1] ] (fn st (array/map (array/range 0 (array/nth @st 1)) (fn i (if (and (object/get (object/get @u modelUrl) url) (str/includes (object/get (object/get @u modelUrl) url) ".svg")) (str/concat (array/nth (str/split (object/get (object/get @u modelUrl) url) ".svg") 0) (str/concat "." (str/concat (array/nth @st 0) (str/concat "-" (str/concat @i ".svg"))))) ""))))))))) (fn w (!= @w ""))) (fn warmUrl { type: draw-sprite, position: { x: 0, y: 0 }, asset: { url: @warmUrl }, opacity: 0, width: 0.5, height: 0.5 })) }
           ] } ]
         })
 
-      UNIT_CLICK -> playing when (and (== @entity.uiPhase "action") (and (== (object/get (array/find @entity.units (fn u (== @u.id ?unitId))) team) "enemy") (<= (grid/manhattan-distance (object/get (array/find @entity.units (fn u (== @u.id @entity.selectedUnitId))) position) (object/get (array/find @entity.units (fn u (== @u.id ?unitId))) position)) 1)))
+      UNIT_CLICK -> playing when (and (== @entity.result "none") (and (!= @entity.selectedUnitId "") (and (== (array/len (array/filter @entity.actedIds (fn aid (== @aid @entity.selectedUnitId)))) 0) (and (== (object/get (array/find @entity.units (fn u (== @u.id ?unitId))) team) "enemy") (and (> (object/get (array/find @entity.units (fn u (== @u.id ?unitId))) health) 0) (<= (grid/manhattan-distance (object/get (array/find @entity.units (fn u (== @u.id @entity.selectedUnitId))) position) (object/get (array/find @entity.units (fn u (== @u.id ?unitId))) position)) @config.attackRange))))))
         (emit ATTACK { targetId: ?unitId })
+        (set @entity.actedIds (array/append @entity.actedIds @entity.selectedUnitId))
         (set @entity.animAttackerId @entity.selectedUnitId)
         (set @entity.animAtkTicksLeft 4)
         (set @entity.selectedUnitId "")
@@ -187,23 +191,23 @@ orbital TacticsBoard2DOrbital {
         (set @entity.attackTargets [])
         (set @entity.uiPhase "observation")
 
-      UNIT_CLICK -> playing when (== @entity.selectedUnitId ?unitId)
+      UNIT_CLICK -> playing when (and (== @entity.result "none") (== @entity.selectedUnitId ?unitId))
         (set @entity.uiPhase "action")
         (set @entity.validMoves [])
-        (set @entity.attackTargets (array/map (array/filter @entity.units (fn u (and (== @u.team "enemy") (and (> @u.health 0) (<= (grid/manhattan-distance (object/get (array/find @entity.units (fn s (== @s.id @entity.selectedUnitId))) position) (object/get @u position)) 1))))) (fn u { x: (object/get (object/get @u position) x), z: (object/get (object/get @u position) y) })))
+        (set @entity.attackTargets (array/map (array/filter @entity.units (fn u (and (== @u.team "enemy") (and (> @u.health 0) (<= (grid/manhattan-distance (object/get (array/find @entity.units (fn s (== @s.id @entity.selectedUnitId))) position) (object/get @u position)) @config.attackRange))))) (fn u { x: (object/get (object/get @u position) x), z: (object/get (object/get @u position) y) })))
 
-      UNIT_CLICK -> playing when (== (object/get (array/find @entity.units (fn u (== @u.id ?unitId))) team) "player")
+      UNIT_CLICK -> playing when (and (== @entity.result "none") (and (> (object/get (array/find @entity.units (fn u (== @u.id ?unitId))) health) 0) (and (== (object/get (array/find @entity.units (fn u (== @u.id ?unitId))) team) "player") (== (array/len (array/filter @entity.actedIds (fn aid (== @aid ?unitId)))) 0))))
         (set @entity.selectedUnitId ?unitId)
         (set @entity.uiPhase "selection")
         (set @entity.attackTargets [])
-        (set @entity.validMoves (array/map (array/filter @entity.tiles (fn t (and (== (object/get @t passable) true) (and (<= (grid/manhattan-distance (object/get (array/find @entity.units (fn u (== @u.id ?unitId))) position) { x: (object/get @t x), y: (object/get @t y) }) @config.movementRange) (== (array/len (array/filter @entity.units (fn u (and (== (object/get (object/get @u position) x) (object/get @t x)) (== (object/get (object/get @u position) y) (object/get @t y)))))) 0))))) (fn t { x: (object/get @t x), z: (object/get @t y) })))
+        (set @entity.validMoves (if (> (array/len (array/filter @entity.movedIds (fn aid (== @aid ?unitId)))) 0) [] (array/map (array/filter @entity.tiles (fn t (and (== (object/get @t passable) true) (and (<= (grid/manhattan-distance (object/get (array/find @entity.units (fn u (== @u.id ?unitId))) position) { x: (object/get @t x), y: (object/get @t y) }) @config.movementRange) (== (array/len (array/filter @entity.units (fn u (and (> (object/get @u health) 0) (and (== (object/get (object/get @u position) x) (object/get @t x)) (== (object/get (object/get @u position) y) (object/get @t y))))))) 0))))) (fn t { x: (object/get @t x), z: (object/get @t y) }))))
 
-      TILE_CLICK -> playing when (and (!= @entity.selectedUnitId "") (and (grid/in-bounds { x: ?x, y: ?y } @config.gridWidth @config.gridHeight) (<= (grid/manhattan-distance (object/get (array/find @entity.units (fn u (== @u.id @entity.selectedUnitId))) position) { x: ?x, y: ?y }) @config.movementRange)))
+      TILE_CLICK -> playing when (and (== @entity.result "none") (and (!= @entity.selectedUnitId "") (and (== (array/len (array/filter @entity.movedIds (fn aid (== @aid @entity.selectedUnitId)))) 0) (and (> (object/get (array/find @entity.units (fn u (== @u.id @entity.selectedUnitId))) health) 0) (and (grid/in-bounds { x: ?x, y: ?y } @config.gridWidth @config.gridHeight) (and (<= (grid/manhattan-distance (object/get (array/find @entity.units (fn u (== @u.id @entity.selectedUnitId))) position) { x: ?x, y: ?y }) @config.movementRange) (and (== (array/len (array/filter @entity.units (fn u (and (> (object/get @u health) 0) (and (== (object/get (object/get @u position) x) ?x) (== (object/get (object/get @u position) y) ?y)))))) 0) (== (object/get (array/find @entity.tiles (fn t (and (== (object/get @t x) ?x) (== (object/get @t y) ?y)))) passable) true))))))))
         (emit MOVE { unitId: @entity.selectedUnitId, x: ?x, y: ?y })
-        (set @entity.selectedUnitId "")
+        (set @entity.movedIds (array/append @entity.movedIds @entity.selectedUnitId))
+        (set @entity.uiPhase "action")
         (set @entity.validMoves [])
-        (set @entity.attackTargets [])
-        (set @entity.uiPhase "observation")
+        (set @entity.attackTargets (array/map (array/filter @entity.units (fn u (and (== @u.team "enemy") (and (> @u.health 0) (<= (grid/manhattan-distance { x: ?x, y: ?y } (object/get @u position)) @config.attackRange))))) (fn u { x: (object/get (object/get @u position) x), z: (object/get (object/get @u position) y) })))
 
       CANCEL -> playing when (!= @entity.selectedUnitId "")
         (set @entity.selectedUnitId "")
@@ -213,6 +217,12 @@ orbital TacticsBoard2DOrbital {
 
       END_TURN -> playing when (== @entity.result "none")
         (set @entity.turn (+ @entity.turn 1))
+        (set @entity.movedIds [])
+        (set @entity.actedIds [])
+        (set @entity.selectedUnitId "")
+        (set @entity.validMoves [])
+        (set @entity.attackTargets [])
+        (set @entity.uiPhase "observation")
         (emit AI_TURN { turn: @entity.turn })
 
       MOVE -> playing
@@ -237,19 +247,19 @@ orbital TacticsBoard2DOrbital {
           type: game-shell
           backgroundAsset: @config.backgroundAsset
           hudBackgroundAsset: @config.hudBackgroundAsset
-          hud: { type: game-hud, stats: (array/concat [ { label: "Result", value: @entity.result }, { label: "Phase", value: @entity.uiPhase }, { label: "Turn", value: @entity.turn }, { label: "Score", value: @entity.score } ] @config.extraStats) }
+          hud: { type: game-hud, stats: (array/concat [ { label: "Result", value: @entity.result, format: "text" }, { label: "Phase", value: @entity.uiPhase, format: "text" }, { label: "Turn", value: @entity.turn }, { label: "Score", value: @entity.score } ] @config.extraStats) }
           addons: { type: stack, direction: vertical, gap: sm, children: (array/concat [ { type: button, action: END_TURN, label: "End Turn", variant: primary }, { type: button, action: CANCEL, label: "Cancel", variant: secondary } ] @config.extraAddons) }
           children: [ { type: canvas, fit: true, camera: { pos: { x: (/ (+ (array/min @entity.tiles "x") (array/max @entity.tiles "x")) 2), y: (/ (+ (array/min @entity.tiles "y") (array/max @entity.tiles "y")) 2) } }, projection: @config.projection, showMinimap: @config.showMinimap, tileClickEvent: TILE_CLICK, unitClickEvent: UNIT_CLICK, children: [
             { type: draw-shape-layer, items: (array/map @entity.tiles (fn t { type: draw-shape, shape: "cell", position: { x: (object/get @t x), y: (object/get @t y) }, fill: "#5c94fc", stroke: "rgba(255,255,255,0.35)", strokeWidth: 1 })) }
             { type: draw-sprite-layer, items: (array/filter (array/map @entity.tiles (fn t { type: draw-sprite, position: { x: (object/get @t x), y: (object/get @t y) }, asset: (if (object/get (object/get @t terrainSprite) url) (object/get @t terrainSprite) (object/get (object/get @config.assetManifest terrains) (object/get @t terrain))), anchor: "center", width: 1, height: 1 })) (fn s (object/get (object/get @s asset) url))) }
-            { type: draw-sprite-layer, items: (array/filter (array/map @config.features (fn f { type: draw-sprite, position: { x: (object/get @f x), y: (object/get @f y) }, asset: (object/get @f assetUrl) })) (fn s (object/get (object/get @s asset) url))) }
+            { type: draw-sprite-layer, items: (array/filter (array/map @config.features (fn f { type: draw-sprite, position: { x: (object/get @f x), y: (object/get @f y) }, asset: (object/get @f assetUrl), anchor: "ground", width: 1, height: 1 })) (fn s (object/get (object/get @s asset) url))) }
             { type: draw-shape-layer, items: (array/map @entity.validMoves (fn m { type: draw-shape, shape: "cell", position: { x: (object/get @m x), y: (object/get @m z) }, fill: "rgba(74,222,128,0.4)" })) }
             { type: draw-shape-layer, items: (array/map @entity.attackTargets (fn a { type: draw-shape, shape: "cell", position: { x: (object/get @a x), y: (object/get @a z) }, fill: "rgba(239,68,68,0.4)" })) }
             { type: draw-shape-layer, items: (array/map (array/filter @entity.units (fn u (== (object/get @u id) @entity.selectedUnitId))) (fn u { type: draw-shape, shape: "ellipse", position: (object/get @u position), radiusX: 0.5, radiusY: 0.2, stroke: "rgba(0,200,255,0.8)", strokeWidth: 3 })) }
-            { type: draw-sprite-layer, items: (array/filter (array/map @entity.units (fn u (let ((unitAsset (if (object/get (object/get @u modelUrl) url) (object/get @u modelUrl) (object/get (object/get @config.assetManifest units) (object/get @u unitType)))) (unitUrl (object/get @unitAsset url)) (unitAnim (if (<= (object/get @u health) 0) "death" (if (and (== (object/get @u id) @entity.animAttackerId) (> @entity.animAtkTicksLeft 0)) "attack" (if (== (object/get @u id) @entity.animUnitId) @entity.animState "idle"))))) { type: draw-sprite, position: (object/get @u position), asset: (if (and @unitUrl (str/includes @unitUrl ".svg")) (object/merge @unitAsset { url: (str/concat (array/nth (str/split @unitUrl ".svg") 0) (str/concat "." (str/concat @unitAnim (str/concat "-" (str/concat (if (== @unitAnim "walk") (% @entity.animCounter 2) (if (== @unitAnim "idle") (% (math/floor (/ @entity.animCounter 3)) 4) 0))) ".svg")))) }) @unitAsset), id: (object/get @u id), anchor: "ground", width: 0.5, height: 0.5 }))) (fn s (object/get (object/get @s asset) url))) }
-            { type: draw-shape-layer, items: (array/map @entity.units (fn u { type: draw-shape, shape: "rect", position: (object/get @u position), anchor: "ground", offsetX: -0.25, offsetY: -0.6, width: 0.5, height: 0.12, fill: "rgba(0,0,0,0.6)" })) }
-            { type: draw-shape-layer, items: (array/map @entity.units (fn u { type: draw-shape, shape: "rect", position: (object/get @u position), anchor: "ground", offsetX: -0.25, offsetY: -0.6, width: (* 0.5 (/ (object/get @u health) (object/get @u maxHealth))), height: 0.12, fill: "#22c55e" })) }
-            { type: draw-text-layer, items: (array/map @entity.units (fn u { type: draw-text, text: (object/get @u name), position: (object/get @u position), offsetY: -0.85, color: "#ffffff" })) }
+            { type: draw-sprite-layer, items: (array/filter (array/map @entity.units (fn u (let ((unitAsset (if (object/get (object/get @u modelUrl) url) (object/get @u modelUrl) (object/get (object/get @config.assetManifest units) (object/get @u unitType)))) (unitUrl (object/get @unitAsset url)) (unitAnim (if (<= (object/get @u health) 0) "death" (if (and (== (object/get @u id) @entity.animAttackerId) (> @entity.animAtkTicksLeft 0)) "attack" (if (== (object/get @u id) @entity.animUnitId) @entity.animState "idle"))))) { type: draw-sprite, position: (object/get @u position), asset: (if (and @unitUrl (str/includes @unitUrl ".svg")) (object/merge @unitAsset { url: (str/concat (array/nth (str/split @unitUrl ".svg") 0) (str/concat "." (str/concat @unitAnim (str/concat "-" (str/concat (if (== @unitAnim "walk") (% @entity.animCounter 2) (if (== @unitAnim "idle") (% (math/floor (/ @entity.animCounter 3)) 4) 0))) ".svg")))) }) @unitAsset), id: (object/get @u id), anchor: "ground", width: 0.5, height: 0.5, opacity: (if (> (array/len (array/filter @entity.actedIds (fn aid (== @aid (object/get @u id))))) 0) 0.45 1) }))) (fn s (object/get (object/get @s asset) url))) }
+            { type: draw-shape-layer, items: (array/map (array/filter @entity.units (fn u (> (object/get @u health) 0))) (fn u { type: draw-shape, shape: "rect", position: (object/get @u position), anchor: "ground", offsetX: -0.25, offsetY: -0.6, width: 0.5, height: 0.12, fill: "rgba(0,0,0,0.6)" })) }
+            { type: draw-shape-layer, items: (array/map (array/filter @entity.units (fn u (> (object/get @u health) 0))) (fn u { type: draw-shape, shape: "rect", position: (object/get @u position), anchor: "ground", offsetX: -0.25, offsetY: -0.6, width: (* 0.5 (/ (object/get @u health) (object/get @u maxHealth))), height: 0.12, fill: "#22c55e" })) }
+            { type: draw-text-layer, items: (array/map (array/filter @entity.units (fn u (> (object/get @u health) 0))) (fn u { type: draw-text, text: (object/get @u name), position: (object/get @u position), offsetY: -0.85, color: "#ffffff" })) }
             { type: draw-text-layer, items: (array/map @entity.fx (fn f { type: draw-text, text: (object/get @f message), position: { x: (object/get @f x), y: (object/get @f z) }, color: "#ffe066" })) }
             { type: draw-sprite-layer, items: (array/filter (array/map @entity.fx (fn f { type: draw-sprite, position: { x: (object/get @f x), y: (object/get @f z) }, asset: (object/get (object/get @config.assetManifest effects) (object/get @f type)), anchor: "center", width: 0.6, height: 0.6 })) (fn s (object/get (object/get @s asset) url))) }
           ] } ]
@@ -310,6 +320,10 @@ orbital TacticsBoard2DOrbital {
         @label "Movement Range"
         @description "Max manhattan distance a selected unit may move."
         @tier "domain"
+      attackRange : number = 1
+        @label "Attack Range"
+        @description "Max manhattan distance a selected unit may strike an enemy."
+        @tier "domain"
       features : [Feature] = []
         @label "Features"
         @description "Decorative environment features drawn on the board."

package/behaviors/lolo/ui/game/molecules/ui-canvas.lolo

@@ -13,6 +13,7 @@ orbital CanvasOrbital {
         (render-ui main {
           mode: @config.mode
           drawables: @config.drawables
+          children: @config.children
           camera: @config.camera
           projection: @config.projection
           className: @config.className
@@ -82,6 +83,10 @@ orbital CanvasOrbital {
         @label "Drawables"
         @description "Neutral drawable descriptors — the `draw-*` children. Routed to the host's painter."
         @tier "presentation"
+      children : node
+        @label "Children (drawable composition)"
+        @description "Declarative JSX drawable children — semantic atom invocations (`<SvgPrimitive/>`, `<SvgShading/>`, …) composed in paint order. The canvas is a draw-host: these children are routed to the painter as drawable descriptors, not DOM-wrapped. Use this to author a high-fidelity asset as a readable, nested JSX tree an LLM can rasterize."
+        @tier "presentation"
       camera : json = {}
         @label "Camera"
         @description "Neutral camera pose. Mapped to the underlying host's framing + zoom."

package/behaviors/lolo/ui/game/organisms/ui-battle-board.lolo

@@ -1,5 +1,5 @@
 app ui-battle-board "1.0.0"
-"RPG-tactics battle: thin organism composing the std-tactics-board-2d frame + std-score + std-xp (kills grant xp; level-ups heal the party via a HEAL intent). Isometric shape-character theme supplied via config."
+"RPG-tactics battle: thin organism composing the std-tactics-board-2d frame + std-score + std-xp (kills grant xp; level-ups heal the party via a HEAL intent). Isometric hand-authored svg theme supplied via config."
 ;; @capabilities "turn-based combat, RPG gameplay, strategy gameplay"
 
 ;; ============================================================================
@@ -7,14 +7,27 @@ app ui-battle-board "1.0.0"
 ;;
 ;; Read these before changing anything here, and walk them end to end after.
 ;; One persona: the PLAYER, commanding a four-unit party on a 16x16 isometric
-;; grid against four enemies. Status is against the CURRENT file.
+;; grid against four enemies. Status re-verified 2026-07-30 by a scripted
+;; full playthrough (32/32 checks) driving the real game on the
+;; runtime-verify catalog through window.__orbitalVerification — events in,
+;; canvas drawables + HUD DOM + bus event log out. No claim below is
+;; untested hearsay.
 ;;
-;; HOW THE GAME WORKS (the loop): select a unit -> move it (green cells) ->
-;; click it again to arm attack (red cells = adjacent enemies) -> click an
-;; adjacent enemy to strike for 3 -> End Turn -> every living enemy strikes
-;; adjacent players for 1 or steps 1 cell toward the nearest player -> repeat
-;; until one side is wiped. Kills score 10 and grant 25 xp; every 100 xp
-;; (+50 per level) levels up and heals the whole party +2.
+;; THE GENRE (what an RPG-tactics player expects): you command a small party,
+;; not an army. Positioning is the game — you read the grid, move each unit
+;; inside its reach, and commit to strikes when an enemy steps adjacent.
+;; Blows trade back and forth: every End Turn hands the board to the enemy
+;; AI, which closes the distance and punishes exposed units. Kills are the
+;; economy: each one scores, banks xp, and xp thresholds level the party up
+;; and patch their wounds. You win by wiping the enemy; you lose by being
+;; wiped. A round looks like: select a unit -> green reach cells -> move ->
+;; the unit STAYS selected and auto-arms (red cells = enemies in reach) ->
+;; strike for 3 -> the unit is SPENT (dims, cannot act again this turn) ->
+;; activate the next unit -> End Turn -> every living enemy strikes an
+;; adjacent player for 1 or steps 1 cell toward the nearest player -> repeat.
+;; Each unit may move ONCE and attack ONCE per turn (movedIds/actedIds track
+;; the activation; End Turn resets both). Kills score 10 and grant 25 xp;
+;; every 100 xp (+50 per level) levels up and heals the whole party +2.
 ;; ============================================================================
 ;;
 ;; PLAYER — "I command my party and wipe the enemy before they wipe me."
@@ -22,82 +35,115 @@ app ui-battle-board "1.0.0"
 ;;   1. I open the board and see the whole battlefield framed on screen —
 ;;      terrain under every cell, my party at the south, the enemy at the
 ;;      north, and the HUD showing Result/Phase/Turn/Score/XP/Lvl.
-;;        WORKS. PlayerIntent renders a game-shell with one canvas, fit: true
-;;        (fills the viewport, camera centered on the tile grid's midpoint),
-;;        projection "isometric". 16x16 all-grass tiles paint from the
-;;        assetManifest; HUD stats come from extraStats (XP, Lvl) appended to
-;;        the frame's Result/Phase/Turn/Score. Zoom is wheel/pinch, clamped
-;;        [0.05, 10] upstream in @almadar/ui useCamera; minimap on.
+;;        WORKS. Boot paints 256 full-cell isometric grass cubes (no gaps),
+;;        8 units (4v4), portal + gold-mine features, minimap on; HUD reads
+;;        "none / observation / 0 / 0 / 0 / 1". Verified: 39/39 assets
+;;        loaded, zero failed. (Result/Phase used to render "0" — StatBadge
+;;        defaults format "number" and parseInt-ed the strings; the frame's
+;;        HudStat now carries format: "text" for both.)
 ;;   2. Every unit on the board is a visible character sprite with a name
 ;;      label and a health bar I can read at a glance.
-;;        WORKS. draw-sprite-layer paints each unit's modelUrl anchored
-;;        "ground"; two draw-shape-layers paint the black backing + green
-;;        health fraction above it; a draw-text-layer paints the name.
-;;        Broken assets would show a magenta fallback square + a
-;;        almadar:ui:draw-sprite warn (upstream DrawSprite contract).
+;;        WORKS. Each unit paints its svg idle frame (4-frame bob, cycled by
+;;        the AnimClock tick) anchored "ground", with the black backing +
+;;        green health fraction above and the name label. All 8 bars read
+;;        full at boot. Dead units drop the bar and label (they are corpses,
+;;        not combatants) and switch to the death frame.
 ;;   3. I click one of MY units and the cells it can reach light up.
-;;        WORKS. UNIT_CLICK (team "player") sets selectedUnitId, uiPhase
-;;        "selection", and validMoves = passable, unoccupied tiles within
-;;        movementRange 2 (manhattan), painted translucent green.
-;;   4. I click a lit cell and the unit moves there.
-;;        WORKS. TILE_CLICK (in bounds, within range) emits MOVE; the
-;;        grid-tactics authority re-validates (bounds/passable/unoccupied)
-;;        and writes the new position. Selection resets to "observation".
-;;   5. I click my selected unit again and adjacent enemies I can strike
-;;        light up red.
-;;        WORKS. Second UNIT_CLICK on the same id enters uiPhase "action"
-;;        and computes attackTargets = living enemies at manhattan distance
-;;        <= 1, painted translucent red.
-;;   6. I click a red-lit enemy and it takes a hit — I see the damage
-;;      number, its health bar shrinks.
-;;        WORKS. UNIT_CLICK (enemy, action phase, adjacent) emits ATTACK;
-;;        the authority subtracts attackDamage 3 and emits BURST, which
-;;        fx-particles spawns as a floating "-3" at the target (ttl 3,
-;;        decayed by FxDecay). The health-bar layer re-derives from
-;;        health/maxHealth on the shared frame.
+;;        WORKS. Clicking p1 sets phase "selection" and lights exactly 9
+;;        green cells — the range-2 manhattan diamond minus occupied cells.
+;;        Dead units are NOT selectable (guard on health > 0): clicking a
+;;        corpse does nothing. SPENT units (already attacked this turn, in
+;;        actedIds) are not selectable either — their activation is over.
+;;        A unit that already MOVED this turn still selects (it may attack)
+;;        but lights zero green cells — one move per turn.
+;;   4. I click a lit cell and the unit moves there — and stays selected,
+;;      auto-armed, so I can strike immediately.
+;;        WORKS. p1 walked (3,12)->(3,10): the walk animation plays (2-frame
+;;        cycle, ~6 ticks), the authority re-validates bounds/passable/
+;;        occupied and writes the position, and the unit lands in phase
+;;        "action" with any enemies now in reach lit red. Clicking an
+;;        OCCUPIED or out-of-reach cell is ignored outright (guard) instead
+;;        of silently eating the selection. The move is SPENT: the unit
+;;        cannot move again until End Turn (movedIds guard) — there is no
+;;        way to chain moves.
+;;   5. Adjacent enemies I can strike light up red — right after my move,
+;;      or when I click my selected unit again.
+;;        WORKS. Post-move auto-arm computes red cells from the NEW position;
+;;        the manual re-click arm (phase "action") still works from a fresh
+;;        selection. Living enemies at manhattan distance <= attackRange
+;;        (config, default 1) light red.
+;;   6. I click a red-lit enemy — or any enemy in reach, even without arming
+;;      first — and it takes a hit; my unit is then spent for the turn.
+;;        WORKS. The attack arm fires whenever a living selected unit has a
+;;        living enemy in reach, regardless of phase (selection or action) —
+;;        no more dead clicks on an enemy you just walked up to. The
+;;        attacker plays its attack frame, the target plays its hit frame, a
+;;        "-3" damage number + hit-star fx sprite spawn at the target
+;;        (BURST, ttl 3 decayed by FxDecay), the health bar shrinks
+;;        (verified e3 1.00 -> 0.63 of max), and the attacker joins actedIds:
+;;        it dims to 45% opacity and cannot be selected or attack again
+;;        until End Turn.
 ;;   7. I change my mind mid-selection and back out cleanly.
-;;        WORKS. The HUD's Cancel button emits CANCEL, clearing selection,
-;;        highlights, and phase (guarded on a selection existing).
+;;        WORKS. CANCEL clears selection, highlights, and phase — verified
+;;        green cells 9 -> 0 and phase back to "observation".
 ;;   8. I end my turn and the enemy takes theirs — they close in and fight
-;;      back.
-;;        WORKS. END_TURN (guarded on result "none") bumps turn and emits
-;;        AI_TURN; the authority damages every player adjacent to a living
-;;        enemy for 1, then steps each unengaged enemy 1 cell toward the
-;;        nearest living player (clamped in-bounds, passable, unoccupied).
-;;   9. When I kill an enemy I am rewarded — score ticks up, xp ticks up.
-;;        WORKS. Every authority mutation emits UNITS_CHANGED with live
-;;        survivor counts; ScoreKeeper awards (baseline - enemiesAlive) x 10,
-;;        XpKeeper the same x 25. Both are headless atoms on the shared frame.
+;;      back, and my party is fresh again.
+;;        WORKS. END_TURN bumps Turn, clears selection + both activation
+;;        lists (movedIds/actedIds — every unit can act again), and emits
+;;        AI_TURN; the authority strikes every player adjacent to a living
+;;        enemy for 1 and steps each unengaged enemy 1 cell toward the
+;;        nearest living player. Verified: enemy positions changed and/or
+;;        player hp dropped every turn.
+;;        LIMITATION: enemies POP to their new cell — the authority applies
+;;        the step silently and the single walk-anim slot is player-facing;
+;;        per-enemy MOVE fan-out is atom surgery, deferred.
+;;   9. When I kill an enemy I am rewarded — score ticks up, xp ticks up,
+;;      and the corpse stays on the field.
+;;        WORKS x4. Each kill: Score +10, XP +25 (ScoreKeeper/XpKeeper on
+;;        UNITS_CHANGED), the corpse renders its death frame, and the cell
+;;        becomes walkable again — corpses never block movement or green
+;;        highlights (authority and highlight filters agree on health > 0;
+;;        verified with four corpses piled on two cells).
 ;;  10. When my xp crosses the threshold the party levels up and heals.
-;;        WORKS. XpKeeper at xp >= xpToNext (100, +50/level) bumps level,
-;;        raises the threshold, and emits HEAL { team: "player", amount: 2 },
-;;        which the authority applies (capped at maxHealth).
-;;  11. When the last enemy falls, I win and the game tells me.
-;;        WORKS. RoundLogic derives result from UNITS_CHANGED: enemiesAlive 0
-;;        -> "victory" (playersAlive 0 -> "defeat") and emits GAME_END; the
-;;        HUD's Result stat shows it and END_TURN is guarded shut.
+;;        WORKS. The 4th kill crossed 100 xp: Lvl 1 -> 2 on the HUD and a
+;;        HEAL { team: "player", amount: 2 } fired on the bus, which the
+;;        authority applies capped at maxHealth.
+;;  11. When the last enemy falls, I win and the game tells me — then the
+;;      board freezes.
+;;        WORKS. Result flips to "victory" (RoundLogic on UNITS_CHANGED),
+;;        GAME_END fires, and the board is FROZEN: every UNIT_CLICK /
+;;        TILE_CLICK arm is guarded on result == "none", so post-game clicks
+;;        select nothing and move nothing (verified by probe). Reload to
+;;        play again — an in-game rematch button does not exist yet.
 ;;
-;; ASSET INVENTORY (all Kenney, served from almadar-kflow-assets.web.app)
+;; MULTIPLAYER NOTE: GameState is [runtime, shared], so every connected
+;; client watches the same battle on the same frame; intents serialize
+;; through the server authority. There is no per-seat turn ownership yet —
+;; any client can drive any player unit.
 ;;
-;;   Terrain   kenney-isometric-tiles-base/terrain/landscapeTiles_sheet
-;;             grass = landscapeTiles_000.png (all 256 cells), stone =
-;;             landscapeTiles_001.png (manifest-only, no stone tiles seeded).
-;;   Units     ui-battle-board/kenney-shape-characters/units/spritesheet_default
-;;             (board-local copy; the _shared sheet was a corrupt 49x49 file
-;;             whose atlas expects 577x577 — repaired there too)
-;;             party:  p1 Guardian  blue_body_square.png   10hp (3,12)
-;;                     p2 Scrapper  red_body_rhombus.png    8hp (2,11)
-;;                     p3 Worker    yellow_body_squircle.png 6hp (4,13)
-;;                     p4 Mender    green_body_circle.png   7hp (2,13)
+;; ASSET INVENTORY (hand-authored svg, almadar-kflow-assets.web.app
+;; /shared/ui-battle-board/svg/isometric/, generated by tools/asset-workflow
+;; svg-generator from the sibling .md descriptions)
+;;
+;;   Terrain   terrain/grass.svg, terrain/stone.svg — full-cell isometric
+;;             cubes (top + left + right faces) that tessellate exactly with
+;;             the projector's cellPath; drawn at width/height 1.
+;;   Units     units/{guardian,scrapper,worker,mender}.svg + animation frames
+;;             .{idle-0..3, walk-0..1, attack-0, hit-0, death-0}.svg; the
+;;             frame swaps url-rewrites name.svg -> name.<anim>-<i>.svg and a
+;;             hidden warm-up layer preloads every frame so swaps never pop.
+;;             party:  p1 Guardian 10hp (3,12)   p2 Scrapper 8hp (2,11)
+;;                     p3 Worker    6hp (4,13)   p4 Mender   7hp (2,13)
 ;;             enemy:  e1/e2 Guardian 10hp (12,3),(13,4)
 ;;                     e3/e4 Scrapper  8hp (11,2),(13,2)
-;;   Features  ui-battle-board/kenney-cartography-pack/ui/spritesheet_default
-;;             gold_mine = mine.png at (13,1), portal = gate.png at (1,14)
-;;             (decorative; drawn from config.features).
-;;   Effects   _shared/kenney-explosion-pack/effects/spritesheet_pixelExplosion
-;;             explosion = pixelExplosion07.png (manifest effects entry).
-;;   UI chrome _shared/kenney-ui-adventure-pack/ui/uipack_rpg_sheet
-;;             panel_beige.png = game-shell background + HUD panel.
+;;   Features  features/gold_mine.svg at (13,1), features/portal.svg at
+;;             (1,14) — the two home bases, drawn from config.features
+;;             anchored "ground" at 1x1 so they sit ON their cell (the
+;;             draw-sprite default anchor is "top-left", which floated them
+;;             off the board corner before the anchor was explicit).
+;;   Effects   effects/hit.svg (BURST "hit" fx), effects/explosion.svg
+;;             (manifest-only).
+;;   UI chrome ui/panel-frame.svg = game-shell background + HUD panel.
 ;; ============================================================================
 
 orbital BattleBoardOrbital {
@@ -176,6 +222,8 @@ orbital BattleBoardOrbital {
     selectedUnitId : string = ""
     validMoves : [ValidMove] = []
     attackTargets : [ValidMove] = []
+    movedIds : [string] = []
+    actedIds : [string] = []
     uiPhase : string = "observation"
     turn : number = 0
     score : number = 0