@almadar/std 16.108.0 → 16.109.0

package/behaviors/registry/ui/game/2d/organisms/ui-battle-board.orb

@@ -7479,36 +7479,6 @@
             }
           },
           "emits": [
-            {
-              "description": "-- Callbacks --",
-              "event": "ATTACK",
-              "payloadSchema": [
-                {
-                  "name": "attacker",
-                  "type": "object"
-                },
-                {
-                  "name": "target",
-                  "type": "object"
-                },
-                {
-                  "name": "damage",
-                  "type": "number"
-                },
-                {
-                  "name": "attackerId",
-                  "required": true,
-                  "type": "string"
-                },
-                {
-                  "name": "targetId",
-                  "required": true,
-                  "type": "string"
-                }
-              ],
-              "scope": "external",
-              "tier": "domain"
-            },
             {
               "description": "Called when battle ends",
               "event": "GAME_END",
@@ -7682,36 +7652,6 @@
                 ],
                 "tier": "domain"
               },
-              {
-                "description": "-- Callbacks --",
-                "key": "ATTACK",
-                "name": "Attack",
-                "payloadSchema": [
-                  {
-                    "name": "attacker",
-                    "type": "object"
-                  },
-                  {
-                    "name": "target",
-                    "type": "object"
-                  },
-                  {
-                    "name": "damage",
-                    "type": "number"
-                  },
-                  {
-                    "name": "attackerId",
-                    "required": true,
-                    "type": "string"
-                  },
-                  {
-                    "name": "targetId",
-                    "required": true,
-                    "type": "string"
-                  }
-                ],
-                "tier": "domain"
-              },
               {
                 "description": "Emits UI:{endTurnEvent} with {} on end turn",
                 "key": "END_TURN",
@@ -9185,7 +9125,7 @@
                           [
                             "==",
                             "@u.id",
-                            "@payload.targetId"
+                            "@payload.unitId"
                           ],
                           [
                             "object/merge",
@@ -9205,7 +9145,7 @@
                                         "@u",
                                         "health"
                                       ],
-                                      "@payload.damage"
+                                      3.0
                                     ]
                                   ],
                                   0.0
@@ -9223,7 +9163,7 @@
                                     "@u",
                                     "health"
                                   ],
-                                  "@payload.damage"
+                                  3.0
                                 ]
                               ]
                             }
@@ -9233,7 +9173,7 @@
                             [
                               "==",
                               "@u.id",
-                              "@payload.attackerId"
+                              "@entity.selectedUnitId"
                             ],
                             [
                               "object/merge",
@@ -9270,7 +9210,7 @@
                                 [
                                   "==",
                                   "@u.id",
-                                  "@payload.targetId"
+                                  "@payload.unitId"
                                 ]
                               ]
                             ],
@@ -9291,7 +9231,7 @@
                                 [
                                   "==",
                                   "@u.id",
-                                  "@payload.targetId"
+                                  "@payload.unitId"
                                 ]
                               ]
                             ],
@@ -9317,7 +9257,7 @@
                             [
                               "==",
                               "@u.id",
-                              "@payload.targetId"
+                              "@payload.unitId"
                             ]
                           ]
                         ],
@@ -9347,7 +9287,7 @@
                                   [
                                     "==",
                                     "@u.id",
-                                    "@payload.targetId"
+                                    "@payload.unitId"
                                   ]
                                 ]
                               ],
@@ -9368,7 +9308,7 @@
                                   [
                                     "==",
                                     "@u.id",
-                                    "@payload.targetId"
+                                    "@payload.unitId"
                                   ]
                                 ]
                               ],
@@ -9391,11 +9331,95 @@
                     "@entity.validMoves",
                     []
                   ],
+                  [
+                    "set",
+                    "@entity.xp",
+                    [
+                      "+",
+                      "@entity.xp",
+                      25.0
+                    ]
+                  ],
+                  [
+                    "if",
+                    [
+                      ">=",
+                      "@entity.xp",
+                      "@entity.xpToNext"
+                    ],
+                    [
+                      "set",
+                      "@entity.units",
+                      [
+                        "array/map",
+                        "@entity.units",
+                        [
+                          "fn",
+                          "u",
+                          [
+                            "if",
+                            [
+                              "==",
+                              "@u.team",
+                              "player"
+                            ],
+                            [
+                              "object/merge",
+                              "@u",
+                              {
+                                "health": [
+                                  "math/min",
+                                  [
+                                    "object/get",
+                                    "@u",
+                                    "maxHealth"
+                                  ],
+                                  [
+                                    "+",
+                                    [
+                                      "object/get",
+                                      "@u",
+                                      "health"
+                                    ],
+                                    2.0
+                                  ]
+                                ]
+                              }
+                            ],
+                            "@u"
+                          ]
+                        ]
+                      ]
+                    ],
+                    null
+                  ],
+                  [
+                    "if",
+                    [
+                      ">=",
+                      "@entity.xp",
+                      "@entity.xpToNext"
+                    ],
+                    [
+                      "set",
+                      "@entity.xpToNext",
+                      [
+                        "+",
+                        "@entity.xpToNext",
+                        50.0
+                      ]
+                    ],
+                    null
+                  ],
                   [
                     "set",
                     "@entity.phase",
                     "observation"
                   ],
