From 4a786f49c1bd2daf83a377efc30c7942f092b618 Mon Sep 17 00:00:00 2001
From: Kevin Zheng <kevinz5000@gmail.com>
Date: Fri, 20 Aug 2021 11:52:06 -0700
Subject: [PATCH] De-duplicate suspicious people

---
 pup_land/port_e_house | 42 +++++++++++-------------------------------
 pup_land/port_w       | 26 +++-----------------------
 2 files changed, 14 insertions(+), 54 deletions(-)

diff --git a/pup_land/port_e_house b/pup_land/port_e_house
index c16643958..a1d2cc9a9 100644
--- a/pup_land/port_e_house
+++ b/pup_land/port_e_house
@@ -8,7 +8,7 @@ enter_x 7
 enter_y 14
 msg
 Created:  1996-01-29
-Modified: 2008-12-04 Rick Tanner
+Modified: 2021-08-20 Kevin Zheng
 endmsg
 end
 arch sea
@@ -565,27 +565,6 @@ arch woodfloor
 x 6
 y 13
 end
-arch dungeon_magic
-x 6
-y 13
-end
-arch man
-name suspicious guy
-msg
-@match siegfried
-Okay, you're allowed to pass.
-@match *
-Go away!
-endmsg
-hp 180
-maxhp 180
-x 6
-y 13
-speed_left -1.750000
-pick_up 0
-friendly 1
-unaggressive 0
-end
 arch woodfloor
 x 6
 y 14
@@ -658,6 +637,11 @@ x 7
 y 11
 connected 1
 end
+arch button_small
+x 7
+y 11
+connected 1
+end
 arch woodfloor
 x 7
 y 11
@@ -666,6 +650,11 @@ arch dungeon_magic
 x 7
 y 12
 end
+arch button_small
+x 7
+y 12
+connected 1
+end
 arch woodfloor
 x 7
 y 12
@@ -676,15 +665,6 @@ y 12
 speed 0.500000
 connected 1
 end
-arch magic_ear
-msg
-@match siegfried
-Click.
-endmsg
-x 7
-y 13
-connected 1
-end
 arch woodfloor
 x 7
 y 13
diff --git a/pup_land/port_w b/pup_land/port_w
index 3404138af..8713935ea 100644
--- a/pup_land/port_w
+++ b/pup_land/port_w
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 9
 msg
 Created:  1996-01-29
-Modified: 2008-10-13 Rick Tanner
+Modified: 2021-08-20 Kevin Zheng
 endmsg
 end
 arch sea
@@ -1658,6 +1658,7 @@ x 11
 y 9
 end
 arch igateTrg2
+hp 10
 x 11
 y 9
 connected 1
@@ -1825,32 +1826,11 @@ arch grass
 x 12
 y 8
 end
-arch man
-name suspicious guy
-msg
-@match siegfried
-Okay, you're allowed to pass.
-@match *
-Go away!
-endmsg
-hp 180
-maxhp 180
-x 12
-y 8
-speed_left -1.750000
-pick_up 0
-friendly 1
-unaggressive 0
-end
 arch dungeon_magic
 x 12
 y 9
 end
-arch magic_ear
-msg
-@match siegfried
-Click.
-endmsg
+arch button_trigger
 x 12
 y 9
 connected 1