From 832d7465e334828fb9a7c4e19958ccf9a125d217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B6rn=20Andersson?=
 <eriktorbjorn@users.sourceforge.net>
Date: Tue, 30 Jul 2019 10:20:36 +0200
Subject: [PATCH] Fixed conditions for Monica's acquittal if you arrest her and
 Phong.

There are a couple of possible outcomes when you arrest Phong and Monica
together. There's the case where you don't even know about the hidden
gun, and there's the case where you have all the evidence. Neither of
those are affected by this change. Instead, it focuses on the case where
you haven't found everything, may still have enough evidence to convict
Monica on her own, but instead decide to arrest both her and Phong.

Before, the conditions were:

1) If you hadn't touched the gun receipt, she was acquitted "because he
   was", with the police chief lamenting that you should have tried her
   for plain murder instead of conspiracy.

2) Otherwise, if she had a motive she was acquitted "because there was
   no definite link between her and the hidden gun mechanism".

3) Otherwise, if you knew she had the clock key she was acquitted
   "because she had no motive".

4) Otherwise, she was acquitted "because", with no further reason.

Ending 1 only makes sense if she has a motive and you know she had the
clock key.

Ending 2 only makes sense if you don't know she had the clock key.

Ending 3 makes sense.

Ending 4 never makes sense.

With this change, the outcome instead is:

1) If she has no motive, she is acquitted because of that. Even if you
   know she has the clock key. Motive overrides everything.

2) Otherwise (i.e. you know she has a motive), if you know she has the
   clock key she is acquitted because Phong was, with the note that you
   should have tried her for murder instead of conspiracy.

3) Otherwise (i.e. you know she has a motive, but you don't know about
   the clock key), she's acquitted because there is no definite link
   between her and the hidden gun mechanism.

So I haven't added any new text, just changed the conditions for when
the existing messages appear. This way, the match what happens when you
arrest her by herself. It no longer checks if you touched the gun
receipt, but since Phong's acquittal message depends on that I think
it's covered well enough by the "because he was" reason.
---
 events.zil | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/events.zil b/events.zil
index bb5baad..fa95ebc 100644
--- a/events.zil
+++ b/events.zil
@@ -1765,17 +1765,16 @@ mechanism.|" CR>
 		      <TELL
 "While Monica could have conspired with him and aided him, she too was
 acquitted of conspiracy, because ">
-		      <COND (<NOT <FSET? ,GUN-RECEIPT ,TOUCHBIT>>
+		      <COND (<NOT ,MONICA-HAS-MOTIVE>
+			     <TELL "she had no apparent motive.|" CR>)
+			    (<OR ,SEEN-MONICA-AT-CLOCK ,USED-CLOCK-KEY>
 			     <TELL
 "he was. If only we had tried her for plain murder instead of conspiracy!|"
 CR>)
-			    (,MONICA-HAS-MOTIVE
+			    (T
 			     <TELL "the available
 evidence against her was circumstantial, since there was no definite
-link between her and the hidden gun mechanism.|" CR>)
-			    (<OR ,SEEN-MONICA-AT-CLOCK ,USED-CLOCK-KEY>
-			     <TELL "she had no
-apparent motive.|" CR>)>)>)
+link between her and the hidden gun mechanism.|" CR>)>)>)
 	      (<==? .PERSON ,MONICA>
 	       <COND (,MONICA-HAS-MOTIVE
 		      <COND (<OR ,SEEN-MONICA-AT-CLOCK ,USED-CLOCK-KEY>