@almadar/std 6.5.2 → 7.2.0

package/behaviors/registry/organisms/std-strategy-game.orb

@@ -1,7 +1,7 @@
 {
   "name": "std-strategy-game",
   "version": "1.0.0",
-  "description": "Strategy game organism. Composes: stdTurnBasedBattle(ArmyBattle) + stdOverworld(Territory) + stdDisplay(Resource)",
+  "description": "std-strategy-game as a Function",
   "orbitals": [
     {
       "name": "ArmyBattleOrbital",
@@ -17,56 +17,71 @@
           {
             "name": "turn",
             "type": "number",
-            "default": 0
+            "default": 0.0
           },
           {
             "name": "score",
             "type": "number",
-            "default": 0
+            "default": 0.0
           },
           {
             "name": "armySize",
             "type": "number",
-            "default": 10
+            "default": 10.0
           },
           {
             "name": "morale",
             "type": "number",
-            "default": 100
-          }
-        ],
-        "instances": [
-          {
-            "id": "unit-1",
-            "name": "Knight",
-            "description": "Armored warrior",
-            "status": "active",
-            "turn": 0,
-            "score": 0
-          },
-          {
-            "id": "unit-2",
-            "name": "Archer",
-            "description": "Ranged attacker",
-            "status": "active",
-            "turn": 0,
-            "score": 0
-          },
-          {
-            "id": "unit-3",
-            "name": "Mage",
-            "description": "Magic caster",
-            "status": "active",
-            "turn": 0,
-            "score": 0
+            "default": 100.0
           }
         ]
       },
       "traits": [
         {
           "name": "ArmyBattleBattleFlow",
-          "linkedEntity": "ArmyBattle",
           "category": "interaction",
+          "linkedEntity": "ArmyBattle",
+          "emits": [
+            {
+              "event": "ArmyBattleLoaded",
+              "description": "Fired when ArmyBattle finishes loading",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "id",
+                  "type": "string",
+                  "required": true
+                },
+                {
+                  "name": "turn",
+                  "type": "number"
+                },
+                {
+                  "name": "score",
+                  "type": "number"
+                },
+                {
+                  "name": "armySize",
+                  "type": "number"
+                },
+                {
+                  "name": "morale",
+                  "type": "number"
+                }
+              ]
+            },
+            {
+              "event": "ArmyBattleLoadFailed",
+              "description": "Fired when ArmyBattle fails to load",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "message",
+                  "type": "string"
+                }
+              ]
+            }
+          ],
           "stateMachine": {
             "states": [
               {
@@ -90,7 +105,11 @@
               },
               {
                 "key": "START",
-                "name": "Start Battle"
+                "name": "Start"
+              },
+              {
+                "key": "NAVIGATE",
+                "name": "Navigate"
               },
               {
                 "key": "END_TURN",
@@ -100,25 +119,35 @@
                 "key": "PAUSE",
                 "name": "Pause"
               },
+              {
+                "key": "GAME_OVER",
+                "name": "Game Over"
+              },
               {
                 "key": "RESUME",
                 "name": "Resume"
               },
               {
-                "key": "GAME_OVER",
-                "name": "Game Over"
+                "key": "CLOSE",
+                "name": "Close"
               },
               {
                 "key": "RESTART",
                 "name": "Restart"
               },
               {
-                "key": "CLOSE",
-                "name": "Close"
+                "key": "ArmyBattleLoaded",
+                "name": "ArmyBattle loaded"
               },
               {
-                "key": "NAVIGATE",
-                "name": "Navigate"
+                "key": "ArmyBattleLoadFailed",
+                "name": "ArmyBattle load failed",
+                "payload": [
+                  {
+                    "name": "message",
+                    "type": "string"
+                  }
+                ]
               }
             ],
             "transitions": [
@@ -129,29 +158,35 @@
                 "effects": [
                   [
                     "fetch",
-                    "ArmyBattle"
+                    "ArmyBattle",
+                    {
+                      "emit": {
+                        "success": "ArmyBattleLoaded",
+                        "failure": "ArmyBattleLoadFailed"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "game-shell",
-                      "appName": "Strategy Game",
-                      "showTopBar": true,
                       "children": [
                         {
+                          "subtitle": "Turn-Based Strategy",
                           "type": "game-menu",
                           "title": "Army Battle",
-                          "subtitle": "Turn-Based Strategy",
                           "menuItems": [
                             {
                               "label": "Start Battle",
-                              "event": "START",
-                              "variant": "primary"
+                              "variant": "primary",
+                              "event": "START"
                             }
                           ]
                         }
-                      ]
+                      ],
+                      "showTopBar": true,
+                      "type": "game-shell",
+                      "appName": "Strategy Game"
                     }
                   ]
                 ]
@@ -165,7 +200,6 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "game-shell",
                       "appName": "Strategy Game",
                       "showTopBar": true,
                       "children": [
@@ -177,16 +211,22 @@
                               "value": "@entity.turn"
                             },
                             {
-                              "label": "Score",
-                              "value": "@entity.score"
+                              "value": "@entity.score",
+                              "label": "Score"
                             }
                           ]
                         }
-                      ]
+                      ],
+                      "type": "game-shell"
                     }
                   ]
                 ]
               },
+              {
+                "from": "menu",
+                "to": "menu",
+                "event": "NAVIGATE"
+              },
               {
                 "from": "playing",
                 "to": "playing",
@@ -198,16 +238,13 @@
                     [
                       "+",
                       "@entity.turn",
-                      1
+                      1.0
                     ]
                   ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "game-shell",
-                      "appName": "Strategy Game",
-                      "showTopBar": true,
                       "children": [
                         {
                           "type": "game-hud",
@@ -217,28 +254,19 @@
                               "value": "@entity.turn"
                             },
                             {
-                              "label": "Score",
-                              "value": "@entity.score"
+                              "value": "@entity.score",
+                              "label": "Score"
                             }
                           ]
                         }
-                      ]
+                      ],
+                      "showTopBar": true,
+                      "type": "game-shell",
+                      "appName": "Strategy Game"
                     }
                   ]
                 ]
               },
