From b88efc7707806aae0ff2eba22eed8d5daa52b7cc Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 10 Oct 2021 22:35:56 -0400 Subject: [PATCH] peasant: add a few more priorities --- games/peasant/TODO | 6 ++++ games/peasant/graphics/Makefile | 33 +++++++++++++++--- .../graphics/bottom_prints_priority.png | Bin 0 -> 862 bytes games/peasant/graphics/empty_hut_priority.png | Bin 0 -> 973 bytes games/peasant/graphics/ned_priority.png | Bin 0 -> 905 bytes 5 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 games/peasant/graphics/bottom_prints_priority.png create mode 100644 games/peasant/graphics/empty_hut_priority.png create mode 100644 games/peasant/graphics/ned_priority.png diff --git a/games/peasant/TODO b/games/peasant/TODO index 4043a2d3..31a55da1 100644 --- a/games/peasant/TODO +++ b/games/peasant/TODO @@ -17,6 +17,12 @@ TODO: + optimize text box sizes + replace parse_input lookup with a giant jump table +Border special cases: + + Mountain pass walking to Inn + + Jhonka cave walking to Cottage + + + General: - More frames in peasant sprites - Hook up text parser diff --git a/games/peasant/graphics/Makefile b/games/peasant/graphics/Makefile index f0058878..ba313924 100644 --- a/games/peasant/graphics/Makefile +++ b/games/peasant/graphics/Makefile @@ -138,12 +138,14 @@ priority_peasant3.inc: \ ### priority_peasant4.inc: \ - todo_priority.lzsa \ + empty_hut_priority.lzsa \ + ned_priority.lzsa \ + bottom_prints_priority.lzsa \ lady_cottage_priority.lzsa \ crooked_tree_priority.lzsa - echo "empty_hut_priority_lzsa: .incbin \"todo_priority.lzsa\"" > priority_peasant4.inc - echo "ned_priority_lzsa: .incbin \"todo_priority.lzsa\"" >> priority_peasant4.inc - echo "bottom_prints_priority_lzsa: .incbin \"todo_priority.lzsa\"" >> priority_peasant4.inc + echo "empty_hut_priority_lzsa: .incbin \"empty_hut_priority.lzsa\"" > priority_peasant4.inc + echo "ned_priority_lzsa: .incbin \"ned_priority.lzsa\"" >> priority_peasant4.inc + echo "bottom_prints_priority_lzsa: .incbin \"bottom_prints_priority.lzsa\"" >> priority_peasant4.inc echo "lady_cottage_priority_lzsa: .incbin \"lady_cottage_priority.lzsa\"" >> priority_peasant4.inc echo "crooked_tree_priority_lzsa: .incbin \"crooked_tree_priority.lzsa\"" >> priority_peasant4.inc @@ -335,6 +337,13 @@ todo.hgr: todo.png ########################################### ########################################### +### + +bottom_prints_priority.lzsa: bottom_prints_priority.hgr + $(LZSA) -r -f2 bottom_prints_priority.hgr bottom_prints_priority.lzsa + +bottom_prints_priority.hgr: bottom_prints_priority.png + $(PNG2GR) bottom_prints_priority.png bottom_prints_priority.hgr ### @@ -354,6 +363,14 @@ crooked_tree_priority.hgr: crooked_tree_priority.png ### +empty_hut_priority.lzsa: empty_hut_priority.hgr + $(LZSA) -r -f2 empty_hut_priority.hgr empty_hut_priority.lzsa + +empty_hut_priority.hgr: empty_hut_priority.png + $(PNG2GR) empty_hut_priority.png empty_hut_priority.hgr + +### + inn_priority.lzsa: inn_priority.hgr $(LZSA) -r -f2 inn_priority.hgr inn_priority.lzsa @@ -386,6 +403,14 @@ leaning_tree_priority.hgr: leaning_tree_priority.png ### +ned_priority.lzsa: ned_priority.hgr + $(LZSA) -r -f2 ned_priority.hgr ned_priority.lzsa + +ned_priority.hgr: ned_priority.png + $(PNG2GR) ned_priority.png ned_priority.hgr + +### + river_priority.lzsa: river_priority.hgr $(LZSA) -r -f2 river_priority.hgr river_priority.lzsa diff --git a/games/peasant/graphics/bottom_prints_priority.png b/games/peasant/graphics/bottom_prints_priority.png new file mode 100644 index 0000000000000000000000000000000000000000..924e6f4818cea43dce689bf6c1265709a57125fb GIT binary patch literal 862 zcmeAS@N?(olHy`uVBq!ia0y~yV3Yu|4{$I8$roNd9zcPXOlRi+PiJR^f};Gi%$!sP z291fe6Ky>XJIEZ34_+Fi)l?=>cp_k~PDhtTmS|Ui;uWs7Rx@ILvHD6)5)pSlxb?w< z<4IQ!9*qoV4|f#!!%$dU98@w<=>K$)s3R2xclyh}%ay-pSQwZ%>#8YV#;)9DlQ|7% zM~gbI=WuqgegFWf(~#PN~)I&HcAg?hVmKAc%G)APKrd*{(4c5T@+Ud!BUTxEhy=YDEk zb6o4W?zyO?$D+PJ(eHWkb!zIm%Q9|4-4RVJf?Qb|iNM+{u-!k!>-rPD z6~iTaWVly2HNW|F@c)DI?O};UhrGK~8s3Q?|0%)fwA*3xJB$0r`!3rsHl05(_1?E| z=>uofUw+*tX3g|#TVwa@ZOh&;PPabrV6x)uP1>xPT&+wW>fG*6VP?x~{4nc!bhi9* zeuuVQUUwPT+Ye+++;qM6-rdVLZ|_f!`umqb*S4rTDCU_pFj|ZQd_r7-^kcb%1i!ui zUH&pGPM9-ij>!4H7Y_eVC}RGfWixl~-2V$MhHy~NYkmHjCfHxq|;0k4EOP)M@GHKN2hKQ}iuuY|$5C^fMp zHASI3vm`^o-P1Q9ypa#6h>_FN#WAGf*4qmkIT;K%7#uI}{C{L+>lLMEbxqG7y@*s` zU}ocyFi1Giz{t$j116zdWvC#S%K;|;@J&`l76s{nYo;n=OZ*g&TheMF4uhJF#Ys>n mFd;bv#TU$O5EIUP(DUZ|__5;o+j3yYF?hQAxvXXJIEZ34_+Fi)l?=>cp_k~PDhtTmS|Ui;uWs7Rx@ILvHD6)5)pSlxb?w< z<4IQ!9*qoV4|f#!!%$dU98@w<=>K$)s3R2xclyh}%ay-pSQwZ%>#8YV#;)9DlQ|7% zM~gbI=WuqgegFWf(~#PN~)I&HcAg?hVmKAc%G)APKrd*{(4c5T@+Ud!BUTxEhy=YDEk zb6o4W?zyO?$D+PJ(eHWkb!zIm%Q9|4-4RVJf?Qb|iNM+{u-!k!>-rPD z6~iTaWVly2HNW|F@c)DI?O};UhrGK~8s3Q?|0%)fwA*3xJB$0r`!3rsHl05(_1?E| z=>uofUw+*tX3g|#TVwa@ZOh&;PPabrV6x)uP1>xPT&+wW>fG*6VP?x~{4nc!bhi9* zeuuVQUUwPT+Ye+++;qM6-rdVLZ|_f!`umqb*S4rTDCU_pFj|ZQd_r7-^kcb%1i!ui zUH&pGPM9-ij>!4H7Y_eVC}RGfWixl~-2V$MhHy~NYkmHjCfH=~8};%gH9Kq1Kz*N775{M_8syb=cIqSVBa z)D(sC%#sWRcTeAd@J2pyVA`ngba4!+xb^n7Az!lrkHf_c2H*Z2e|tf1ssNLq`nu2m z7?moTTb(YM$zBs^U}R?FkuXR&0A#p`s`OAdf?| z`m{s_vB1ItA`~M6lAN*pu7wCE++~}WoZz(v+1WYgyb3~lL*yp&TbmzW`D>$J0gNaH MPgg&ebxsLQ0H5rECjbBd literal 0 HcmV?d00001 diff --git a/games/peasant/graphics/ned_priority.png b/games/peasant/graphics/ned_priority.png new file mode 100644 index 0000000000000000000000000000000000000000..8514227ca30fe5eee562857be23df5b7ac54d075 GIT binary patch literal 905 zcmeAS@N?(olHy`uVBq!ia0y~yV3Yu|4{$I8$roNd9zcPXOlRi+PiJR^f};Gi%$!sP z291fe6Ky>XJIEZ34_+Fi)l?=>cp_k~PDhtTmS|Ui;uWs7Rx@ILvHD6)5)pSlxb?w< z<4IQ!9*qoV4|f#!!%$dU98@w<=>K$)s3R2xclyh}%ay-pSQwZ%>#8YV#;)9DlQ|7% zM~gbI=WuqgegFWf(~#PN~)I&HcAg?hVmKAc%G)APKrd*{(4c5T@+Ud!BUTxEhy=YDEk zb6o4W?zyO?$D+PJ(eHWkb!zIm%Q9|4-4RVJf?Qb|iNM+{u-!k!>-rPD z6~iTaWVly2HNW|F@c)DI?O};UhrGK~8s3Q?|0%)fwA*3xJB$0r`!3rsHl05(_1?E| z=>uofUw+*tX3g|#TVwa@ZOh&;PPabrV6x)uP1>xPT&+wW>fG*6VP?x~{4nc!bhi9* zeuuVQUUwPT+Ye+++;qM6-rdVLZ|_f!`umqb*S4rTDCU_pFj|ZQd_r7-^kcb%1i!ui zUH&pGPM9-ij>!4H7Y_eVC}RGfWixl~-2V$MhHy~NYkmHjCfH}mhCUofI^Zbt`Q~9`MJ5Nc_j?aMX8A; zsVNHOnI#zt?w-B@;f;Laz_elF>EaktaqI0ZL#_q`9*2u1MPL4HFD)q0yd-u+ZO{JF zT4#=h7q93FG%zx=@kkgX8~`$wxjpv=GvFe)7&fwp8-W_neEM)!iHVJ8#ubCR;!s1_ ze43oEew!@|*p&88Ymf_nehOg4 q