From 07eef18b7598e20ad1bc3b2b0a3e341b1e827d0a Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Fri, 10 May 2024 20:51:00 -0700
Subject: [PATCH] A fresh start

---
 README.md                      |  14 +++-----------
 build.sh                       |  24 ------------------------
 NOTES => old/NOTES             |   0
 {etc => old/etc}/newyork12.uf2 | Bin
 {etc => old/etc}/newyork14.uf2 | Bin
 {etc => old/etc}/newyork24.uf3 | Bin
 {etc => old/etc}/parade.c      |   0
 {src => old/src}/font.tal      |   0
 {src => old/src}/main.tal      |   0
 src/paradise.modal             |  13 +++++++++++++
 10 files changed, 16 insertions(+), 35 deletions(-)
 delete mode 100755 build.sh
 rename NOTES => old/NOTES (100%)
 rename {etc => old/etc}/newyork12.uf2 (100%)
 rename {etc => old/etc}/newyork14.uf2 (100%)
 rename {etc => old/etc}/newyork24.uf3 (100%)
 rename {etc => old/etc}/parade.c (100%)
 rename {src => old/src}/font.tal (100%)
 rename {src => old/src}/main.tal (100%)
 create mode 100644 src/paradise.modal

diff --git a/README.md b/README.md
index cda65f5..908668b 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,13 @@
 # Paradise
 
-In Paradise, you are but a force acting upon places, objects, words — vessels. [Paradise](https://wiki.xxiivv.com/site/parade.html) is a subset of the Paradise interactive fiction engine designed explicitly to explore the possible interactions available within the primitives. This is simply a toy implementation, written in [Uxntal](https://wiki.xxiivv.com/site/uxntal.html).
+In Paradise, you are but a force acting upon places, objects, words — vessels. [Paradise](https://wiki.xxiivv.com/site/parade.html) is a subset of the Paradise interactive fiction engine designed explicitly to explore the possible interactions available within the primitives. This is simply a toy implementation, written in [Modal](https://wiki.xxiivv.com/site/modal.html).
 
 ## Build
 
-You must have the [Uxn](https://git.sr.ht/~rabbits/uxn/) assembler and emulator.
+You must have the [Uxn](https://git.sr.ht/~rabbits/modal/) virtual machine.
 
 ```
-uxnasm src/main.tal bin/paradise.rom && uxnemu bin/paradise.rom
-```
-
-If do not wish to assemble it yourself, you can download [paradise.rom](https://rabbits.srht.site/paradise/paradise.rom).
-
-To build the C version(deprecated).
-
-```
-tcc parade.c -o parade
+modal src/paradise.modal
 ```
 
 ## Getting Started
diff --git a/build.sh b/build.sh
deleted file mode 100755
index a918c47..0000000
--- a/build.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh -e
-
-echo "Cleaning.."
-rm -rf bin
-mkdir bin
-
-echo "Assembling.."
-uxnasm src/main.tal bin/parade.rom 
-
-echo "Installing.."
-if [ -d "$HOME/roms" ] && [ -e ./bin/parade.rom ]
-then
-	cp ./bin/parade.rom $HOME/roms
-    echo "Installed in $HOME/roms" 
-fi
-
-if [ "${1}" = '--push' ]; 
-then
-	echo "Pushing.."
-	~/Applications/butler push bin/parade.rom hundredrabbits/parade:uxn
-fi
-
-echo "Running.."
-uxnemu bin/parade.rom
diff --git a/NOTES b/old/NOTES
similarity index 100%
rename from NOTES
rename to old/NOTES
diff --git a/etc/newyork12.uf2 b/old/etc/newyork12.uf2
similarity index 100%
rename from etc/newyork12.uf2
rename to old/etc/newyork12.uf2
diff --git a/etc/newyork14.uf2 b/old/etc/newyork14.uf2
similarity index 100%
rename from etc/newyork14.uf2
rename to old/etc/newyork14.uf2
diff --git a/etc/newyork24.uf3 b/old/etc/newyork24.uf3
similarity index 100%
rename from etc/newyork24.uf3
rename to old/etc/newyork24.uf3
diff --git a/etc/parade.c b/old/etc/parade.c
similarity index 100%
rename from etc/parade.c
rename to old/etc/parade.c
diff --git a/src/font.tal b/old/src/font.tal
similarity index 100%
rename from src/font.tal
rename to old/src/font.tal
diff --git a/src/main.tal b/old/src/main.tal
similarity index 100%
rename from src/main.tal
rename to old/src/main.tal
diff --git a/src/paradise.modal b/src/paradise.modal
new file mode 100644
index 0000000..9a1317f
--- /dev/null
+++ b/src/paradise.modal
@@ -0,0 +1,13 @@
+?(?-) (Routing)
+
+<> ((quit ?r) parse $ listen) (?(?: ?:) (You quit.\n))
+<> (?x parse) (?(?: ?:) (You said: ?x \n))
+<> (() parse) ()
+
+?(?-) (Input loop)
+
+<> (() input) ()
+<> (?x input) (?(?* ((?*))) ?x parse)
+<> (?~ listen) ((?~) input $ listen)
+
+$ listen