-              {
-                "from": "menu",
-                "to": "menu",
-                "event": "NAVIGATE",
-                "effects": []
-              },
-              {
-                "from": "paused",
-                "to": "paused",
-                "event": "NAVIGATE",
-                "effects": []
-              },
               {
                 "from": "playing",
                 "to": "paused",
@@ -252,8 +280,8 @@
                       "title": "Paused",
                       "menuItems": [
                         {
-                          "label": "Resume",
                           "event": "RESUME",
+                          "label": "Resume",
                           "variant": "primary"
                         },
                         {
@@ -267,28 +295,36 @@
                 ]
               },
               {
-                "from": "paused",
-                "to": "playing",
-                "event": "RESUME",
+                "from": "playing",
+                "to": "gameover",
+                "event": "GAME_OVER",
                 "effects": [
-                  [
-                    "render-ui",
-                    "modal",
-                    null
-                  ],
                   [
                     "render-ui",
                     "main",
                     {
+                      "showTopBar": true,
                       "type": "game-shell",
                       "appName": "Strategy Game",
-                      "showTopBar": true,
                       "children": [
                         {
-                          "type": "game-hud",
+                          "title": "Battle Over",
+                          "menuItems": [
+                            {
+                              "label": "Play Again",
+                              "variant": "primary",
+                              "event": "RESTART"
+                            },
+                            {
+                              "label": "Main Menu",
+                              "event": "RESTART",
+                              "variant": "secondary"
+                            }
+                          ],
+                          "type": "game-over-screen",
                           "stats": [
                             {
-                              "label": "Turn",
+                              "label": "Turns",
                               "value": "@entity.turn"
                             },
                             {
@@ -302,10 +338,15 @@
                   ]
                 ]
               },
+              {
+                "from": "paused",
+                "to": "paused",
+                "event": "NAVIGATE"
+              },
               {
                 "from": "paused",
                 "to": "playing",
-                "event": "CLOSE",
+                "event": "RESUME",
                 "effects": [
                   [
                     "render-ui",
@@ -316,22 +357,22 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "game-shell",
                       "appName": "Strategy Game",
+                      "type": "game-shell",
                       "showTopBar": true,
                       "children": [
                         {
-                          "type": "game-hud",
                           "stats": [
                             {
                               "label": "Turn",
                               "value": "@entity.turn"
                             },
                             {
-                              "label": "Score",
-                              "value": "@entity.score"
+                              "value": "@entity.score",
+                              "label": "Score"
                             }
-                          ]
+                          ],
+                          "type": "game-hud"
                         }
                       ]
                     }
@@ -339,121 +380,155 @@
                 ]
               },
               {
-                "from": "playing",
-                "to": "gameover",
-                "event": "GAME_OVER",
+                "from": "paused",
+                "to": "playing",
+                "event": "CLOSE",
                 "effects": [
+                  [
+                    "render-ui",
+                    "modal",
+                    null
+                  ],
                   [
                     "render-ui",
                     "main",
                     {
                       "type": "game-shell",
-                      "appName": "Strategy Game",
-                      "showTopBar": true,
                       "children": [
                         {
-                          "type": "game-over-screen",
-                          "title": "Battle Over",
+                          "type": "game-hud",
                           "stats": [
                             {
-                              "label": "Turns",
+                              "label": "Turn",
                               "value": "@entity.turn"
                             },
                             {
                               "label": "Score",
                               "value": "@entity.score"
                             }
-                          ],
-                          "menuItems": [
-                            {
-                              "label": "Play Again",
-                              "event": "RESTART",
-                              "variant": "primary"
-                            },
-                            {
-                              "label": "Main Menu",
-                              "event": "RESTART",
-                              "variant": "secondary"
-                            }
                           ]
                         }
-                      ]
+                      ],
+                      "appName": "Strategy Game",
+                      "showTopBar": true
                     }
                   ]
                 ]
               },
               {
-                "from": "gameover",
+                "from": "paused",
                 "to": "menu",
                 "event": "RESTART",
                 "effects": [
+                  [
+                    "render-ui",
+                    "modal",
+                    null
+                  ],
                   [
                     "render-ui",
                     "main",
                     {
                       "type": "game-shell",
-                      "appName": "Strategy Game",
-                      "showTopBar": true,
                       "children": [
                         {
-                          "type": "game-menu",
                           "title": "Army Battle",
+                          "type": "game-menu",
                           "subtitle": "Turn-Based Strategy",
                           "menuItems": [
                             {
-                              "label": "Start Battle",
                               "event": "START",
-                              "variant": "primary"
+                              "variant": "primary",
+                              "label": "Start Battle"
                             }
                           ]
                         }
-                      ]
+                      ],
+                      "showTopBar": true,
+                      "appName": "Strategy Game"
                     }
                   ]
                 ]
               },
               {
-                "from": "paused",
+                "from": "gameover",
                 "to": "menu",
                 "event": "RESTART",
                 "effects": [
-                  [
-                    "render-ui",
-                    "modal",
-                    null
-                  ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "game-shell",
                       "appName": "Strategy Game",
-                      "showTopBar": true,
                       "children": [
                         {
-                          "type": "game-menu",
-                          "title": "Army Battle",
                           "subtitle": "Turn-Based Strategy",
                           "menuItems": [
                             {
-                              "label": "Start Battle",
                               "event": "START",
-                              "variant": "primary"
+                              "variant": "primary",
+                              "label": "Start Battle"
                             }
-                          ]
+                          ],
+                          "type": "game-menu",
+                          "title": "Army Battle"
                         }
-                      ]
+                      ],
+                      "type": "game-shell",
+                      "showTopBar": true
                     }
                   ]
                 ]
               }
             ]
-          }
+          },
+          "scope": "collection"
         },
         {
           "name": "ArmyBattleCombatLog",
-          "linkedEntity": "ArmyBattle",
           "category": "interaction",
+          "linkedEntity": "ArmyBattle",
+          "emits": [
+            {
+              "event": "ArmyBattleLoaded",
+              "description": "Fired when ArmyBattle finishes loading",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "id",
+                  "type": "string",
+                  "required": true
+                },
+                {
+                  "name": "turn",
+                  "type": "number"
+                },
+                {
+                  "name": "score",
+                  "type": "number"
+                },
+                {
+                  "name": "armySize",
+                  "type": "number"
+                },
+                {
+                  "name": "morale",
+                  "type": "number"
+                }
+              ]
+            },
+            {
+              "event": "ArmyBattleLoadFailed",
+              "description": "Fired when ArmyBattle fails to load",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "message",
+                  "type": "string"
+                }
+              ]
+            }
+          ],
           "stateMachine": {
             "states": [
               {
@@ -480,6 +555,20 @@
               {
                 "key": "CLEAR",
                 "name": "Clear"
+              },
+              {
+                "key": "ArmyBattleLoaded",
+                "name": "ArmyBattle loaded"
+              },
+              {
+                "key": "ArmyBattleLoadFailed",
+                "name": "ArmyBattle load failed",
+                "payload": [
+                  {
+                    "name": "message",
+                    "type": "string"
+                  }
+                ]
               }
             ],
             "transitions": [
@@ -490,7 +579,13 @@
                 "effects": [
                   [
                     "fetch",
-                    "ArmyBattle"
+                    "ArmyBattle",
+                    {
+                      "emit": {
+                        "failure": "ArmyBattleLoadFailed",
+                        "success": "ArmyBattleLoaded"
+                      }
+                    }
                   ]
                 ]
               },
@@ -503,19 +598,19 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "game-shell",
-                      "appName": "Strategy Game",
-                      "showTopBar": true,
                       "children": [
                         {
+                          "maxVisible": 10.0,
                           "type": "combat-log",
                           "events": "@ArmyBattle",
-                          "maxVisible": 10,
                           "autoScroll": true,
                           "showTimestamps": true,
                           "title": "Combat Log"
                         }
-                      ]
+                      ],
+                      "showTopBar": true,
+                      "type": "game-shell",
+                      "appName": "Strategy Game"
                     }
                   ]
                 ]
@@ -529,25 +624,26 @@
                     "render-ui",
                     "main",
                     {
-                      "type": "game-shell",
-                      "appName": "Strategy Game",
-                      "showTopBar": true,
                       "children": [
                         {
-                          "type": "combat-log",
-                          "events": "@ArmyBattle",
-                          "maxVisible": 10,
                           "autoScroll": true,
+                          "events": "@ArmyBattle",
                           "showTimestamps": true,
+                          "type": "combat-log",
+                          "maxVisible": 10.0,
                           "title": "Combat Log"
                         }
-                      ]
+                      ],
+                      "appName": "Strategy Game",
+                      "type": "game-shell",
+                      "showTopBar": true
                     }
                   ]
                 ]
               }
             ]