+                  [
+                    "emit",
+                    "GAME_END"
+                  ],
                   [
                     "render-ui",
                     "main",
@@ -9564,13 +9588,19 @@
                     }
                   ]
                 ],
-                "event": "ATTACK",
+                "event": "UNIT_CLICK",
                 "from": "playing",
                 "guard": [
-                  "let",
+                  "and",
+                  [
+                    "!=",
+                    "@entity.selectedUnitId",
+                    ""
+                  ],
                   [
+                    "and",
                     [
-                      "ap",
+                      "==",
                       [
                         "object/get",
                         [
@@ -9582,82 +9612,100 @@
                             [
                               "==",
                               "@u.id",
-                              "@payload.attackerId"
+                              "@payload.unitId"
                             ]
                           ]
                         ],
-                        "position"
-                      ]
+                        "team"
+                      ],
+                      "enemy"
                     ],
                     [
-                      "tp",
+                      "let",
                       [
-                        "object/get",
                         [
-                          "array/find",
-                          "@entity.units",
+                          "ap",
                           [
-                            "fn",
-                            "u",
+                            "object/get",
                             [
-                              "==",
-                              "@u.id",
-                              "@payload.targetId"
-                            ]
+                              "array/find",
+                              "@entity.units",
+                              [
+                                "fn",
+                                "u",
+                                [
+                                  "==",
+                                  "@u.id",
+                                  "@entity.selectedUnitId"
+                                ]
+                              ]
+                            ],
+                            "position"
                           ]
                         ],
-                        "position"
-                      ]
-                    ]
-                  ],
-                  [
-                    "and",
-                    [
-                      "<=",
-                      [
-                        "math/abs",
                         [
-                          "-",
+                          "tp",
                           [
                             "object/get",
-                            "@ap",
-                            "x"
-                          ],
-                          [
-                            "object/get",
-                            "@tp",
-                            "x"
+                            [
+                              "array/find",
+                              "@entity.units",
+                              [
+                                "fn",
+                                "u",
+                                [
+                                  "==",
+                                  "@u.id",
+                                  "@payload.unitId"
+                                ]
+                              ]
+                            ],
+                            "position"
                           ]
                         ]
                       ],
-                      1.0
-                    ],
-                    [
-                      "and",
                       [
-                        "<=",
+                        "and",
                         [
-                          "math/abs",
+                          "<=",
                           [
-                            "-",
+                            "math/abs",
                             [
-                              "object/get",
-                              "@ap",
-                              "y"
-                            ],
-                            [
-                              "object/get",
-                              "@tp",
-                              "y"
+                              "-",
+                              [
+                                "object/get",
+                                "@ap",
+                                "x"
+                              ],
+                              [
+                                "object/get",
+                                "@tp",
+                                "x"
+                              ]
                             ]
-                          ]
+                          ],
+                          1.0
                         ],
-                        1.0
-                      ],
-                      [
-                        "!=",
-                        "@ap",
-                        "@tp"
+                        [
+                          "<=",
+                          [
+                            "math/abs",
+                            [
+                              "-",
+                              [
+                                "object/get",
+                                "@ap",
+                                "y"
+                              ],
+                              [
+                                "object/get",
+                                "@tp",
+                                "y"
+                              ]
+                            ]
+                          ],
+                          1.0
+                        ]
                       ]
                     ]
                   ]
@@ -10278,6 +10326,28 @@
                         "url": "https://almadar-kflow-assets.web.app/shared/_shared/kenney-ui-adventure-pack/ui/uipack_rpg_sheet.png",
                         "variant": ""
                       },
+                      "overlay": {
+                        "options": [
+                          {
+                            "event": "PLAY_AGAIN",
+                            "id": "again",
+                            "label": "Play Again",
+                            "variant": "primary"
+                          }
+                        ],
+                        "subtitle": "Battle complete",
+                        "title": [
+                          "if",
+                          [
+                            "==",
+                            "@entity.result",
+                            "victory"
+                          ],
+                          "VICTORY",
+                          "DEFEAT"
+                        ],
+                        "type": "game-menu"
+                      },
                       "type": "game-shell"
                     }
                   ]
@@ -10740,6 +10810,11 @@
                   }
                 ]
               ],
+              "guard": [
+                "==",
+                "@entity.result",
+                "none"
+              ],
               "interval": 100.0,
               "name": "renderTick"
             },
@@ -11234,6 +11309,19 @@
                     "observation"
                   ]
                 ],
+                [
+                  "if",
+                  [
+                    "!=",
+                    "@entity.result",
+                    "none"
+                  ],
+                  [
+                    "emit",
+                    "GAME_END"
+                  ],
+                  null
+                ],
                 [
                   "render-ui",
                   "main",