Compare commits

..
9 changed files with 64 additions and 44 deletions

No files matched your search

+5
View File
@@ -1,5 +1,10 @@
# Arcade changelog
## 0.7.81
- Update Shovey to the approved campaign and solve puzzles using wooden crates as water bridges.
- Shovey Editor recognizes device unlocks, returns to the title, accepts right-click movement and shows a clearer object palette.
## 0.7.80
- Keep games covered until their first board is ready and keep complete pictures visible while animation sprites load.
+1 -1
View File
@@ -1 +1 @@
0.7.80
0.7.81
+1 -1
View File
@@ -1 +1 @@
a99851fc40d67a8ca820841722ce2ddde5ca51844e0778c4762681570c488289
a81eb5b14d2066925d19c3fd922865af40c90673cf54fb11bd7f9bf89a29cb98
+7 -7
View File
@@ -13,8 +13,8 @@
"shovey": {
"id": "arcade.shovey",
"title": "Shovey",
"version": "0.6.149",
"sequence": 157,
"version": "0.6.150",
"sequence": 158,
"host_api": 12
},
"shovey-island": {
@@ -27,16 +27,16 @@
"shovey-editor": {
"id": "arcade.shovey-editor",
"title": "Shovey Editor",
"version": "0.2.141",
"sequence": 143,
"version": "0.2.142",
"sequence": 144,
"host_api": 12
},
"arcade": {
"id": "inbe.arcade",
"title": "Arcade",
"version": "0.7.80",
"sequence": 159,
"host_api": 35
"version": "0.7.81",
"sequence": 160,
"host_api": 36
},
"wurm": {
"id": "xyz.waozi.wurm",
+3
View File
@@ -50,6 +50,9 @@ Unknown languages fall back to the game's English text.
Arcade and Inbe still provide separate local/account storage. Sharing one
game implementation does not silently merge or migrate their saved games.
Host API 36 adds read-only records explicitly exported to verified direct
dependencies. Shovey exports its local campaign so Editor can display device
unlocks alongside account progress without uploading device-only progress.
## Updates and publication gate
+2
View File
@@ -89,6 +89,8 @@ def stage(root, controller, expected_controller_digest, output):
# A thin add-on links its required games' verified code as libraries.
if app.get('shared_code'):
child['shared_code'] = True
if app.get('shared_records'):
child['shared_records'] = app['shared_records']
if app.get('requires'):
shared = json.loads((root / 'build/games' / (name + '-resources.json')).read_text())
if shared['dependencies'] != app['requires']:
+7 -1
View File
@@ -9,7 +9,7 @@ import re
from pathlib import Path
import subprocess
APP_KEYS = {'manifest', 'cover', 'enabled', 'requires', 'shared_code', 'library_entries'}
APP_KEYS = {'manifest', 'cover', 'enabled', 'requires', 'shared_code', 'library_entries', 'shared_records'}
COVER_KEYS = {'portrait', 'landscape', 'logo', 'caption', 'action'}
@@ -50,6 +50,11 @@ def declared_packages(root, ziran=None, lock_flags=()):
shared_code = app.get('shared_code', False)
if type(shared_code) is not bool or (shared_code and not requires):
raise ValueError(f'{name}: shared code needs declared dependencies')
shared_records = app.get('shared_records', [])
if not isinstance(shared_records, list) or len(shared_records) > 8 or any(
not isinstance(item, str) or not re.fullmatch(r'[A-Za-z0-9_.-]{1,63}', item) or
item in ('.', '..') for item in shared_records) or len(set(shared_records)) != len(shared_records):
raise ValueError(f'{name}: invalid shared records')
library_entries = app.get('library_entries', [])
if not isinstance(library_entries, list) or len(library_entries) > 64 or \
any(not isinstance(item, str) or len(item) > 253 or
@@ -59,6 +64,7 @@ def declared_packages(root, ziran=None, lock_flags=()):
apps.append(dict(package=name, source=source, manifest=manifest,
descriptor=json.loads(manifest.read_text()),
cover=app.get('cover'), requires=requires, shared_code=shared_code,
shared_records=shared_records,
library_entries=library_entries, enabled=app.get('enabled', True)))
packages.append(dict(name=name, source=source, id=declaration['id'],
title=declaration['title'], apps=apps))
+6 -2
View File
@@ -18,7 +18,7 @@ class GameResourcesTest(unittest.TestCase):
(root / 'games.json').write_text(json.dumps({'packages': []}))
(root / 'catalog.json').write_text(json.dumps({'id': 'editor', 'name': 'editor'}))
app = {'manifest': 'catalog.json', 'requires': ['game'], 'shared_code': True,
'library_entries': ['engine:Step']}
'library_entries': ['engine:Step'], 'shared_records': ['local.campaign']}
def declare(value):
(root / 'apps.json').write_text(json.dumps(
@@ -28,9 +28,13 @@ class GameResourcesTest(unittest.TestCase):
parsed = declare(app)
self.assertTrue(parsed['shared_code'])
self.assertEqual(parsed['library_entries'], ['engine:Step'])
self.assertEqual(parsed['shared_records'], ['local.campaign'])
for invalid in [app | {'requires': []}, app | {'shared_code': 1},
app | {'library_entries': ['engine:../Step']},
app | {'library_entries': ['engine:Step', 'engine:Step']}]:
app | {'library_entries': ['engine:Step', 'engine:Step']},
app | {'shared_records': ['../campaign']},
app | {'shared_records': ['local.campaign', 'local.campaign']},
app | {'shared_records': ['..']}, app | {'shared_records': 'campaign'}]:
with self.subTest(invalid=invalid), self.assertRaises(ValueError):
declare(invalid)
+32 -32
View File
@@ -1,6 +1,14 @@
{
"format": 1,
"packages": [
{
"commit": "dc1cfe389905c63c0bb453727d06d72afc1fa0b0",
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "pa7d5e0ee3b284d04"},
"id": "p00b93f1ddcd2802f",
"name": "Apps",
"ref": "master",
"url": "https://github.com/waozixyz/apps.git"
},
{
"commit": "b31299434c785d0f2bd82f36b5bfd2fd36ba1216",
"dependencies": {},
@@ -20,7 +28,7 @@
},
{
"commit": "1cb9df183089a77c8a16448a556186f30b261a98",
"dependencies": {"kryon": "pc345e310c75f8d37"},
"dependencies": {"kryon": "pa7d5e0ee3b284d04"},
"id": "p1b13dda539ed2a39",
"name": "Kss",
"ref": "master",
@@ -28,7 +36,7 @@
},
{
"commit": "bad2caaa84ef3eae61e40c99bf572d2b060d0ca2",
"dependencies": {"kryon": "pc345e310c75f8d37"},
"dependencies": {"kryon": "pa7d5e0ee3b284d04"},
"id": "p20eb23d3e6db3711",
"name": "Game2D",
"ref": "master",
@@ -45,7 +53,7 @@
},
{
"commit": "be74b13fd9b991e63a96360e8f13d781cece964e",
"dependencies": {"daochi_client": "p9972fcdd2d5ba999", "kryon": "pc345e310c75f8d37", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"dependencies": {"daochi_client": "p9972fcdd2d5ba999", "kryon": "pa7d5e0ee3b284d04", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"id": "p2b0009b9bbaa09de",
"name": "Entity",
"ref": "master",
@@ -62,7 +70,7 @@
},
{
"commit": "2f6f1f57d7de742ef7ebc01159c2315acf793d5b",
"dependencies": {"apps": "p7407a72c65eeeb2b", "crypto": "pc23fbf455e97614d", "curl": "p2f75403ea4cb61e4", "daochi_client": "p9972fcdd2d5ba999", "game2d": "p20eb23d3e6db3711", "kryon": "pc345e310c75f8d37", "kss": "p1b13dda539ed2a39", "liboqs": "p4b0a50b49959e674", "mingcute": "pe1027b9d16704793", "monocypher": "p809b4d31a48625a3", "oqs": "p7098ac9cd92f7e5f", "plot": "pab5377a2950368a2", "qrcode": "p0dfa70137405b096", "rini": "p09fa77e94b0dfc6c", "self": "pa4da0de6c3c44e61", "sqlite": "p219661bf4be659ed"},
"dependencies": {"apps": "p00b93f1ddcd2802f", "crypto": "pc23fbf455e97614d", "curl": "p2f75403ea4cb61e4", "daochi_client": "p9972fcdd2d5ba999", "game2d": "p20eb23d3e6db3711", "kryon": "pa7d5e0ee3b284d04", "kss": "p1b13dda539ed2a39", "liboqs": "p4b0a50b49959e674", "mingcute": "pe1027b9d16704793", "monocypher": "p809b4d31a48625a3", "oqs": "p7098ac9cd92f7e5f", "plot": "pab5377a2950368a2", "qrcode": "p0dfa70137405b096", "rini": "p09fa77e94b0dfc6c", "self": "pa4da0de6c3c44e61", "sqlite": "p219661bf4be659ed"},
"id": "p48228a6b7e2920d3",
"name": "Inbe",
"ref": "master",
@@ -79,7 +87,7 @@
},
{
"commit": "481ec2a6cdee05680bd809d3436134ef670db6ce",
"dependencies": {"apps": "p7407a72c65eeeb2b", "kryon": "pc345e310c75f8d37", "mingcute": "pe1027b9d16704793"},
"dependencies": {"apps": "p00b93f1ddcd2802f", "kryon": "pa7d5e0ee3b284d04", "mingcute": "pe1027b9d16704793"},
"id": "p4b52e2fb4081447c",
"name": "Apfelwurm",
"ref": "master",
@@ -102,22 +110,6 @@
"ref": "master",
"url": "https://github.com/ziranlang/oqs.git"
},
{
"commit": "96e0ac55add63c65bea22dc2395a751e0b048fc1",
"dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "pc345e310c75f8d37"},
"id": "p7407a72c65eeeb2b",
"name": "Apps",
"ref": "master",
"url": "https://github.com/waozixyz/apps.git"
},
{
"commit": "83c89a86b0047f1d539c2465ad87087597a8c156",
"dependencies": {"apps": "p7407a72c65eeeb2b", "entity": "p2b0009b9bbaa09de", "kryon": "pc345e310c75f8d37", "mingcute": "pe1027b9d16704793"},
"id": "p7e870c2925a901aa",
"name": "Shovey",
"ref": "master",
"url": "https://github.com/waozixyz/shovey.git"
},
{
"commit": "f5f0a19a5dc6c14a49adb3cd63ea79a60f6ba77b",
"dependencies": {},
@@ -127,6 +119,14 @@
"source": true,
"url": "https://github.com/LoupVaillant/Monocypher.git"
},
{
"commit": "68435298b9585004cd3cce6ed6316a2a02e6e9bf",
"dependencies": {"apps": "p00b93f1ddcd2802f", "entity": "p2b0009b9bbaa09de", "kryon": "pa7d5e0ee3b284d04", "mingcute": "pe1027b9d16704793"},
"id": "p84d02bbf02a6c436",
"name": "Shovey",
"ref": "master",
"url": "https://github.com/waozixyz/shovey.git"
},
{
"commit": "25d9f649c43a8de44a5fea602d2835e33e6ca999",
"dependencies": {"crypto": "pc23fbf455e97614d", "oqs": "p7098ac9cd92f7e5f"},
@@ -137,15 +137,23 @@
},
{
"commit": "357a71d1ee2c7c9526c2af18793ea8628c505034",
"dependencies": {"daochi_client": "p9972fcdd2d5ba999", "kryon": "pc345e310c75f8d37", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"dependencies": {"daochi_client": "p9972fcdd2d5ba999", "kryon": "pa7d5e0ee3b284d04", "monocypher": "p809b4d31a48625a3", "qrcode": "p0dfa70137405b096"},
"id": "pa4da0de6c3c44e61",
"name": "Self",
"ref": "master",
"url": "https://github.com/waozixyz/self.git"
},
{
"commit": "bab522f4edf3dee69827fbd09fafb2639311e1c6",
"dependencies": {"raylib": "p5a77c9c35110e925"},
"id": "pa7d5e0ee3b284d04",
"name": "kryon",
"ref": "master",
"url": "https://github.com/kryonlabs/kryon.git"
},
{
"commit": "3f888653b6b97010163d824c4cc72476be3214f3",
"dependencies": {"kryon": "pc345e310c75f8d37"},
"dependencies": {"kryon": "pa7d5e0ee3b284d04"},
"id": "pab5377a2950368a2",
"name": "plot",
"ref": "master",
@@ -159,14 +167,6 @@
"ref": "master",
"url": "https://github.com/ziranlang/crypto.git"
},
{
"commit": "919a18d7fca3b052c1a694aff105f5937d723e3f",
"dependencies": {"raylib": "p5a77c9c35110e925"},
"id": "pc345e310c75f8d37",
"name": "kryon",
"ref": "master",
"url": "https://github.com/kryonlabs/kryon.git"
},
{
"commit": "9cc6872f75447c3a24c16764f9829d0f58751cb0",
"dependencies": {},
@@ -177,7 +177,7 @@
}
],
"root": {
"dependencies": {"apps": "p7407a72c65eeeb2b", "entity": "p2b0009b9bbaa09de", "inbe": "p48228a6b7e2920d3", "kryon": "pc345e310c75f8d37", "mingcute": "pe1027b9d16704793", "shovey": "p7e870c2925a901aa", "wurm": "p4b52e2fb4081447c"},
"dependencies": {"apps": "p00b93f1ddcd2802f", "entity": "p2b0009b9bbaa09de", "inbe": "p48228a6b7e2920d3", "kryon": "pa7d5e0ee3b284d04", "mingcute": "pe1027b9d16704793", "shovey": "p84d02bbf02a6c436", "wurm": "p4b52e2fb4081447c"},
"name": "Arcade"
},
"toolchain": {