-          }
+          },
+          "scope": "collection"
         }
       ],
       "pages": [
@@ -587,21 +683,61 @@
           },
           {
             "name": "defense",
-            "type": "number",
-            "default": 0
+            "type": "number"
           },
           {
             "name": "explored",
-            "type": "boolean",
-            "default": false
+            "type": "boolean"
           }
         ]
       },
       "traits": [
         {
           "name": "TerritoryNavigation",
-          "linkedEntity": "Territory",
           "category": "interaction",
+          "linkedEntity": "Territory",
+          "emits": [
+            {
+              "event": "TerritoryLoaded",
+              "description": "Fired when Territory finishes loading",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "id",
+                  "type": "string",
+                  "required": true
+                },
+                {
+                  "name": "name",
+                  "type": "string",
+                  "required": true
+                },
+                {
+                  "name": "owner",
+                  "type": "string"
+                },
+                {
+                  "name": "defense",
+                  "type": "number"
+                },
+                {
+                  "name": "explored",
+                  "type": "boolean"
+                }
+              ]
+            },
+            {
+              "event": "TerritoryLoadFailed",
+              "description": "Fired when Territory fails to load",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "message",
+                  "type": "string"
+                }
+              ]
+            }
+          ],
           "stateMachine": {
             "states": [
               {
@@ -622,14 +758,7 @@
               },
               {
                 "key": "TRAVEL",
-                "name": "Travel",
-                "payload": [
-                  {
-                    "name": "zoneId",
-                    "type": "string",
-                    "required": true
-                  }
-                ]
+                "name": "Travel"
               },
               {
                 "key": "ARRIVE",
@@ -638,6 +767,20 @@
               {
                 "key": "BACK",
                 "name": "Back"
+              },
+              {
+                "key": "TerritoryLoaded",
+                "name": "Territory loaded"
+              },
+              {
+                "key": "TerritoryLoadFailed",
+                "name": "Territory load failed",
+                "payload": [
+                  {
+                    "name": "message",
+                    "type": "string"
+                  }
+                ]
               }
             ],
             "transitions": [
@@ -648,97 +791,100 @@
                 "effects": [
                   [
                     "fetch",
-                    "Territory"
+                    "Territory",
+                    {
+                      "emit": {
+                        "failure": "TerritoryLoadFailed",
+                        "success": "TerritoryLoaded"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "game-shell",
                       "appName": "Strategy Game",
                       "showTopBar": true,
+                      "type": "game-shell",
                       "children": [
                         {
-                          "type": "stack",
-                          "direction": "vertical",
                           "gap": "lg",
+                          "type": "stack",
                           "children": [
                             {
-                              "type": "stack",
-                              "direction": "horizontal",
-                              "gap": "md",
                               "justify": "space-between",
+                              "gap": "md",
                               "children": [
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "md",
                                   "children": [
                                     {
                                       "type": "icon",
-                                      "name": "map",
-                                      "size": "lg"
+                                      "size": "lg",
+                                      "name": "map"
                                     },
                                     {
-                                      "type": "typography",
                                       "content": "Territory Map",
+                                      "type": "typography",
                                       "variant": "h2"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal",
+                                  "gap": "md",
+                                  "type": "stack"
                                 },
                                 {
-                                  "type": "status-dot",
                                   "status": "active",
-                                  "pulse": false,
-                                  "label": "Exploring"
+                                  "label": "Exploring",
+                                  "type": "status-dot",
+                                  "pulse": false
                                 }
-                              ]
+                              ],
+                              "type": "stack",
+                              "direction": "horizontal"
                             },
                             {
                               "type": "divider"
                             },
                             {
-                              "type": "map-view",
+                              "zoom": 10.0,
                               "markers": [],
-                              "height": "200px",
-                              "zoom": 10
+                              "type": "map-view",
+                              "height": "200px"
                             },
                             {
-                              "type": "data-grid",
-                              "entity": "Territory",
                               "emptyIcon": "compass",
-                              "emptyTitle": "No territorys discovered",
+                              "type": "data-grid",
                               "emptyDescription": "Explore to discover new territorys.",
                               "itemActions": [
                                 {
-                                  "label": "Travel",
-                                  "event": "TRAVEL"
+                                  "event": "TRAVEL",
+                                  "label": "Travel"
                                 }
                               ],
+                              "emptyTitle": "No territorys discovered",
                               "renderItem": [
                                 "fn",
                                 "item",
                                 {
-                                  "type": "stack",
                                   "direction": "vertical",
-                                  "gap": "sm",
+                                  "type": "stack",
                                   "children": [
                                     {
-                                      "type": "stack",
                                       "direction": "horizontal",
-                                      "justify": "space-between",
                                       "align": "center",
+                                      "type": "stack",
+                                      "justify": "space-between",
                                       "children": [
                                         {
+                                          "align": "center",
                                           "type": "stack",
-                                          "direction": "horizontal",
                                           "gap": "sm",
-                                          "align": "center",
+                                          "direction": "horizontal",
                                           "children": [
                                             {
-                                              "type": "icon",
+                                              "size": "sm",
                                               "name": "map-pin",
-                                              "size": "sm"
+                                              "type": "icon"
                                             },
                                             {
                                               "type": "typography",
@@ -758,11 +904,14 @@
                                       "variant": "caption",
                                       "content": "@item.defense"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "sm"
                                 }
-                              ]
+                              ],
+                              "entity": "Territory"
                             }
-                          ]
+                          ],
+                          "direction": "vertical"
                         }
                       ]
                     }
@@ -783,15 +932,13 @@
                       "showTopBar": true,
                       "children": [
                         {
-                          "type": "stack",
                           "direction": "vertical",
-                          "gap": "lg",
                           "align": "center",
                           "children": [
                             {
+                              "gap": "md",
                               "type": "stack",
                               "direction": "horizontal",
-                              "gap": "md",
                               "children": [
                                 {
                                   "type": "icon",
@@ -813,7 +960,9 @@
                               "content": "Traveling to the destination territorys map.",
                               "variant": "body"
                             }
-                          ]
+                          ],
+                          "gap": "lg",
+                          "type": "stack"
                         }
                       ]
                     }
@@ -827,89 +976,83 @@
                 "effects": [
                   [
                     "fetch",
-                    "Territory"
+                    "Territory",
+                    {
+                      "emit": {
+                        "success": "TerritoryLoaded",
+                        "failure": "TerritoryLoadFailed"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "game-shell",
                       "appName": "Strategy Game",
                       "showTopBar": true,
                       "children": [
                         {
-                          "type": "stack",
-                          "direction": "vertical",
-                          "gap": "lg",
                           "children": [
                             {
                               "type": "stack",
-                              "direction": "horizontal",
                               "gap": "md",
-                              "justify": "space-between",
                               "children": [
                                 {
                                   "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "md",
                                   "children": [
                                     {
-                                      "type": "icon",
+                                      "size": "lg",
                                       "name": "map",
-                                      "size": "lg"
+                                      "type": "icon"
                                     },
                                     {
                                       "type": "typography",
                                       "content": "Territorys Map",
                                       "variant": "h2"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "md",
+                                  "direction": "horizontal"
                                 },
                                 {
                                   "type": "status-dot",
-                                  "status": "success",
-                                  "label": "Entered"
+                                  "label": "Entered",
+                                  "status": "success"
                                 }
-                              ]
+                              ],
+                              "justify": "space-between",
+                              "direction": "horizontal"
                             },
                             {
                               "type": "divider"
                             },
                             {
                               "type": "data-grid",
-                              "entity": "Territory",
-                              "emptyIcon": "inbox",
-                              "emptyTitle": "Nothing here",
-                              "emptyDescription": "This zone is empty.",
                               "renderItem": [
                                 "fn",
                                 "item",
                                 {
-                                  "type": "stack",
-                                  "direction": "vertical",
-                                  "gap": "sm",
                                   "children": [
                                     {
                                       "type": "stack",
                                       "direction": "horizontal",
-                                      "justify": "space-between",
                                       "align": "center",
                                       "children": [
                                         {
-                                          "type": "stack",
                                           "direction": "horizontal",
                                           "gap": "sm",
+                                          "type": "stack",
                                           "align": "center",
                                           "children": [
                                             {
-                                              "type": "icon",
                                               "name": "map-pin",
-                                              "size": "sm"
+                                              "size": "sm",
+                                              "type": "icon"
                                             },
                                             {
+                                              "content": "@item.name",
                                               "type": "typography",
-                                              "variant": "h4",
-                                              "content": "@item.name"
+                                              "variant": "h4"
                                             }
                                           ]
                                         },
@@ -917,38 +1060,50 @@
                                           "type": "badge",
                                           "label": "@item.owner"
                                         }
-                                      ]
+                                      ],
+                                      "justify": "space-between"
                                     },
                                     {
-                                      "type": "typography",
                                       "variant": "caption",
-                                      "content": "@item.defense"
+                                      "content": "@item.defense",
+                                      "type": "typography"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "sm",
+                                  "direction": "vertical",
+                                  "type": "stack"
                                 }
-                              ]
+                              ],
+                              "emptyDescription": "This zone is empty.",
+                              "emptyTitle": "Nothing here",
+                              "entity": "Territory",
+                              "emptyIcon": "inbox"
                             },
                             {
                               "type": "divider"
                             },
                             {
                               "type": "stack",
-                              "direction": "horizontal",
                               "gap": "sm",
                               "justify": "end",
                               "children": [
                                 {
-                                  "type": "button",
-                                  "label": "Back to Map",
-                                  "event": "BACK",
+                                  "icon": "arrow-left",
                                   "variant": "ghost",
-                                  "icon": "arrow-left"
+                                  "label": "Back to Map",
+                                  "type": "button",
+                                  "event": "BACK"
                                 }
-                              ]
+                              ],
+                              "direction": "horizontal"
                             }
-                          ]
+                          ],
+                          "type": "stack",
+                          "direction": "vertical",
+                          "gap": "lg"
                         }
-                      ]
+                      ],
+                      "type": "game-shell"
                     }
                   ]
                 ]
@@ -960,7 +1115,13 @@
                 "effects": [
                   [
                     "fetch",
-                    "Territory"
+                    "Territory",
+                    {
+                      "emit": {
+                        "failure": "TerritoryLoadFailed",
+                        "success": "TerritoryLoaded"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
@@ -968,43 +1129,39 @@
                     {
                       "type": "game-shell",
                       "appName": "Strategy Game",
-                      "showTopBar": true,
                       "children": [
                         {
-                          "type": "stack",
-                          "direction": "vertical",
-                          "gap": "lg",
                           "children": [
                             {
-                              "type": "stack",
                               "direction": "horizontal",
                               "gap": "md",
-                              "justify": "space-between",
+                              "type": "stack",
                               "children": [
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "md",
                                   "children": [
                                     {
+                                      "size": "lg",
                                       "type": "icon",
-                                      "name": "map",
-                                      "size": "lg"
+                                      "name": "map"
                                     },
                                     {
+                                      "variant": "h2",
                                       "type": "typography",
-                                      "content": "Territory Map",
-                                      "variant": "h2"
+                                      "content": "Territory Map"
                                     }
-                                  ]
+                                  ],
+                                  "direction": "horizontal",
+                                  "type": "stack",
+                                  "gap": "md"
                                 },
                                 {
-                                  "type": "status-dot",
                                   "status": "active",
-                                  "pulse": false,
-                                  "label": "Exploring"
+                                  "type": "status-dot",
+                                  "label": "Exploring",
+                                  "pulse": false
                                 }
-                              ]
+                              ],
+                              "justify": "space-between"
                             },
                             {
                               "type": "divider"
@@ -1013,12 +1170,9 @@
                               "type": "map-view",
                               "markers": [],
                               "height": "200px",
-                              "zoom": 10
+                              "zoom": 10.0
                             },
                             {
-                              "type": "data-grid",
-                              "entity": "Territory",
-                              "emptyIcon": "compass",
                               "emptyTitle": "No territorys discovered",
                               "emptyDescription": "Explore to discover new territorys.",
                               "itemActions": [
@@ -1032,19 +1186,15 @@
                                 "item",
                                 {
                                   "type": "stack",
-                                  "direction": "vertical",
                                   "gap": "sm",
+                                  "direction": "vertical",
                                   "children": [
                                     {
+                                      "align": "center",
                                       "type": "stack",
                                       "direction": "horizontal",
-                                      "justify": "space-between",
-                                      "align": "center",
                                       "children": [
                                         {
-                                          "type": "stack",
-                                          "direction": "horizontal",
-                                          "gap": "sm",
                                           "align": "center",
                                           "children": [
                                             {
@@ -1057,39 +1207,50 @@
                                               "variant": "h4",
                                               "content": "@item.name"
                                             }
-                                          ]
+                                          ],
+                                          "direction": "horizontal",
+                                          "type": "stack",
+                                          "gap": "sm"
                                         },
                                         {
-                                          "type": "badge",
-                                          "label": "@item.owner"
+                                          "label": "@item.owner",
+                                          "type": "badge"
                                         }
-                                      ]
+                                      ],
+                                      "justify": "space-between"
                                     },
                                     {
+                                      "content": "@item.defense",
                                       "type": "typography",
-                                      "variant": "caption",
-                                      "content": "@item.defense"
+                                      "variant": "caption"
                                     }
                                   ]
                                 }
-                              ]
+                              ],
+                              "type": "data-grid",
+                              "emptyIcon": "compass",
+                              "entity": "Territory"
                             }
-                          ]
+                          ],
+                          "direction": "vertical",
+                          "type": "stack",
+                          "gap": "lg"
                         }
-                      ]
+                      ],
+                      "showTopBar": true
                     }
                   ]
                 ]
               }
             ]
