From 3014b30959157f89c568c6a5485284d357198718 Mon Sep 17 00:00:00 2001
From: Peter Ferrie <peter.ferrie@gmail.com>
Date: Wed, 12 Jun 2019 21:39:36 -0700
Subject: [PATCH] support Bureaucracy r160, Trinity r15 save

---
 ...rk.master games collection.do.not.edit.2mg | Bin 33553984 -> 33553984 bytes
 src/zinfo/z4/gamedata.txt                     | 109 +++++++++++++++++-
 2 files changed, 103 insertions(+), 6 deletions(-)

diff --git a/res/Pitch Dark.master games collection.do.not.edit.2mg b/res/Pitch Dark.master games collection.do.not.edit.2mg
index 9ec5aa3a7a1992c215115c778cd82fc7d779e21d..68c4b196ce4148425dc3594e50b62af8e925a7d4 100644
GIT binary patch
delta 82091
zcmeIy_g9s50LStBTyW+{Ath4LR8%wsvO=x6w6kGJdzdz9XT!Exnp9R$s1GfZthDK>
zXo|Ln?Y+&W6=u^)lHT9yG!Fg+o%av#&w+>UbMJFrz+KYV)Nu*T-zO(6k!ZDOY|aPm
zs!z#jJE>$)MaiIul9Wd2)Ph=4D{4(`s4Z<k?WjF<ppLX5b)wFcL7B7>b)l}5MH^E#
zZ9?6sJN2L(>Pfw5Q|e89s4wMGKk82dD31nGc;3w@p9WI_6;csxPD5x5+LE@SVj4=r
zXgF<6+t9XDLMbYx?Pz=2fp(;wXlL4mcBK)t8|_Ye(4I7s_M*LM6qV6Fv@h*P`_ln*
zARR;p(;;*yji$qB42`A3=?FTKj-sRKn7Wcd<<XewEqdn16Kj&M%uBu6EsElo9$47D
zZvN9Bu1MpXsLg{@!w=7>NL829v2+|APbbicbP}CRr_eY$l}@A6Dcm=n&ZM*GY&wU|
zrSs@~nm`xOM7oeJqDeHFE~Y6|L6^{_bQw*h%jpWbk}9c+uA-}{nx@fonn5wu&^2@|
zT}Ri`4K$N(q*+u;H_>dmnQoz5X%5Y$+vs+>gYKle=x&-v^XpR83#wMfYbGshKeR<6
z(LcE?H$5|v_&AYRmYbPTdSJ<@!YvE(i;D}kC@Rb^E8Q=BMAcu%dT0E7tfI^0g|vw7
zp?m2*s-yeq0eX-gqKD}bT1@qIT_!Ji|L2V6FSs}^UHV8<_$3anNKIHukJhCoJl4Oq
zxcS+Rhi^Nos3<&QVPR2t#6<dK)0!Qtn3eN5JwZ>>Q}lG*tej_R-(An!{}xBDXMJ6f
zYJ7&CrRQiFJx?#ti}Vt`Os~+Z^cuZRZ_u0c7QIdH(7W^=y-y#|hqRnNq80QpeL|no
zXY@IJK`ZG?`ijEyG|(#ghE~(J^c{UqKhTf#6Rn}2=@<Hy)>0$=M(e0)YN|1+q%g@a
zX<^dCv<TBOOsg=h!?X$0Hp~WL+J$K!rbC#HVKxlYDNN@u8DTQRY!s$Tn66>6!fYHS
zJDQhj+$73M&Y2sJt4XelYU0xB@}~d%GgqdvyKy$Vdzc<!a=0tIXEeU9tg5^r3V$NG
zvr|_`aoJVn4aqz1{P!zWre^fymKnXcWyYq_%y@a$lriCsS?hnRVZAv$tWTJ}VRFOt
z<K|)gqt~JZ@zU%eP0jC2M)Ts*(QDW96F!S-4@e(fIWv1eR6jF2FIs+Gr)Gbc^_BPK
zMGK;6QC#~(!R+vKhcthW@OxUE7iM6XL18uvlOJX<kGQxXs*2M`9@{m%!pb?R9&7%v
z$%t2<`$AT@_C?IKhJWEEquT;j)1T;^$c&eMo;5U_eJWgQs4pw-9sNaIUpgdwU0;?p
z;GavG;p_Uc&I6)Vf4o`W`qB=6UV1q1pHuheMeEYShx3oF0tzUgfC36Apnw7jD4>7>
z3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36A
zpnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}
z0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7j
zD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUg
zfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>
z3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36A
zpnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}
S0tzUgfCB#$fp}s~a^UZ^;3N(J

delta 108114
zcmeIyd3@J%0LSrt*GM|HwoE3r?pn3BDQ3}rqmrw#k|MPd=1Q*I2{F1hO21sw+&76v
z*st8T9JwONeU$r%WnLe}Kl7(QUw^#bfBYWb&*S_3J%7iFhQ`ztbpNRAC|Wu(du^-v
zQ?pxLT++L;q<2Kg)QnPS8`_qd({|K?wx^cVids_}N~JVvOX-wB?Pv$eq#da}?L=9$
zGj*U{XjjUn9O_7&s55n;uGEdXQxED%xzvlo^Y)=U>Pz`lK!vm$^`ri@JMBS5v?mqQ
z0NRW8rh!yKF)F2fXkQvcgJ}ruM?-0UI)DzOgXmxyM#E_Y9YSR^l19;?G@1^hF*KGA
zrz2<_9ZBP90+rK5nnXv@WICFTp=0YxdRIi{OG~bdqD1V9oG2rzTUDO+brg@yt7w;q
zRp&$-qIlF|`Rw?NMagGW#^zVhadbSLKqt~kG=)y4sdNgRN~h836wXbfGwCcko6ezg
z={!20rqcy9gD#|t=wg~lm(ZnDNte;(G>c}_9GXk>sEVrT3c8Z!(*nAR7E+uR(baSf
zT}#)|^;APQ&|<2k8|fyxnQoz5={CBZ?w~vAF1nlUp?m2*y1y<qe@XRsLyC&>`xh4E
zjVv9VGPJr`Qc{oPm%8ndnw0c$Qqrg{$r+_%OUep%&(9k)ctqLoQGZ`Hq~F%d+NJ+<
zS$bvW%m-*GJxCAHGODA8=@D8^kJ4lGIMq|4E_3FJ4}QyNdf)nZ>B`3&!-qMbGB$lB
zJy92%{$!8ZqNdlTP8wKNSeVB<DJUomkC>D)YeAFCDi>!zMNiW+^ejDBw>bOx+BN@i
z`_1uab^C8BV-3&K3-ltrL@(1T^eU~Q*XVV6gWjao^cKBM@6fyS9<8DG=>u9zAJRJd
zh}P4`^a*`RpV8;^1${|h(bp87X9I1dZ|OVwo_?So=_mS`exYCKH`+wM(;w78o9Rz#
zoE>Y3swhlym}X&8!fX>}+c3?;Y!{|QnC-)~4AUx1>o9G?q=rcg(>6?cn2a#(!t4+x
zGt7=*+K1UGOjdMXtYPP<eWGkcLA3GjUv%5#t-t7D1^l9`Vp$!+>=I_zFxec*%891M
zUz;*uefWB0$4lo{G=@Ke#w~va@zOaJjZso~c|%ofVGgGjcI4E;PEk#wY+REY9lqs8
z#htmZxJ#I>VY-Fs&bi_q(VK~~$xY5p3a=zamWSiv_WwTl`0z@+c1+6ns+z2xQKBX*
zH(GaX+a_PgMAfp~Xi1bPt0;&Xn{9pD$833;`dn^b-z!Y-Fnz-0h3U&9)#pdmb!nR>
zG$gwUD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}
z0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7j
zD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUg
zfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>
z3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36A
zpnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}
z0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7j
zD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUg
zfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>
z3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUg!2c$&
Jsyr<v`7aVzR7n5;

diff --git a/src/zinfo/z4/gamedata.txt b/src/zinfo/z4/gamedata.txt
index d136b9d..1bf8ec6 100644
--- a/src/zinfo/z4/gamedata.txt
+++ b/src/zinfo/z4/gamedata.txt
@@ -40,6 +40,16 @@ bureaur116db
     !text   "R116.DEPROT.SAV"
 bureaur116de
 
+    !byte   bureaur160e-bureaur160b
+bureaur160b
+    !text   "R160.880521.SAV"
+bureaur160e
+
+    !byte   bureaur160de-bureaur160db
+bureaur160db
+    !text   "R160.DEPROT.SAV"
+bureaur160de
+
     !byte   nordr19e-nordr19b
 nordr19b
     !text   "R19.870722.SAV"
@@ -55,6 +65,11 @@ trinityr12b
     !text   "R12.860926.SAV"
 trinityr12e
 
+    !byte   trinityr15e-trinityr15b
+trinityr15b
+    !text   "R15.870628.SAV"
+trinityr15e
+
     !byte   0 ;end of list
 
 gameloc
@@ -82,6 +97,12 @@ gameloc
 ;bureaur116d
     !byte   $b6
 
+;bureaur160
+    !byte   $b5
+
+;bureaur160d
+    !byte   $b5
+
 ;nordr19
     !byte   $91
 
@@ -91,6 +112,9 @@ gameloc
 ;trinityr12
     !byte   $be
 
+;trinityr15
+    !byte   $be
+
 gametime
 ;amfvr77
     !byte   $50
@@ -110,24 +134,43 @@ gametime
 
 ;bureaur86
     !byte   0 ;no time
+    !byte   0 ;no time
 
 ;bureaur86d
     !byte   0 ;no time
+    !byte   0 ;no time
 
 ;bureaur116
     !byte   0 ;no time
+    !byte   0 ;no time
 
-;bureaur86d
+;bureaur116d
+    !byte   0 ;no time
+    !byte   0 ;no time
+
+;bureaur160
+    !byte   0 ;no time
+    !byte   0 ;no time
+
+;bureaur160d
+    !byte   0 ;no time
     !byte   0 ;no time
 
 ;nordr19
     !byte   0 ;no time
+    !byte   0 ;no time
 
 ;trinityr11
     !byte   0 ;no time
+    !byte   0 ;no time
 
 ;trinityr12
     !byte   0 ;no time
+    !byte   0 ;no time
+
+;trinityr15
+    !byte   0 ;no time
+    !byte   0 ;no time
 
 gamescore
 ;amfvr77
@@ -151,9 +194,15 @@ gamescore
 ;bureaur116
     !byte   $a1
 
-;bureaur86d
+;bureaur116d
     !byte   $a1
 
+;bureaur160
+    !byte   $9f
+
+;bureaur160d
+    !byte   $9f
+
 ;nordr19
     !byte   0 ;per-scenario score, not supported yet
 
@@ -163,6 +212,9 @@ gamescore
 ;trinityr12
     !byte   $aa
 
+;trinityr15
+    !byte   $aa
+
 gamemoves
 ;amfvr77
     !byte   0 ;no moves
@@ -185,9 +237,15 @@ gamemoves
 ;bureaur116
     !byte   $8e
 
-;bureaur86d
+;bureaur116d
     !byte   $8e
 
+;bureaur160
+    !byte   $8c
+
+;bureaur160d
+    !byte   $8c
+
 ;nordr19
     !byte   0 ;no moves
 
@@ -197,6 +255,9 @@ gamemoves
 ;trinityr12
     !byte   $95
 
+;trinityr15
+    !byte   $95
+
 gamemonth
 ;amfvr77
     !byte   $18
@@ -226,7 +287,15 @@ gamemonth
     !byte   0 ;no month
     !byte   0 ;no month
 
-;bureaur86d
+;bureaur116d
+    !byte   0 ;no month
+    !byte   0 ;no month
+
+;bureaur160
+    !byte   0 ;no month
+    !byte   0 ;no month
+
+;bureaur160d
     !byte   0 ;no month
     !byte   0 ;no month
 
@@ -242,6 +311,10 @@ gamemonth
     !byte   0 ;no month
     !byte   0 ;no month
 
+;trinityr15
+    !byte   0 ;no month
+    !byte   0 ;no month
+
 gameday
 ;amfvr77
     !byte   $91
@@ -271,7 +344,15 @@ gameday
     !byte   0 ;no day
     !byte   0 ;no day
 
-;bureaur86d
+;bureaur116d
+    !byte   0 ;no day
+    !byte   0 ;no day
+
+;bureaur160
+    !byte   0 ;no day
+    !byte   0 ;no day
+
+;bureaur160d
     !byte   0 ;no day
     !byte   0 ;no day
 
@@ -287,6 +368,10 @@ gameday
     !byte   0 ;no day
     !byte   0 ;no day
 
+;trinityr15
+    !byte   0 ;no day
+    !byte   0 ;no day
+
 gameyear
 ;amfvr77
     !byte   $bb
@@ -316,7 +401,15 @@ gameyear
     !byte   0 ;no year
     !byte   0 ;no year
 
-;bureaur86d
+;bureaur116d
+    !byte   0 ;no year
+    !byte   0 ;no year
+
+;bureaur160
+    !byte   0 ;no year
+    !byte   0 ;no year
+
+;bureaur160d
     !byte   0 ;no year
     !byte   0 ;no year
 
@@ -331,3 +424,7 @@ gameyear
 ;trinityr12
     !byte   0 ;no year
     !byte   0 ;no year
+
+;trinityr15
+    !byte   0 ;no year
+    !byte   0 ;no year