From a635c941776206cd8df31753dd3a1950e6ed25bb Mon Sep 17 00:00:00 2001
From: Brandon Cornejo <me@brandoncornejo.name>
Date: Mon, 11 Mar 2019 22:20:40 -0500
Subject: [PATCH] filch/snatch actions, self-tpa update in group shield
 minitor, various fixes

---
 mdtconfig.json           |  6 ++++++
 src/actions.tin          | 10 ++++++++++
 src/group.tin            |  1 +
 src/missions/letters.tin | 19 +++++--------------
 src/tpamonitor.tin       | 12 ++++++++++--
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/mdtconfig.json b/mdtconfig.json
index 17572fc..ff091bc 100644
--- a/mdtconfig.json
+++ b/mdtconfig.json
@@ -53,6 +53,12 @@
         ["Ramtops Highlights"],
         ["headless horse rider", "red", 8, false],
 
+        ["Ankh-Morpork Highlights"],
+        ["tourist", "red", 10, false],
+
+        ["Genua Highlights"],
+        ["Tfat Chick", "red", 10, false],
+
         ["Valid colours: orange, red"]
     ]
 }
diff --git a/src/actions.tin b/src/actions.tin
index bd77617..2d1c1c0 100644
--- a/src/actions.tin
+++ b/src/actions.tin
@@ -15,6 +15,7 @@
  
 #NOP ==[Incident Highlighting]==
 #HIGHLIGHT {^%1 grabs %2 from you.  You struggle briefly but %3 wrests it from your grip and makes for a hasty retreat.$} {bold red underscore};
+#HIGHLIGHT {^%1 grabs {his|her|its} %2.  You struggle briefly but {he|she|it} wrests it from your grip and makes for a hasty retreat.} {bold red underscore};
 #HIGHLIGHT {^As %1 dies %2 drops %3 in shock.$} {bold green underscore};
 #HIGHLIGHT {^When you open the %1 you think you can hear a faint rumbling sound from it.$} {red underscore}; 
 #HIGHLIGHT {^Whoops!  You tried to carry too many things and fumbled %1} {red underscore};
@@ -46,12 +47,21 @@
 #HIGHLIGHT {You take the diamond-tipped chisel from your roll of gemcutting tools and delicately chip %1} {bold green};
 #HIGHLIGHT {You take the diamond-tipped chisel from your roll of gemcutting tools and chip away %1} {bold red};
 #HIGHLIGHT {You take the diamond-tipped chisel from your roll of gemcutting tools and, struggling with %1} {bold red};
+#SUB {You estimate that the %1 is worth A$%2.  You} {You estimate that the <149>%1<099> is worth A$<139>%2<099>.  You};
 
 #NOP ==[Kick Consortium]==
 #ACTION {^It is your turn to fight... enter the combat ring.$} {
     #showme {\a};
 }
 
+#NOP ==[PK Actions]==
+#HIGHLIGHT {You reach towards your goal but apuse suddenly as %1 seems to sense something.  {She|He|It} doesn't spot you and %2} {bold green};
+#HIGHLIGHT {You try to filch %1 from %2 but {she|he|it} notices you and manages to %3} {bold red};
+#ACTION {A stream of expletives drifts down from above with %1} { #showme {\a}; };
+#ACTION {There is the faintest of sounds, as of a gnat yawning, then a WHOOSH sound. %2} { #showme {\a}; };
+#HIGHLIGHT {A stream of expletives drifts down from above with %1} {bold red underscore};
+#HIGHLIGHT {There is the faintest of sounds, as of a gnat yawning, then a WHOOSH sound. %2} {bold red underscore};
+
 
 #NOP ==[End Session On Quit]==
 #ACTION {Thanks for playing.  See you next time.} {
diff --git a/src/group.tin b/src/group.tin
index 517a005..b9af0b7 100644
--- a/src/group.tin
+++ b/src/group.tin
@@ -241,6 +241,7 @@
     #variable {group_shields} {};
     #variable {group_shields_current} {};
     #send {group shields};
+    /writegroupshieldstofile
 };
 
 #ALIAS {sgs} {
diff --git a/src/missions/letters.tin b/src/missions/letters.tin
index 1f0ef28..cf49d40 100644
--- a/src/missions/letters.tin
+++ b/src/missions/letters.tin
@@ -57,22 +57,13 @@
 
 #ALIAS {return letter} {
     #send {return letter};
-    #format {missions[letter][retry_list][$GMCP[charinfo][capname]]} {%T};
-
-    #line sub variable {
-        #format {delayname} {letter_retry_%s} {$GMCP[charinfo][capname]};
-        #delay {$delayname} {
-            #format {letter_timer_line} {%c[MT] %c*%c %s can now request another letter from Frank.} {bold blue} {bold yellow} {bold blue} {$GMCP[charinfo][capname]};
-            #echo {$letter_timer_line};
-            #unvar {letter_timer_line};
-
-            #unvar {missions[letter][retry_list][$GMCP[charinfo][capname]]};
-        } {600};
-    };
-    #unvar {delayname};
-    #nop /letter_returned;
+    /letter_returned
 };
 
+#ALIAS {give letter to {f|F}rank} {
+    #send {give letter to Frank};
+    /letter_returned;
+};
 
 
 #NOP =======================
diff --git a/src/tpamonitor.tin b/src/tpamonitor.tin
index 8c0256f..f9b5e0d 100644
--- a/src/tpamonitor.tin
+++ b/src/tpamonitor.tin
@@ -17,7 +17,11 @@
     #var {tpa_status} {1};
     #var {tpa_color} {invisible};
     #format {tpa_start} {%T};
-    update_prompt;
+
+    #nop Update ourselves in the group shield monitor;
+    #variable {group_shields[$GMCP[charinfo][capname]][tpa]} {1};
+    /writegroupshieldstofile
+    update_prompt
 }
 
 
@@ -61,9 +65,13 @@
         #echo {<168>*** TPA broken! (lasted for $tpa_dur minutes) ***<099>};
     }
 
+    #nop Update ourselves in the group shield monitor;
+    #variable {group_shields[$GMCP[charinfo][capname]][tpa]} {0};
+    /writegroupshieldstofile
+
     #unvar {tpa_start};
     #unvar {tpa_end};
-    update_prompt;
+    update_prompt
 }
 
 #nop ### alias to reset TPA status, if it breaks and we didn't catch it ###