-          }
+          },
+          "scope": "collection"
         }
       ],
       "pages": [
         {
-          "name": "MapPage",
+          "name": "Map",
           "path": "/map",
-          "isInitial": true,
           "traits": [
             {
               "ref": "TerritoryNavigation"
@@ -1111,31 +1272,68 @@
           },
           {
             "name": "gold",
-            "type": "number",
-            "default": 0
+            "type": "number"
           },
           {
             "name": "food",
-            "type": "number",
-            "default": 0
+            "type": "number"
           },
           {
             "name": "wood",
-            "type": "number",
-            "default": 0
+            "type": "number"
           },
           {
             "name": "iron",
-            "type": "number",
-            "default": 0
+            "type": "number"
           }
         ]
       },
       "traits": [
         {
           "name": "ResourceDisplay",
-          "linkedEntity": "Resource",
           "category": "interaction",
+          "linkedEntity": "Resource",
+          "emits": [
+            {
+              "event": "ResourceLoaded",
+              "description": "Fired when Resource finishes loading",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "id",
+                  "type": "string",
+                  "required": true
+                },
+                {
+                  "name": "gold",
+                  "type": "number"
+                },
+                {
+                  "name": "food",
+                  "type": "number"
+                },
+                {
+                  "name": "wood",
+                  "type": "number"
+                },
+                {
+                  "name": "iron",
+                  "type": "number"
+                }
+              ]
+            },
+            {
+              "event": "ResourceLoadFailed",
+              "description": "Fired when Resource fails to load",
+              "scope": "internal",
+              "payload": [
+                {
+                  "name": "message",
+                  "type": "string"
+                }
+              ]
+            }
+          ],
           "stateMachine": {
             "states": [
               {
@@ -1165,6 +1363,20 @@
               {
                 "key": "REFRESHED",
                 "name": "Refreshed"
+              },
+              {
+                "key": "ResourceLoaded",
+                "name": "Resource loaded"
+              },
+              {
+                "key": "ResourceLoadFailed",
+                "name": "Resource load failed",
+                "payload": [
+                  {
+                    "name": "message",
+                    "type": "string"
+                  }
+                ]
               }
             ],
             "transitions": [
@@ -1175,23 +1387,25 @@
                 "effects": [
                   [
                     "fetch",
-                    "Resource"
+                    "Resource",
+                    {
+                      "emit": {
+                        "success": "ResourceLoaded",
+                        "failure": "ResourceLoadFailed"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
                       "type": "game-shell",
-                      "appName": "Strategy Game",
-                      "showTopBar": true,
                       "children": [
                         {
-                          "type": "scaled-diagram",
                           "children": [
                             {
-                              "type": "stack",
                               "direction": "vertical",
-                              "gap": "lg",
+                              "type": "stack",
                               "children": [
                                 {
                                   "type": "breadcrumb",
@@ -1206,47 +1420,44 @@
                                   ]
                                 },
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "md",
-                                  "justify": "space-between",
                                   "children": [
                                     {
-                                      "type": "stack",
-                                      "direction": "horizontal",
                                       "gap": "md",
                                       "children": [
                                         {
-                                          "type": "icon",
                                           "name": "database",
+                                          "type": "icon",
                                           "size": "lg"
                                         },
                                         {
-                                          "type": "typography",
+                                          "variant": "h2",
                                           "content": "Resources",
-                                          "variant": "h2"
+                                          "type": "typography"
                                         }
-                                      ]
+                                      ],
+                                      "direction": "horizontal",
+                                      "type": "stack"
                                     },
                                     {
-                                      "type": "button",
+                                      "icon": "refresh-cw",
                                       "label": "Refresh",
-                                      "event": "REFRESH",
                                       "variant": "secondary",
-                                      "icon": "refresh-cw"
+                                      "type": "button",
+                                      "event": "REFRESH"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "md",
+                                  "direction": "horizontal",
+                                  "justify": "space-between",
+                                  "type": "stack"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "box",
-                                  "padding": "md",
                                   "children": [
                                     {
-                                      "type": "simple-grid",
-                                      "columns": 3,
+                                      "columns": 3.0,
                                       "children": [
                                         {
                                           "type": "stat-display",
@@ -1261,8 +1472,6 @@
                                           ]
                                         },
                                         {
-                                          "type": "stat-display",
-                                          "label": "Food",
                                           "value": [
                                             "object/get",
                                             [
@@ -1270,7 +1479,9 @@
                                               "@entity"
                                             ],
                                             "food"
-                                          ]
+                                          ],
+                                          "type": "stat-display",
+                                          "label": "Food"
                                         },
                                         {
                                           "type": "stat-display",
@@ -1285,8 +1496,8 @@
                                           ]
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "Iron",
+                                          "type": "stat-display",
                                           "value": [
                                             "object/get",
                                             [
@@ -1296,66 +1507,69 @@
                                             "iron"
                                           ]
                                         }
-                                      ]
+                                      ],
+                                      "type": "simple-grid"
                                     }
-                                  ]
+                                  ],
+                                  "type": "box",
+                                  "padding": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "grid",
-                                  "columns": 2,
-                                  "gap": "md",
+                                  "columns": 2.0,
                                   "children": [
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
                                           "type": "typography",
                                           "variant": "caption",
                                           "content": "Chart View"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     },
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
                                           "type": "typography",
-                                          "variant": "caption",
-                                          "content": "Graph View"
+                                          "content": "Graph View",
+                                          "variant": "caption"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     }
-                                  ]
+                                  ],
+                                  "type": "grid",
+                                  "gap": "md"
                                 },
                                 {
                                   "type": "line-chart",
                                   "data": [
                                     {
                                       "date": "Jan",
-                                      "value": 12
+                                      "value": 12.0
                                     },
                                     {
-                                      "date": "Feb",
-                                      "value": 19
+                                      "value": 19.0,
+                                      "date": "Feb"
                                     },
                                     {
-                                      "date": "Mar",
-                                      "value": 15
+                                      "value": 15.0,
+                                      "date": "Mar"
                                     },
                                     {
                                       "date": "Apr",
-                                      "value": 25
+                                      "value": 25.0
                                     },
                                     {
-                                      "date": "May",
-                                      "value": 22
+                                      "value": 22.0,
+                                      "date": "May"
                                     },
                                     {
                                       "date": "Jun",
-                                      "value": 30
+                                      "value": 30.0
                                     }
                                   ],
                                   "xKey": "date",
@@ -1370,51 +1584,55 @@
                                       "color": "primary"
                                     },
                                     {
-                                      "label": "Previous",
-                                      "color": "muted"
+                                      "color": "muted",
+                                      "label": "Previous"
                                     }
                                   ]
                                 },
                                 {
                                   "type": "graph-view",
+                                  "width": 400.0,
                                   "nodes": [
                                     {
                                       "id": "a",
-                                      "label": "Start",
-                                      "x": 50,
-                                      "y": 100
+                                      "x": 50.0,
+                                      "y": 100.0,
+                                      "label": "Start"
                                     },
                                     {
+                                      "y": 50.0,
                                       "id": "b",
-                                      "label": "Process",
-                                      "x": 200,
-                                      "y": 50
+                                      "x": 200.0,
+                                      "label": "Process"
                                     },
                                     {
                                       "id": "c",
                                       "label": "End",
-                                      "x": 350,
-                                      "y": 100
+                                      "y": 100.0,
+                                      "x": 350.0
                                     }
                                   ],
+                                  "height": 200.0,
                                   "edges": [
                                     {
                                       "from": "a",
                                       "to": "b"
                                     },
                                     {
-                                      "from": "b",
-                                      "to": "c"
+                                      "to": "c",
+                                      "from": "b"
                                     }
-                                  ],
-                                  "width": 400,
-                                  "height": 200
+                                  ]
                                 }
-                              ]
+                              ],
+                              "gap": "lg"
                             }
