Normalize code style to match established conventions

An assistant-written stretch of code had drifted from the conventions the
older hand-written files establish. Sweeps the whole of src/ back into line.

Systematic:
- @returns -> @return (163 occurrences, 84 files). Concentrated in ui/ and
  rpg/cutscene/; the rest of the tree already used @return 646 times.
- Lowercase "null" -> "NULL" in assert/error message strings (170
  occurrences, 28 files), matching the dominant 441-use spelling. Covers
  "cannot be null", "must not be null" and adjectival uses.

Localized:
- sort.c: drop a stray #include <stdlib.h> that sat *above* the copyright
  header, leaving it the only file in the repo without a leading header
  block. Also drops the same redundant include from random.c and npcturn.c
  (dusk.h already pulls in stdlib.h).
- Convert 7 files' license headers from // lines to the /** */ block form.
- cutscenesystem.c: memset -> memoryZero, matching the identical call ~20
  lines further down and the rest of the codebase.
- Struct tags suffixed _t -> _s: threadlock_t -> threadmutex_s (which also
  makes the tag match its typedef) and chunkpos_t -> chunkpos_s.
- Convert 20 inline /* */ block comments to // across the mesh builders,
  assetfile.c and assetlocaleloader.c.
- Pointer truthiness if(!ptr) -> if(ptr == NULL) in 16 places, matching the
  267 existing explicit comparisons. Boolean !x checks are left alone.
- entityanim.h: drop a JSDoc-style type annotation from an @return.
- Document easing.h's 16 undeclared easing functions and
  assetjsonloader.h's 3 loader callbacks.

No behavioral change. Builds clean with no new warnings; ctest shows the
same 6 pre-existing failures as HEAD, verified against a pristine worktree.

Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>

.gitignore

@@ -91,7 +91,7 @@ assets/borrowed
 
 /archive0
 /archive1
-/archive
+# /archive
 
 __pycache__
 

CMakeLists.txt

@@ -142,30 +142,13 @@ endif()
 # asset edit. tools.asset.pack itself decides whether anything actually
 # changed (see its manifest check) and no-ops quickly when nothing did,
 # so this stays cheap on a build where assets are untouched.
-#
-# A .ds script under assets/ is compiled to .dsb by duskscriptcc as part of
-# packing, so dusk.dsk only ever carries bytecode. duskscriptcc is a host
-# tool, only built when target_system is the build host (linux/knulli, see
-# src/CMakeLists.txt) - a cross-compiled console target has no duskscriptcc
-# of its own to depend on or pass down, so it can only pack assets with no
-# .ds in them until something sets up a host-built duskscriptcc for it too.
-if(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "knulli")
-  set(DUSK_ASSET_PACK_DUSKSCRIPTCC_ARGS --duskscriptcc "$<TARGET_FILE:duskscriptcc>")
-  set(DUSK_ASSET_PACK_DEPENDS duskscriptcc)
-else()
-  set(DUSK_ASSET_PACK_DUSKSCRIPTCC_ARGS "")
-  set(DUSK_ASSET_PACK_DEPENDS "")
-endif()
-
 add_custom_target(DUSK_ASSETS_BUILT ALL
   COMMAND ${CMAKE_COMMAND} -E make_directory "${DUSK_ASSETS_DIR}"
   COMMAND ${Python3_EXECUTABLE} -m tools.asset.pack
     --input "${DUSK_ASSETS_DIR}"
     --output "${DUSK_ASSETS_ZIP}"
-    ${DUSK_ASSET_PACK_DUSKSCRIPTCC_ARGS}
   WORKING_DIRECTORY "${DUSK_ROOT_DIR}"
   BYPRODUCTS "${DUSK_ASSETS_ZIP}"
-  DEPENDS ${DUSK_ASSET_PACK_DEPENDS}
   COMMENT "Packing assets into dusk.dsk"
   VERBATIM
 )

assets/cutscenes/initial.jsonc

