From a9dfc151301b6d3d31404cff72ed193146567181 Mon Sep 17 00:00:00 2001
From: Jeremy Penner <jeremy@sporktania.com>
Date: Thu, 16 May 2019 22:25:13 -0400
Subject: [PATCH] add user choice of dialogue selection

---
 entity.jor   |   2 ++
 footer.jor   |  46 +++++++++++++++++++++++++++++++++++++++++-----
 game.prj     | Bin 5633 -> 5815 bytes
 petehous.jor |   7 ++++++-
 portrait.tif | Bin 7955 -> 7955 bytes
 sprite.tif   | Bin 4078 -> 4078 bytes
 6 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/entity.jor b/entity.jor
index 1a2bd7d..801536d 100755
--- a/entity.jor
+++ b/entity.jor
@@ -58,3 +58,5 @@ array frames
 14 defsingle {chair}
 15 defsingle {pete-bed}
 16 defsingle {horse}
+17 defsingle {mary}
+18 defsingle {phone}
diff --git a/footer.jor b/footer.jor
index 688609f..9a7313d 100755
--- a/footer.jor
+++ b/footer.jor
@@ -25,13 +25,16 @@ var text-color
 WHITE text-color !
 : textxy ( s x y ) <rot text-color @ text ;
 : portraity 1 swap textxy ;
-: statusy 7 swap textxy ;
+: statusy 6 swap textxy ;
 
 var textx
 var texty
 2 const textspeed
+var textleft
+: textleftsay 6 textleft ! ;
+: textleftchoice 8 textleft ! ;
 
-: nltext 6 textx ! 10 texty +! ;
+: nltext textleft @ textx ! 10 texty +! ;
 : inctextx
   textx @ 1 + dup 38 <= if textx !
   else drop nltext inctextx then ;
@@ -55,9 +58,9 @@ var texttimer
 : clear
   text-color @
   WHITE text-color !
-  s"                                 " dup dup 10 statusy 20 statusy 30 statusy
+  s"                                  " dup dup 10 statusy 20 statusy 30 statusy
   text-color !
-  6 textx !
+  textleft @ textx !
   10 texty ! ;
 
 : show-footer 48 10 footer-y move-to ;
@@ -65,9 +68,41 @@ var texttimer
 
 : footer-wait show-footer ^ENTER wait-key ;
 
-: say ( s -- ) clear show-footer slowtext footer-wait ;
+: say ( s -- ) textleftsay clear show-footer slowtext footer-wait ;
 : say" [ ' s" , ] ' say expile ; immediate
 
+defer choosegen
+var ichoose
+var cchoose
+: countchoosegen ( -- )
+  0 choosegen each drop drop 1 + more cchoose ! ;
+
+: getchoice ( -- s cp )
+  0 choosegen
+  each <rot dup ichoose @ < if 1 + >rot drop drop else drop break then more ;
+
+: canchooseleft ichoose @ 0 > ;
+: canchooseright ichoose @ cchoose @ 1 - < ;
+
+: displaychoice
+  clear
+  canchooseleft if s" <" 6 20 textxy then
+  canchooseright if s" >" 38 20 textxy then
+  getchoice drop slowtext ;
+
+: navchoice ( -- done )
+  0 begin suspend
+    ^LEFT key-pressed canchooseleft and if drop 1 -1 ichoose +! then
+    ^RIGHT key-pressed canchooseright and if drop 1 1 ichoose +! then
+    ^ENTER key-pressed if drop 2 then
+  dup until 1 - ;
+
+: choose ( gen -- )
+  ' choosegen redefine countchoosegen 0 ichoose !
+  textleftchoice clear show-footer
+  begin displaychoice navchoice until
+  getchoice swap drop execute ;
+
 : character ( iportrait color ) create , ,
   does> dup @ text-color ! cell + @ draw-portrait ;
 
@@ -75,6 +110,7 @@ var texttimer
 1 MAGENTA character mary
 2 BROWN character chuck
 3 YELLOW character jeanne
+4 LGRAY character phone
 
 : noone WHITE text-color ! s"     " dup dup dup
   8 portraity 16 portraity 24 portraity 32 portraity ;