-                          ]
+                          ],
+                          "type": "scaled-diagram"
                         }
-                      ]
+                      ],
+                      "appName": "Strategy Game",
+                      "showTopBar": true
                     }
                   ]
                 ]
@@ -1426,23 +1644,27 @@
                 "effects": [
                   [
                     "fetch",
-                    "Resource"
+                    "Resource",
+                    {
+                      "emit": {
+                        "success": "ResourceLoaded",
+                        "failure": "ResourceLoadFailed"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "game-shell",
                       "appName": "Strategy Game",
-                      "showTopBar": true,
                       "children": [
                         {
                           "type": "scaled-diagram",
                           "children": [
                             {
+                              "gap": "lg",
                               "type": "stack",
                               "direction": "vertical",
-                              "gap": "lg",
                               "children": [
                                 {
                                   "type": "breadcrumb",
@@ -1458,46 +1680,43 @@
                                 },
                                 {
                                   "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "md",
-                                  "justify": "space-between",
                                   "children": [
                                     {
-                                      "type": "stack",
                                       "direction": "horizontal",
                                       "gap": "md",
                                       "children": [
                                         {
-                                          "type": "icon",
                                           "name": "database",
-                                          "size": "lg"
+                                          "size": "lg",
+                                          "type": "icon"
                                         },
                                         {
+                                          "variant": "h2",
                                           "type": "typography",
-                                          "content": "Resources",
-                                          "variant": "h2"
+                                          "content": "Resources"
                                         }
-                                      ]
+                                      ],
+                                      "type": "stack"
                                     },
                                     {
                                       "type": "button",
-                                      "label": "Refresh",
-                                      "event": "REFRESH",
                                       "variant": "secondary",
-                                      "icon": "refresh-cw"
+                                      "icon": "refresh-cw",
+                                      "event": "REFRESH",
+                                      "label": "Refresh"
                                     }
-                                  ]
+                                  ],
+                                  "justify": "space-between",
+                                  "gap": "md",
+                                  "direction": "horizontal"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "box",
-                                  "padding": "md",
                                   "children": [
                                     {
                                       "type": "simple-grid",
-                                      "columns": 3,
                                       "children": [
                                         {
                                           "type": "stat-display",
@@ -1512,8 +1731,8 @@
                                           ]
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "Food",
+                                          "type": "stat-display",
                                           "value": [
                                             "object/get",
                                             [
@@ -1524,8 +1743,6 @@
                                           ]
                                         },
                                         {
-                                          "type": "stat-display",
-                                          "label": "Wood",
                                           "value": [
                                             "object/get",
                                             [
@@ -1533,11 +1750,12 @@
                                               "@entity"
                                             ],
                                             "wood"
-                                          ]
+                                          ],
+                                          "label": "Wood",
+                                          "type": "stat-display"
                                         },
                                         {
                                           "type": "stat-display",
-                                          "label": "Iron",
                                           "value": [
                                             "object/get",
                                             [
@@ -1545,127 +1763,133 @@
                                               "@entity"
                                             ],
                                             "iron"
-                                          ]
+                                          ],
+                                          "label": "Iron"
                                         }
-                                      ]
+                                      ],
+                                      "columns": 3.0
                                     }
-                                  ]
+                                  ],
+                                  "type": "box",
+                                  "padding": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "grid",
-                                  "columns": 2,
-                                  "gap": "md",
                                   "children": [
                                     {
                                       "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
+                                          "content": "Chart View",
                                           "variant": "caption",
-                                          "content": "Chart View"
+                                          "type": "typography"
                                         }
                                       ]
                                     },
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
+                                          "content": "Graph View",
                                           "variant": "caption",
-                                          "content": "Graph View"
+                                          "type": "typography"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     }
-                                  ]
+                                  ],
+                                  "type": "grid",
+                                  "columns": 2.0,
+                                  "gap": "md"
                                 },
                                 {
-                                  "type": "line-chart",
+                                  "yKey": "value",
+                                  "xKey": "date",
                                   "data": [
                                     {
-                                      "date": "Jan",
-                                      "value": 12
+                                      "value": 12.0,
+                                      "date": "Jan"
                                     },
                                     {
-                                      "date": "Feb",
-                                      "value": 19
+                                      "value": 19.0,
+                                      "date": "Feb"
                                     },
                                     {
                                       "date": "Mar",
-                                      "value": 15
+                                      "value": 15.0
                                     },
                                     {
                                       "date": "Apr",
-                                      "value": 25
+                                      "value": 25.0
                                     },
                                     {
-                                      "date": "May",
-                                      "value": 22
+                                      "value": 22.0,
+                                      "date": "May"
                                     },
                                     {
                                       "date": "Jun",
-                                      "value": 30
+                                      "value": 30.0
                                     }
                                   ],
-                                  "xKey": "date",
-                                  "yKey": "value",
-                                  "title": "Trend"
+                                  "title": "Trend",
+                                  "type": "line-chart"
                                 },
                                 {
-                                  "type": "chart-legend",
                                   "items": [
                                     {
-                                      "label": "Current",
-                                      "color": "primary"
+                                      "color": "primary",
+                                      "label": "Current"
                                     },
                                     {
                                       "label": "Previous",
                                       "color": "muted"
                                     }
-                                  ]
+                                  ],
+                                  "type": "chart-legend"
                                 },
                                 {
-                                  "type": "graph-view",
+                                  "edges": [
+                                    {
+                                      "from": "a",
+                                      "to": "b"
+                                    },
+                                    {
+                                      "to": "c",
+                                      "from": "b"
+                                    }
+                                  ],
+                                  "width": 400.0,
                                   "nodes": [
                                     {
+                                      "x": 50.0,
                                       "id": "a",
-                                      "label": "Start",
-                                      "x": 50,
-                                      "y": 100
+                                      "y": 100.0,
+                                      "label": "Start"
                                     },
                                     {
-                                      "id": "b",
                                       "label": "Process",
-                                      "x": 200,
-                                      "y": 50
+                                      "y": 50.0,
+                                      "id": "b",
+                                      "x": 200.0
                                     },
                                     {
                                       "id": "c",
+                                      "y": 100.0,
                                       "label": "End",
-                                      "x": 350,
-                                      "y": 100
-                                    }
-                                  ],
-                                  "edges": [
-                                    {
-                                      "from": "a",
-                                      "to": "b"
-                                    },
-                                    {
-                                      "from": "b",
-                                      "to": "c"
+                                      "x": 350.0
                                     }
                                   ],
-                                  "width": 400,
-                                  "height": 200
+                                  "type": "graph-view",
+                                  "height": 200.0
                                 }
                               ]
                             }
                           ]
                         }