@@ -0,0 +1,68 @@
+{
+  "items": [
+    // First thing, try and find a save device, used for settings and what not.
+    {
+      "type": "MODAL",
+      "title": "initial.checking_save.title",
+      "message": "initial.checking_save.message"
+    },
+    {
+      "type": "WAIT",
+      "seconds": 0.2
+    },
+    {
+      "type": "SAVE_DEVICE_CHECK",
+      "successMarker": "CONTINUE",
+      "failureMarker": "SAVE_DEVICE_NOT_FOUND"
+    },
+
+    // No save device found
+    {
+      "type": "MARKER",
+      "name": "SAVE_DEVICE_NOT_FOUND"
+    },
+    {
+      "type": "MODAL_CLOSE"
+    },
+    {
+      "type": "MODAL_OPTIONS_MARKERS",
+      "title": "initial.no_device.title",
+      "message": "initial.no_device.message",
+      "options": [
+        {
+          "text": "initial.no_device.retry",
+          "marker": "SAVE_DEVICE_RETRY"
+        },
+        {
+          "text": "initial.no_device.continue",
+          "marker": "CONTINUE"
+        }
+      ]
+    },
+
+    // Save device not found, user to retry, just close modal and loop
+    {
+      "type": "MARKER",
+      "name": "SAVE_DEVICE_RETRY"
+    },
+    {
+      "type": "MODAL_CLOSE"
+    },
+    {
+      "type": "RESTART"
+    },
+
+    // Save device found (or continuing without one)
+    {
+      "type": "MARKER",
+      "name": "CONTINUE"
+    },
+    {
+      "type": "MODAL_CLOSE"
+    },
+    {
+      "type": "CUTSCENE",
+      "name": "main_menu"
+    }
+  ]
+}

assets/cutscenes/main_menu.jsonc

@@ -0,0 +1,140 @@
+{
+  "items": [
+    {
+      "type": "MARKER",
+      "name": "MAIN_MENU_IDLE"
+    },
+    {
+      "type": "UI_SHOW",
+      "name": "main_menu"
+    },
+
+    // Options button goes here - no options screen yet, so this is just
+    // an alias landing right back on the idle loop below.
+    {
+      "type": "MARKER",
+      "name": "OPTIONS"
+    },
+    {
+      "type": "IDLE"
+    },
+
+    // New Game button goes here.
+    {
+      "type": "MARKER",
+      "name": "NEW_GAME"
+    },
+    {
+      "type": "MODAL",
+      "title": "main_menu.checking_save.title",
+      "message": "main_menu.checking_save.message"
+    },
+    {
+      "type": "WAIT",
+      "seconds": 0.2
+    },
+    {
+      "type": "SAVE_DEVICE_CHECK",
+      "successMarker": "SAVE_DEVICE_FOUND",
+      "failureMarker": "SAVE_DEVICE_NOT_FOUND"
+    },
+
+    // Save device not found
+    {
+      "type": "MARKER",
+      "name": "SAVE_DEVICE_NOT_FOUND"
+    },
+    {
+      "type": "MODAL_CLOSE"
+    },
+    {
+      "type": "MODAL_OPTIONS_MARKERS",
+      "title": "main_menu.no_device.title",
+      "message": "main_menu.no_device.message",
+      "options": [
+        {
+          "text": "main_menu.no_device.retry",
+          "marker": "NEW_GAME"
+        },
+        {
+          "text": "main_menu.no_device.continue",
+          "marker": "SAVE_DEVICE_FOUND"
+        }
+      ]
+    },
+
+    // Save data failed to load (e.g. corrupt/unreadable) - only option is
+    // to retry, no "continue without saving" here since we already know a
+    // device is present.
+    {
+      "type": "MARKER",
+      "name": "LOAD_ERROR"
+    },
+    {
+      "type": "MODAL_OPTIONS_MARKERS",
+      "title": "main_menu.save_load_error.title",
+      "message": "main_menu.save_load_error.message",
+      "options": [
+        {
+          "text": "main_menu.save_load_error.retry",
+          "marker": "NEW_GAME"
+        }
+      ]
+    },
+
+    // Quit Game button goes here. Cancelling jumps back to
+    // MAIN_MENU_IDLE; confirming falls through to QUIT_GAME, which
+    // ends the process directly.
+    {
+      "type": "MARKER",
+      "name": "QUIT"
+    },
+    {
+      "type": "MODAL_OPTIONS_MARKERS",
+      "title": "main_menu.quit_confirm",
+      "options": [
+        {
+          "text": "ui.confirm.confirm",
+          "marker": "QUIT_CONFIRMED"
+        },
+        {
+          "text": "ui.confirm.cancel",
+          "marker": "MAIN_MENU_IDLE"
+        }
+      ]
+    },
+    
+    {
+      "type": "MARKER",
+      "name": "QUIT_CONFIRMED"
+    },
+    {
+      "type": "QUIT_GAME"
+    },
+
+    // main menu just listens for cutscene ending to show the select save modal
+    // so we have that here.
+    {
+      "type": "MARKER",
+      "name": "SAVE_DEVICE_FOUND"
+    },
+    {
+      "type": "MODAL_CLOSE"
+    },
+    {
+      "type": "SAVE_LOAD_ALL_SLOTS",
+      "successMarker": "LOADED",
+      "failureMarker": "LOAD_ERROR"
+    },
+
+    // Must be the very last item - falling off the end here is what
+    // completes the cutscene and fires uiMainMenuOpenSelectSave (see
+    // cutsceneSystemSetOnComplete in ui/screen/mainmenu/uimainmenu.c).
+    // Placing this anywhere earlier would fall through into whatever
+    // comes next instead (e.g. the QUIT block, if placed just before it).
+    {
+      "type": "MARKER",
+      "name": "LOADED"
+    }
+  ]
+}