diff --git a/game.prj b/game.prj
index f55542b7eecaad27e6007d79e19a8e53e75db662..0020605095303246ef5a44b81e820930eea1ee8c 100755
GIT binary patch
delta 329
zcmZqF*{-`GK!8zabD)4TWBnl(eFg@G0G1}^Wh^sUteC4=Vp#tFmu7Kiu48mz(PY`o
z{QrMH^DJg_mQv=W%(s{`n3-AbFz~Z5F+FGIXVPY}U^>fufZ3JlCBr$!r%Z`VVvMy+
zlFS>K*clTTW-)pJNd^WH25pAil}r8D85B5T#5lkt3z$@{2UDyJ7nel(2{MSSZt|03
zkXd5k$HdT(Gu4lu;Y;aMKQ4yPv!?hdGV~SJ`-w3GEm`3w$}j~eE5hJdQtv0pP#!ha
z@Be=f1qFs;1~X}{Qr;U1AR!^3&B6actY9Bc7gs$GhW{Yz_4HzZD8xC&)6dx_RMN#Y
z#?i;e-x(wga$|^VaEOzui=Ol3uYy@DAPt+7g^n_US(9}{WLa33Z}8jfE3$<V0Lx5T
AZ2$lO

delta 169
zcmdn4+o-c4K!A~9bD)4TV<HcWJ_7^8Eao#zADACAw=f-LUdH_Ye=74trV|W(%*D)q
zng0L3$@GM&k$FGUdnOg;O-#N(`AB9TMnmRE#!|*6Msa2?=6=Ti|0NjpnN~9<FdS!0
zX8H}}|NsAlVG2XS<kdo1EFj)yN#Uc6svwr0UJMY0ILCPUIs1gVxW)uW2FC=4IELtX
OFo5L$Z)O(V!UzD`(LlZc

diff --git a/petehous.jor b/petehous.jor
index 49740ed..579d375 100755
--- a/petehous.jor
+++ b/petehous.jor
@@ -3,15 +3,20 @@
 16 5 N ' {pete-table} defentity table
 15 5 N ' {chair} defentity chair
 7 6 N ' {pete-bed} defentity bed
+10 9 N ' {phone} defentity e_phone
 
 table :touch pete say" Yesterday's breakfast is still\on the table."
   say" Maybe the day before's too." ;entity
 chair :touch pete say" I've had my morning coffee\already." ;entity
 bed :touch pete say" I'm not tired yet." ;entity
+e_phone :touch phone
+  :| s" [don't pick up]" :| pete say" Hmm... no answer." |; yield
+     s" Hey Pete, what's up?" :| pete say" Not much, old friend!" |; yield
+     done |; choose ;entity
 
 :noname
   reset-level
-  :| table yield chair yield bed yield done |; ' entities redefine
+  :| table yield chair yield bed yield e_phone yield done |; ' entities redefine
   :|
 touch-begin 16 10 2= dup if
   player move-entity 12 8 pete.jor queue-level
diff --git a/portrait.tif b/portrait.tif
index d8eee3a433236344c44ae5b1b72ee344c9b87aa9..8569e05e1aebdd1213aba893d4254859a5d6e8c9 100755
GIT binary patch
delta 458
zcmaiw%?-jZ422Dsno}=5cLG?UD=-Cf)W_bl2ogJSrW1r`Crx4$2}g?bJ?Hr+VF}Cg
zbh&@X#rVU~W$AA^?C0ys+a}e=3S3#p&KP6rB}~lFa)3w#V#CNg?&PJuU#(ap5DWar
zDq2ZrI(AXE$9bN@*-@En;D+H$tC`;j*8}8)4r`GT;{GR@p_S-%eC<3;;XU8Jah)ts

delta 21
bcmbPiH`#6jBj@H1T;GI&#Cyic&*XFgXJH9+

diff --git a/sprite.tif b/sprite.tif
index ebdcc4260e7649021c1d76a02036eaa07820fb40..c29941ac8f177a4915e5d2d5333f2a4e8ceed63e 100755
GIT binary patch
delta 104
zcmaDS|4x2G8t24M!jmgG+jSX$;Q#;sANct{eBl58KY@*-A%X4xx3q)?4z{#>AkEPL
tr2nUZ!Q_MN;*&41b3ic*FHq<IZ~y=2gXzs5IU89y4lpn@G;nk<007BwF){!E

delta 31
ncmaDS|4x2G8YiRw<aExNn;W>&SSL4dHE<kYU}$LI=wJW<zuF4J