-                      ]
+                      ],
+                      "showTopBar": true,
+                      "type": "game-shell"
                     }
                   ]
                 ]
@@ -1677,30 +1901,34 @@
                 "effects": [
                   [
                     "fetch",
-                    "Resource"
+                    "Resource",
+                    {
+                      "emit": {
+                        "success": "ResourceLoaded",
+                        "failure": "ResourceLoadFailed"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
+                      "showTopBar": true,
                       "type": "game-shell",
                       "appName": "Strategy Game",
-                      "showTopBar": true,
                       "children": [
                         {
-                          "type": "scaled-diagram",
                           "children": [
                             {
                               "type": "stack",
                               "direction": "vertical",
-                              "gap": "lg",
                               "children": [
                                 {
                                   "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "label": "Home",
-                                      "href": "/"
+                                      "href": "/",
+                                      "label": "Home"
                                     },
                                     {
                                       "label": "Resources"
@@ -1708,34 +1936,34 @@
                                   ]
                                 },
                                 {
-                                  "type": "stack",
                                   "direction": "horizontal",
-                                  "gap": "md",
                                   "justify": "space-between",
+                                  "type": "stack",
+                                  "gap": "md",
                                   "children": [
                                     {
                                       "type": "stack",
-                                      "direction": "horizontal",
-                                      "gap": "md",
                                       "children": [
                                         {
                                           "type": "icon",
-                                          "name": "database",
-                                          "size": "lg"
+                                          "size": "lg",
+                                          "name": "database"
                                         },
                                         {
-                                          "type": "typography",
                                           "content": "Resources",
+                                          "type": "typography",
                                           "variant": "h2"
                                         }
-                                      ]
+                                      ],
+                                      "direction": "horizontal",
+                                      "gap": "md"
                                     },
                                     {
-                                      "type": "button",
                                       "label": "Refresh",
+                                      "type": "button",
+                                      "icon": "refresh-cw",
                                       "event": "REFRESH",
-                                      "variant": "secondary",
-                                      "icon": "refresh-cw"
+                                      "variant": "secondary"
                                     }
                                   ]
                                 },
@@ -1743,16 +1971,12 @@
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "box",
-                                  "padding": "md",
                                   "children": [
                                     {
                                       "type": "simple-grid",
-                                      "columns": 3,
+                                      "columns": 3.0,
                                       "children": [
                                         {
-                                          "type": "stat-display",
-                                          "label": "Gold",
                                           "value": [
                                             "object/get",
                                             [
@@ -1760,10 +1984,11 @@
                                               "@entity"
                                             ],
                                             "gold"
-                                          ]
+                                          ],
+                                          "label": "Gold",
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
                                           "label": "Food",
                                           "value": [
                                             "object/get",
@@ -1772,11 +1997,10 @@
                                               "@entity"
                                             ],
                                             "food"
-                                          ]
+                                          ],
+                                          "type": "stat-display"
                                         },
                                         {
-                                          "type": "stat-display",
-                                          "label": "Wood",
                                           "value": [
                                             "object/get",
                                             [
@@ -1784,11 +2008,11 @@
                                               "@entity"
                                             ],
                                             "wood"
-                                          ]
+                                          ],
+                                          "type": "stat-display",
+                                          "label": "Wood"
                                         },
                                         {
-                                          "type": "stat-display",
-                                          "label": "Iron",
                                           "value": [
                                             "object/get",
                                             [
@@ -1796,76 +2020,79 @@
                                               "@entity"
                                             ],
                                             "iron"
-                                          ]
+                                          ],
+                                          "type": "stat-display",
+                                          "label": "Iron"
                                         }
                                       ]
                                     }
-                                  ]
+                                  ],
+                                  "type": "box",
+                                  "padding": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "grid",
-                                  "columns": 2,
-                                  "gap": "md",
                                   "children": [
                                     {
                                       "type": "card",
                                       "children": [
                                         {
+                                          "content": "Chart View",
                                           "type": "typography",
-                                          "variant": "caption",
-                                          "content": "Chart View"
+                                          "variant": "caption"
                                         }
                                       ]
                                     },
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
                                           "type": "typography",
                                           "variant": "caption",
                                           "content": "Graph View"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     }
-                                  ]
+                                  ],
+                                  "columns": 2.0,
+                                  "type": "grid",
+                                  "gap": "md"
                                 },
                                 {
-                                  "type": "line-chart",
+                                  "xKey": "date",
+                                  "yKey": "value",
                                   "data": [
                                     {
-                                      "date": "Jan",
-                                      "value": 12
+                                      "value": 12.0,
+                                      "date": "Jan"
                                     },
                                     {
-                                      "date": "Feb",
-                                      "value": 19
+                                      "value": 19.0,
+                                      "date": "Feb"
                                     },
                                     {
                                       "date": "Mar",
-                                      "value": 15
+                                      "value": 15.0
                                     },
                                     {
-                                      "date": "Apr",
-                                      "value": 25
+                                      "value": 25.0,
+                                      "date": "Apr"
                                     },
                                     {
                                       "date": "May",
-                                      "value": 22
+                                      "value": 22.0
                                     },
                                     {
-                                      "date": "Jun",
-                                      "value": 30
+                                      "value": 30.0,
+                                      "date": "Jun"
                                     }
                                   ],
-                                  "xKey": "date",
-                                  "yKey": "value",
+                                  "type": "line-chart",
                                   "title": "Trend"
                                 },
                                 {
-                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "label": "Current",
@@ -1875,46 +2102,49 @@
                                       "label": "Previous",
                                       "color": "muted"
                                     }