assets/init.ds

@@ -1,20 +0,0 @@
-// Entry point, run once by the engine after every other system is ready.
-
-var camera = entityAdd();
-var cameraPosition = entityAddComponent(camera, COMPONENT_TYPE_POSITION);
-entityAddComponent(camera, COMPONENT_TYPE_CAMERA);
-entityPositionLookAt(camera, cameraPosition, 3, 3, 3, 0, 0, 0);
-
-var cube = entityAdd();
-var cubePosition = entityAddComponent(cube, COMPONENT_TYPE_POSITION);
-var cubeRenderable = entityAddComponent(cube, COMPONENT_TYPE_RENDERABLE);
-entityRenderableSetMesh(cube, cubeRenderable, "cube");
-entityPositionSetLocalPosition(cube, cubePosition, 0, 0, 0);
-
-var plane = entityAdd();
-var planePosition = entityAddComponent(plane, COMPONENT_TYPE_POSITION);
-var planeRenderable = entityAddComponent(plane, COMPONENT_TYPE_RENDERABLE);
-entityRenderableSetMesh(plane, planeRenderable, "plane");
-entityPositionSetLocalPosition(plane, planePosition, 0, 0, 0);
-
-consolePrint("Camera, cube and plane created");

assets/locale/en_US.po

@@ -73,12 +73,6 @@ msgstr "Select Save"
 msgid "ui.select_save.empty"
 msgstr "Empty Slot"
 
-msgid "ui.select_save.corrupt"
-msgstr "Corrupted Save"
-
-msgid "ui.select_save.corrupt_warning"
-msgstr "This save file is corrupted and could not be loaded. Please contact support if this issue persists."
-
 msgid "ui.select_save.slot_format"
 msgstr "%s  Lv.%d  %s"
 
@@ -266,10 +260,6 @@ msgstr "loading"
 msgid "ui.autosave.saving"
 msgstr "SAVING"
 
-
-#
-# Items
-#
 msgid "item.potion.name"
 msgstr "Potion"
 
@@ -277,13 +267,4 @@ msgid "item.potato.name"
 msgstr "Potato"
 
 msgid "item.apple.name"
-msgstr "Apple"
+msgstr "Apple"
-
-#
-# Moves
-#
-msgid "move.fire.name"
-msgstr "Fire"
-
-msgid "move.slash.name"
-msgstr "Slash"

assets/models/buildings/house_1_1.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_1.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_1_2.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_2.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_1_3.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_3.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_1_4.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_4.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_1_5.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_5.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_1_6.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_6.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_1_7.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_7.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_1_8.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_1_8.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_1.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_1.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_2.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_2.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_3.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_3.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_4.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_4.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_5.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_5.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_6.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_6.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_7.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_7.dmf",
+  "color": [255, 0, 255, 255]
+}

assets/models/buildings/house_2_8.json

@@ -0,0 +1,4 @@
+{
+  "mesh": "meshes/buildings/house_2_8.dmf",
+  "color": [255, 0, 255, 255]
+}