Dev (#63)

goldbuick · Jan 2, 2025 · 2d36347 · 2d36347
2 parents 4904d95 + 9d9229a
commit 2d36347
Show file tree

Hide file tree

Showing 11 changed files with 264 additions and 269 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zed-software-system",
   "private": true,
-  "version": "0.21.19",
+  "version": "0.21.22",
   "type": "module",
   "scripts": {
     "sloc": "npx sloc zss",

diff --git a/zss/device/synth.ts b/zss/device/synth.ts
@@ -517,6 +517,7 @@ function createsynth() {
           // reset starting offset
           --pacercount
           if (pacercount === 0) {
+            pacer.clear()
             pacertime = -1
           }
           break

diff --git a/zss/gadget/data/state.ts b/zss/gadget/data/state.ts
@@ -44,8 +44,8 @@ export const TAPE_MAX_LINES = 128
 
 export enum TAPE_DISPLAY {
   TOP,
-  BOTTOM,
   FULL,
+  BOTTOM,
   SPLIT_Y,
   SPLIT_Y_ALT,
   MAX,

diff --git a/zss/mapping/2d.ts b/zss/mapping/2d.ts
@@ -30,7 +30,7 @@ export function ptwithin(
   return x >= left && x <= right && y >= top && y <= bottom
 }
 
-export function linePoints(
+export function linepoints(
   x0: number,
   y0: number,
   x1: number,
@@ -62,7 +62,7 @@ export function linePoints(
   return points
 }
 
-function ellipsePoints(
+function ellipsepoints(
   points: PT[],
   x0: number,
   y0: number,
@@ -75,7 +75,7 @@ function ellipsePoints(
   points.push({ x: x0 - x, y: y0 - y })
 }
 
-export function circlePoints(x0: number, y0: number, r: number) {
+export function circlepoints(x0: number, y0: number, r: number) {
   const points: PT[] = []
 
   let d = 5 - 4 * r
@@ -87,8 +87,8 @@ export function circlePoints(x0: number, y0: number, r: number) {
   let deltaB = 3 * 4
 
   while (x <= y) {
-    ellipsePoints(points, x0, y0, x, y)
-    ellipsePoints(points, x0, y0, y, x)
+    ellipsepoints(points, x0, y0, x, y)
+    ellipsepoints(points, x0, y0, y, x)
 
     if (d > 0) {
       d += deltaA

diff --git a/zss/mapping/array.ts b/zss/mapping/array.ts
@@ -24,12 +24,12 @@ export function range(a: number, b?: number, step?: number) {
   return list
 }
 
-function randomItem<T>(array: T[]) {
+function randomitem<T>(array: T[]) {
   return array[randominteger(0, array.length - 1)]
 }
 
 export function pick<T>(...args: T[]) {
-  return randomItem(args.flat())
+  return randomitem(args.flat())
 }
 
 export function addToArray<T>(array: T[], value: T) {

diff --git a/zss/memory/book.ts b/zss/memory/book.ts
@@ -195,7 +195,8 @@ export function bookelementdisplayread(
   return {
     char: element?.char ?? kind?.char ?? 1,
     color: element?.color ?? kind?.color ?? COLOR.WHITE,
-    bg: element?.bg ?? kind?.bg ?? COLOR.ONBORROW,
+    bg: element?.bg ?? kind?.bg ?? COLOR.ONCLEAR,
+    light: element?.light ?? kind?.light,
   }
 }
 

diff --git a/zss/memory/codepage.ts b/zss/memory/codepage.ts
@@ -273,6 +273,7 @@ function applyelementstats(codepage: CODE_PAGE, element: BOARD_ELEMENT) {
       case 'char':
       case 'color':
       case 'bg':
+      case 'light':
       case 'p1':
       case 'p2':
       case 'p3':
@@ -334,6 +335,28 @@ export function codepagereaddata<T extends CODE_PAGE_TYPE>(
         codepage.board = createboard()
       }
       codepage.board.id = codepage.id
+      const stats = codepagereadstatdefaults(codepage)
+      codepage.board.isdark = ispresent(stats.isdark) && stats.isdark ? 1 : 0
+      // @ts-expect-error ugh
+      codepage.board.over = stats.over ?? codepage.board.over
+      // @ts-expect-error ugh
+      codepage.board.under = stats.under ?? codepage.board.under
+      // @ts-expect-error ugh
+      codepage.board.exitnorth = stats.exitnorth ?? codepage.board.exitnorth
+      // @ts-expect-error ugh
+      codepage.board.exitsouth = stats.exitsouth ?? codepage.board.exitsouth
+      // @ts-expect-error ugh
+      codepage.board.exitwest = stats.exitwest ?? codepage.board.exitwest
+      // @ts-expect-error ugh
+      codepage.board.exiteast = stats.exiteast ?? codepage.board.exiteast
+      // @ts-expect-error ugh
+      codepage.board.timelimit = stats.timelimit ?? codepage.board.timelimit
+      // @ts-expect-error ugh
+      codepage.board.restartonzap =
+        stats.restartonzap ?? codepage.board.restartonzap
+      // @ts-expect-error ugh
+      codepage.board.maxplayershots =
+        stats.maxplayershots ?? codepage.board.maxplayershots
       return codepage.board as MAYBE<CODE_PAGE_TYPE_MAP[T]>
     }
     case CODE_PAGE_TYPE.OBJECT: {
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,8 +44,8 @@ export const TAPE_MAX_LINES = 128 @@
     export enum TAPE_DISPLAY {
       TOP,
-      BOTTOM,
       FULL,
+      BOTTOM,
       SPLIT_Y,
       SPLIT_Y_ALT,
       MAX,
@@ Expand Down @@