-                                  ]
+                                  ],
+                                  "type": "chart-legend"
                                 },
                                 {
+                                  "edges": [
+                                    {
+                                      "from": "a",
+                                      "to": "b"
+                                    },
+                                    {
+                                      "to": "c",
+                                      "from": "b"
+                                    }
+                                  ],
                                   "type": "graph-view",
                                   "nodes": [
                                     {
+                                      "x": 50.0,
                                       "id": "a",
                                       "label": "Start",
-                                      "x": 50,
-                                      "y": 100
+                                      "y": 100.0
                                     },
                                     {
+                                      "y": 50.0,
                                       "id": "b",
-                                      "label": "Process",
-                                      "x": 200,
-                                      "y": 50
+                                      "x": 200.0,
+                                      "label": "Process"
                                     },
                                     {
                                       "id": "c",
                                       "label": "End",
-                                      "x": 350,
-                                      "y": 100
-                                    }
-                                  ],
-                                  "edges": [
-                                    {
-                                      "from": "a",
-                                      "to": "b"
-                                    },
-                                    {
-                                      "from": "b",
-                                      "to": "c"
+                                      "x": 350.0,
+                                      "y": 100.0
                                     }
                                   ],
-                                  "width": 400,
-                                  "height": 200
+                                  "width": 400.0,
+                                  "height": 200.0
                                 }
-                              ]
+                              ],
+                              "gap": "lg"
                             }
-                          ]
+                          ],
+                          "type": "scaled-diagram"
                         }
                       ]
                     }
@@ -1928,7 +2158,13 @@
                 "effects": [
                   [
                     "fetch",
-                    "Resource"
+                    "Resource",
+                    {
+                      "emit": {
+                        "success": "ResourceLoaded",
+                        "failure": "ResourceLoadFailed"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
@@ -1942,16 +2178,16 @@
                           "type": "scaled-diagram",
                           "children": [
                             {
-                              "type": "stack",
-                              "direction": "vertical",
                               "gap": "lg",
+                              "direction": "vertical",
+                              "type": "stack",
                               "children": [
                                 {
                                   "type": "breadcrumb",
                                   "items": [
                                     {
-                                      "label": "Home",
-                                      "href": "/"
+                                      "href": "/",
+                                      "label": "Home"
                                     },
                                     {
                                       "label": "Resources"
@@ -1959,47 +2195,45 @@
                                   ]
                                 },
                                 {
-                                  "type": "stack",
-                                  "direction": "horizontal",
                                   "gap": "md",
-                                  "justify": "space-between",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
-                                      "type": "stack",
-                                      "direction": "horizontal",
-                                      "gap": "md",
                                       "children": [
                                         {
-                                          "type": "icon",
                                           "name": "database",
-                                          "size": "lg"
+                                          "size": "lg",
+                                          "type": "icon"
                                         },
                                         {
                                           "type": "typography",
                                           "content": "Resources",
                                           "variant": "h2"
                                         }
-                                      ]
+                                      ],
+                                      "type": "stack",
+                                      "gap": "md",
+                                      "direction": "horizontal"
                                     },
                                     {
                                       "type": "button",
-                                      "label": "Refresh",
-                                      "event": "REFRESH",
                                       "variant": "secondary",
-                                      "icon": "refresh-cw"
+                                      "event": "REFRESH",
+                                      "icon": "refresh-cw",
+                                      "label": "Refresh"
                                     }
-                                  ]
+                                  ],
+                                  "type": "stack",
+                                  "justify": "space-between"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
                                   "type": "box",
-                                  "padding": "md",
                                   "children": [
                                     {
-                                      "type": "simple-grid",
-                                      "columns": 3,
+                                      "columns": 3.0,
                                       "children": [
                                         {
                                           "type": "stat-display",
@@ -2038,8 +2272,6 @@
                                           ]
                                         },
                                         {
-                                          "type": "stat-display",
-                                          "label": "Iron",
                                           "value": [
                                             "object/get",
                                             [
@@ -2047,76 +2279,79 @@
                                               "@entity"
                                             ],
                                             "iron"
-                                          ]
+                                          ],
+                                          "type": "stat-display",
+                                          "label": "Iron"
                                         }
-                                      ]
+                                      ],
+                                      "type": "simple-grid"
                                     }
-                                  ]
+                                  ],
+                                  "padding": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "grid",
-                                  "columns": 2,
                                   "gap": "md",
+                                  "type": "grid",
+                                  "columns": 2.0,
                                   "children": [
                                     {
-                                      "type": "card",
                                       "children": [
                                         {
+                                          "content": "Chart View",
                                           "type": "typography",
-                                          "variant": "caption",
-                                          "content": "Chart View"
+                                          "variant": "caption"
                                         }
-                                      ]
+                                      ],
+                                      "type": "card"
                                     },
                                     {
                                       "type": "card",
                                       "children": [
                                         {
                                           "type": "typography",
-                                          "variant": "caption",
-                                          "content": "Graph View"
+                                          "content": "Graph View",
+                                          "variant": "caption"
                                         }
                                       ]
                                     }
                                   ]
                                 },
                                 {
+                                  "title": "Trend",
+                                  "yKey": "value",
+                                  "xKey": "date",
                                   "type": "line-chart",
                                   "data": [
                                     {
                                       "date": "Jan",
-                                      "value": 12
+                                      "value": 12.0
                                     },
                                     {
                                       "date": "Feb",
-                                      "value": 19
+                                      "value": 19.0
                                     },
                                     {
-                                      "date": "Mar",
-                                      "value": 15
+                                      "value": 15.0,
+                                      "date": "Mar"
                                     },
                                     {
-                                      "date": "Apr",
-                                      "value": 25
+                                      "value": 25.0,
+                                      "date": "Apr"
                                     },
                                     {
                                       "date": "May",
-                                      "value": 22
+                                      "value": 22.0
                                     },
                                     {
                                       "date": "Jun",
-                                      "value": 30
+                                      "value": 30.0
                                     }
-                                  ],
-                                  "xKey": "date",
-                                  "yKey": "value",
-                                  "title": "Trend"
+                                  ]
                                 },
                                 {
-                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "label": "Current",
@@ -2126,28 +2361,31 @@
                                       "label": "Previous",
                                       "color": "muted"
                                     }
-                                  ]
+                                  ],
+                                  "type": "chart-legend"
                                 },
                                 {
+                                  "width": 400.0,
+                                  "height": 200.0,
                                   "type": "graph-view",
                                   "nodes": [
                                     {
+                                      "y": 100.0,
+                                      "x": 50.0,
                                       "id": "a",
-                                      "label": "Start",
-                                      "x": 50,
-                                      "y": 100
+                                      "label": "Start"
                                     },
                                     {
-                                      "id": "b",
                                       "label": "Process",
-                                      "x": 200,
-                                      "y": 50
+                                      "y": 50.0,
+                                      "x": 200.0,
+                                      "id": "b"
                                     },
                                     {
                                       "id": "c",
+                                      "x": 350.0,
                                       "label": "End",
-                                      "x": 350,
-                                      "y": 100
+                                      "y": 100.0
                                     }
                                   ],
                                   "edges": [
@@ -2156,12 +2394,10 @@
                                       "to": "b"
                                     },
                                     {
-                                      "from": "b",
-                                      "to": "c"
+                                      "to": "c",
+                                      "from": "b"
                                     }
-                                  ],
-                                  "width": 400,
-                                  "height": 200
+                                  ]
                                 }
                               ]
                             }
@@ -2179,23 +2415,26 @@
                 "effects": [
                   [
                     "fetch",
-                    "Resource"
+                    "Resource",
+                    {
+                      "emit": {
+                        "failure": "ResourceLoadFailed",
+                        "success": "ResourceLoaded"
+                      }
+                    }
                   ],
                   [
                     "render-ui",
                     "main",
                     {
-                      "type": "game-shell",
                       "appName": "Strategy Game",
-                      "showTopBar": true,
                       "children": [
                         {
                           "type": "scaled-diagram",
                           "children": [
                             {
-                              "type": "stack",
                               "direction": "vertical",
-                              "gap": "lg",
+                              "type": "stack",
                               "children": [
                                 {
                                   "type": "breadcrumb",
@@ -2211,46 +2450,43 @@
                                 },
                                 {
                                   "type": "stack",
-                                  "direction": "horizontal",
-                                  "gap": "md",
                                   "justify": "space-between",
+                                  "direction": "horizontal",
                                   "children": [
                                     {
                                       "type": "stack",
                                       "direction": "horizontal",
-                                      "gap": "md",
                                       "children": [
                                         {
+                                          "size": "lg",
                                           "type": "icon",
-                                          "name": "database",
-                                          "size": "lg"
+                                          "name": "database"
                                         },
                                         {
+                                          "variant": "h2",
                                           "type": "typography",
-                                          "content": "Resources",
-                                          "variant": "h2"
+                                          "content": "Resources"
                                         }
-                                      ]
+                                      ],
+                                      "gap": "md"
                                     },
                                     {
-                                      "type": "button",
-                                      "label": "Refresh",
                                       "event": "REFRESH",
                                       "variant": "secondary",
+                                      "label": "Refresh",
+                                      "type": "button",
                                       "icon": "refresh-cw"
                                     }
-                                  ]
+                                  ],
+                                  "gap": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "box",
-                                  "padding": "md",
                                   "children": [
                                     {
-                                      "type": "simple-grid",
-                                      "columns": 3,
+                                      "columns": 3.0,
                                       "children": [
                                         {
                                           "type": "stat-display",
@@ -2266,7 +2502,6 @@
                                         },
                                         {
                                           "type": "stat-display",
-                                          "label": "Food",
                                           "value": [
                                             "object/get",
                                             [
@@ -2274,11 +2509,11 @@
                                               "@entity"
                                             ],
                                             "food"
-                                          ]
+                                          ],
+                                          "label": "Food"
                                         },
                                         {
                                           "type": "stat-display",
-                                          "label": "Wood",
                                           "value": [
                                             "object/get",
                                             [
@@ -2286,11 +2521,10 @@
                                               "@entity"
                                             ],
                                             "wood"
-                                          ]
+                                          ],
+                                          "label": "Wood"
                                         },
                                         {
-                                          "type": "stat-display",
-                                          "label": "Iron",
                                           "value": [
                                             "object/get",
                                             [
@@ -2298,27 +2532,31 @@
                                               "@entity"
                                             ],
                                             "iron"
-                                          ]
+                                          ],
+                                          "label": "Iron",
+                                          "type": "stat-display"
                                         }
-                                      ]
+                                      ],
+                                      "type": "simple-grid"
                                     }
-                                  ]
+                                  ],
+                                  "type": "box",
+                                  "padding": "md"
                                 },
                                 {
                                   "type": "divider"
                                 },
                                 {
-                                  "type": "grid",
-                                  "columns": 2,
+                                  "columns": 2.0,
                                   "gap": "md",
                                   "children": [
                                     {
                                       "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
+                                          "content": "Chart View",
                                           "variant": "caption",
-                                          "content": "Chart View"
+                                          "type": "typography"
                                         }
                                       ]
                                     },
@@ -2326,110 +2564,115 @@
                                       "type": "card",
                                       "children": [
                                         {
-                                          "type": "typography",
                                           "variant": "caption",
-                                          "content": "Graph View"
+                                          "content": "Graph View",
+                                          "type": "typography"
                                         }
                                       ]
                                     }
-                                  ]
+                                  ],
+                                  "type": "grid"
                                 },
                                 {
+                                  "title": "Trend",
                                   "type": "line-chart",
+                                  "xKey": "date",
+                                  "yKey": "value",
                                   "data": [
                                     {
                                       "date": "Jan",
-                                      "value": 12
+                                      "value": 12.0
                                     },
                                     {
                                       "date": "Feb",
-                                      "value": 19
+                                      "value": 19.0
                                     },
                                     {
-                                      "date": "Mar",
-                                      "value": 15
+                                      "value": 15.0,
+                                      "date": "Mar"
                                     },
                                     {
-                                      "date": "Apr",
-                                      "value": 25
+                                      "value": 25.0,
+                                      "date": "Apr"
                                     },
                                     {
-                                      "date": "May",
-                                      "value": 22
+                                      "value": 22.0,
+                                      "date": "May"
                                     },
                                     {
                                       "date": "Jun",
-                                      "value": 30
+                                      "value": 30.0
                                     }
-                                  ],
-                                  "xKey": "date",
-                                  "yKey": "value",
-                                  "title": "Trend"
+                                  ]
                                 },
                                 {
-                                  "type": "chart-legend",
                                   "items": [
                                     {
                                       "label": "Current",
                                       "color": "primary"
                                     },
                                     {
-                                      "label": "Previous",
-                                      "color": "muted"
+                                      "color": "muted",
+                                      "label": "Previous"
                                     }
-                                  ]
+                                  ],
+                                  "type": "chart-legend"
                                 },
                                 {
-                                  "type": "graph-view",
+                                  "height": 200.0,
+                                  "edges": [
+                                    {
+                                      "to": "b",
+                                      "from": "a"
+                                    },
+                                    {
+                                      "to": "c",
+                                      "from": "b"
+                                    }
+                                  ],
                                   "nodes": [
                                     {
                                       "id": "a",
                                       "label": "Start",
-                                      "x": 50,
-                                      "y": 100
+                                      "x": 50.0,
+                                      "y": 100.0
                                     },
                                     {
                                       "id": "b",
                                       "label": "Process",
-                                      "x": 200,
-                                      "y": 50
+                                      "x": 200.0,
+                                      "y": 50.0
                                     },
                                     {
                                       "id": "c",
-                                      "label": "End",
-                                      "x": 350,
-                                      "y": 100
-                                    }
-                                  ],
-                                  "edges": [
-                                    {
-                                      "from": "a",
-                                      "to": "b"
-                                    },
-                                    {
-                                      "from": "b",
-                                      "to": "c"
+                                      "y": 100.0,
+                                      "x": 350.0,
+                                      "label": "End"
                                     }
                                   ],
-                                  "width": 400,
-                                  "height": 200
+                                  "width": 400.0,
+                                  "type": "graph-view"
                                 }
-                              ]
+                              ],
+                              "gap": "lg"
                             }
                           ]
                         }
-                      ]
+                      ],
+                      "showTopBar": true,
+                      "type": "game-shell"
                     }
                   ]
                 ]
               }
             ]
-          }
+          },
+          "scope": "collection"
         }
       ],
       "pages": [
         {
-          "name": "ResourcesPage",
+          "name": "Resources",
           "path": "/resources",
           "traits": [
             {
@@ -2440,4 +2683,4 @@
       ]
     }
   ]
-}
+}