diff --git a/brest/pshops/pshop1/basement b/brest/pshops/pshop1/basement index d26f935b4..e805a6615 100644 --- a/brest/pshops/pshop1/basement +++ b/brest/pshops/pshop1/basement @@ -842,6 +842,14 @@ arch blocked x 5 y 19 end +arch blocked +x 5 +y 20 +end +arch blocked +x 5 +y 21 +end arch dirtfloor x 6 end @@ -1039,6 +1047,10 @@ speed 0.0 x 6 y 20 end +arch blocked +x 6 +y 21 +end arch dirtfloor x 7 end @@ -1218,6 +1230,10 @@ speed 0.0 x 7 y 20 end +arch blocked +x 7 +y 21 +end arch dirtfloor x 8 end @@ -1389,6 +1405,14 @@ arch blocked x 8 y 19 end +arch blocked +x 8 +y 20 +end +arch blocked +x 8 +y 21 +end arch dirtfloor x 9 end diff --git a/brest/pshops/pshop10/basement b/brest/pshops/pshop10/basement index 390baa061..8d1eb6413 100644 --- a/brest/pshops/pshop10/basement +++ b/brest/pshops/pshop10/basement @@ -557,7 +557,7 @@ x 3 y 20 end arch check_floor -slaying pshop10 +slaying pshop100 connected 1 walk_off 1 x 3 @@ -1143,7 +1143,7 @@ x 7 y 13 end arch check_floor -slaying pshop10 +slaying pshop100 no_pass 1 walk_off 1 x 7 @@ -1163,7 +1163,7 @@ x 7 y 13 end arch check_floor -slaying pshop10 +slaying pshop100 connected 1 walk_off 1 x 7 @@ -2716,7 +2716,7 @@ x 18 y 2 end arch check_floor -slaying pshop10 +slaying pshop100 connected 1 walk_off 1 x 18 @@ -2733,7 +2733,7 @@ x 18 y 4 end arch check_floor -slaying pshop10 +slaying pshop100 no_pass 1 walk_off 1 x 18 @@ -2753,7 +2753,7 @@ x 18 y 4 end arch check_floor -slaying pshop10 +slaying pshop100 connected 1 walk_off 1 x 18 diff --git a/brest/pshops/pshop11/basement b/brest/pshops/pshop11/basement index f3bafa35b..f1d811ceb 100644 --- a/brest/pshops/pshop11/basement +++ b/brest/pshops/pshop11/basement @@ -557,7 +557,7 @@ x 3 y 20 end arch check_floor -slaying pshop11 +slaying pshop111 connected 1 walk_off 1 x 3 @@ -1143,7 +1143,7 @@ x 7 y 13 end arch check_floor -slaying pshop11 +slaying pshop111 no_pass 1 walk_off 1 x 7 @@ -1163,7 +1163,7 @@ x 7 y 13 end arch check_floor -slaying pshop11 +slaying pshop111 connected 1 walk_off 1 x 7 @@ -2716,7 +2716,7 @@ x 18 y 2 end arch check_floor -slaying pshop11 +slaying pshop111 connected 1 walk_off 1 x 18 @@ -2733,7 +2733,7 @@ x 18 y 4 end arch check_floor -slaying pshop11 +slaying pshop111 no_pass 1 walk_off 1 x 18 @@ -2753,7 +2753,7 @@ x 18 y 4 end arch check_floor -slaying pshop11 +slaying pshop111 connected 1 walk_off 1 x 18 diff --git a/brest/pshops/pshop12/basement b/brest/pshops/pshop12/basement index 917ec8aa0..e5fa31a66 100644 --- a/brest/pshops/pshop12/basement +++ b/brest/pshops/pshop12/basement @@ -557,7 +557,7 @@ x 3 y 20 end arch check_floor -slaying pshop12 +slaying pshop122 connected 1 walk_off 1 x 3 @@ -1143,7 +1143,7 @@ x 7 y 13 end arch check_floor -slaying pshop12 +slaying pshop122 no_pass 1 walk_off 1 x 7 @@ -1163,7 +1163,7 @@ x 7 y 13 end arch check_floor -slaying pshop12 +slaying pshop122 connected 1 walk_off 1 x 7 @@ -2716,7 +2716,7 @@ x 18 y 2 end arch check_floor -slaying pshop12 +slaying pshop122 connected 1 walk_off 1 x 18 @@ -2733,7 +2733,7 @@ x 18 y 4 end arch check_floor -slaying pshop12 +slaying pshop122 no_pass 1 walk_off 1 x 18 @@ -2753,7 +2753,7 @@ x 18 y 4 end arch check_floor -slaying pshop12 +slaying pshop122 connected 1 walk_off 1 x 18 diff --git a/brest/pshops/pshop13/basement b/brest/pshops/pshop13/basement index 94fefa936..a49b99717 100644 --- a/brest/pshops/pshop13/basement +++ b/brest/pshops/pshop13/basement @@ -557,7 +557,7 @@ x 3 y 20 end arch check_floor -slaying pshop13 +slaying pshop133 connected 1 walk_off 1 x 3 @@ -1143,7 +1143,7 @@ x 7 y 13 end arch check_floor -slaying pshop13 +slaying pshop133 no_pass 1 walk_off 1 x 7 @@ -1163,7 +1163,7 @@ x 7 y 13 end arch check_floor -slaying pshop13 +slaying pshop133 connected 1 walk_off 1 x 7 @@ -2716,7 +2716,7 @@ x 18 y 2 end arch check_floor -slaying pshop13 +slaying pshop133 connected 1 walk_off 1 x 18 @@ -2733,7 +2733,7 @@ x 18 y 4 end arch check_floor -slaying pshop13 +slaying pshop133 no_pass 1 walk_off 1 x 18 @@ -2753,7 +2753,7 @@ x 18 y 4 end arch check_floor -slaying pshop13 +slaying pshop133 connected 1 walk_off 1 x 18 diff --git a/brest/pshops/pshop14/basement b/brest/pshops/pshop14/basement index eb662bdc2..e156983da 100644 --- a/brest/pshops/pshop14/basement +++ b/brest/pshops/pshop14/basement @@ -557,7 +557,7 @@ x 3 y 20 end arch check_floor -slaying pshop14 +slaying pshop144 connected 1 walk_off 1 x 3 @@ -1143,7 +1143,7 @@ x 7 y 13 end arch check_floor -slaying pshop14 +slaying pshop144 no_pass 1 walk_off 1 x 7 @@ -1163,7 +1163,7 @@ x 7 y 13 end arch check_floor -slaying pshop14 +slaying pshop144 connected 1 walk_off 1 x 7 @@ -2716,7 +2716,7 @@ x 18 y 2 end arch check_floor -slaying pshop14 +slaying pshop144 connected 1 walk_off 1 x 18 @@ -2733,7 +2733,7 @@ x 18 y 4 end arch check_floor -slaying pshop14 +slaying pshop144 no_pass 1 walk_off 1 x 18 @@ -2753,7 +2753,7 @@ x 18 y 4 end arch check_floor -slaying pshop14 +slaying pshop144 connected 1 walk_off 1 x 18 diff --git a/brest/pshops/pshop15/basement b/brest/pshops/pshop15/basement index 8f231ecb2..9f5417e70 100644 --- a/brest/pshops/pshop15/basement +++ b/brest/pshops/pshop15/basement @@ -557,7 +557,7 @@ x 3 y 20 end arch check_floor -slaying pshop15 +slaying pshop155 connected 1 walk_off 1 x 3 @@ -1143,7 +1143,7 @@ x 7 y 13 end arch check_floor -slaying pshop15 +slaying pshop155 no_pass 1 walk_off 1 x 7 @@ -1163,7 +1163,7 @@ x 7 y 13 end arch check_floor -slaying pshop15 +slaying pshop155 connected 1 walk_off 1 x 7 @@ -2716,7 +2716,7 @@ x 18 y 2 end arch check_floor -slaying pshop15 +slaying pshop155 connected 1 walk_off 1 x 18 @@ -2733,7 +2733,7 @@ x 18 y 4 end arch check_floor -slaying pshop15 +slaying pshop155 no_pass 1 walk_off 1 x 18 @@ -2753,7 +2753,7 @@ x 18 y 4 end arch check_floor -slaying pshop15 +slaying pshop155 connected 1 walk_off 1 x 18 diff --git a/brest/pshops/pshop16/basement b/brest/pshops/pshop16/basement index 96b8f1008..7d48b9760 100644 --- a/brest/pshops/pshop16/basement +++ b/brest/pshops/pshop16/basement @@ -557,7 +557,7 @@ x 3 y 20 end arch check_floor -slaying pshop16 +slaying pshop166 connected 1 walk_off 1 x 3 @@ -1143,7 +1143,7 @@ x 7 y 13 end arch check_floor -slaying pshop16 +slaying pshop166 no_pass 1 walk_off 1 x 7 @@ -1163,7 +1163,7 @@ x 7 y 13 end arch check_floor -slaying pshop16 +slaying pshop166 connected 1 walk_off 1 x 7 @@ -2716,7 +2716,7 @@ x 18 y 2 end arch check_floor -slaying pshop16 +slaying pshop166 connected 1 walk_off 1 x 18 @@ -2733,7 +2733,7 @@ x 18 y 4 end arch check_floor -slaying pshop16 +slaying pshop166 no_pass 1 walk_off 1 x 18 @@ -2753,7 +2753,7 @@ x 18 y 4 end arch check_floor -slaying pshop16 +slaying pshop166 connected 1 walk_off 1 x 18 diff --git a/brest/pshops/pshop17/basement b/brest/pshops/pshop17/basement index 17939eabe..caef301a1 100644 --- a/brest/pshops/pshop17/basement +++ b/brest/pshops/pshop17/basement @@ -557,7 +557,7 @@ x 3 y 20 end arch check_floor -slaying pshop17 +slaying pshop177 connected 1 walk_off 1 x 3 @@ -1143,7 +1143,7 @@ x 7 y 13 end arch check_floor -slaying pshop17 +slaying pshop177 no_pass 1 walk_off 1 x 7 @@ -1163,7 +1163,7 @@ x 7 y 13 end arch check_floor -slaying pshop17 +slaying pshop177 connected 1 walk_off 1 x 7 @@ -2716,7 +2716,7 @@ x 18 y 2 end arch check_floor -slaying pshop17 +slaying pshop177 connected 1 walk_off 1 x 18 @@ -2733,7 +2733,7 @@ x 18 y 4 end arch check_floor -slaying pshop17 +slaying pshop177 no_pass 1 walk_off 1 x 18 @@ -2753,7 +2753,7 @@ x 18 y 4 end arch check_floor -slaying pshop17 +slaying pshop177 connected 1 walk_off 1 x 18 diff --git a/brest/pshops/pshop18/basement b/brest/pshops/pshop18/basement index 195bbd655..5c4151a75 100644 --- a/brest/pshops/pshop18/basement +++ b/brest/pshops/pshop18/basement @@ -557,7 +557,7 @@ x 3 y 20 end arch check_floor -slaying pshop18 +slaying pshop188 connected 1 walk_off 1 x 3 @@ -1143,7 +1143,7 @@ x 7 y 13 end arch check_floor -slaying pshop18 +slaying pshop188 no_pass 1 walk_off 1 x 7 @@ -1163,7 +1163,7 @@ x 7 y 13 end arch check_floor -slaying pshop18 +slaying pshop188 connected 1 walk_off 1 x 7 @@ -2716,7 +2716,7 @@ x 18 y 2 end arch check_floor -slaying pshop18 +slaying pshop188 connected 1 walk_off 1 x 18 @@ -2733,7 +2733,7 @@ x 18 y 4 end arch check_floor -slaying pshop18 +slaying pshop188 no_pass 1 walk_off 1 x 18 @@ -2753,7 +2753,7 @@ x 18 y 4 end arch check_floor -slaying pshop18 +slaying pshop188 connected 1 walk_off 1 x 18 diff --git a/brest/pshops/pshop19/basement b/brest/pshops/pshop19/basement index 0368e35f2..c9ba2cc95 100644 --- a/brest/pshops/pshop19/basement +++ b/brest/pshops/pshop19/basement @@ -557,7 +557,7 @@ x 3 y 20 end arch check_floor -slaying pshop19 +slaying pshop199 connected 1 walk_off 1 x 3 @@ -1143,7 +1143,7 @@ x 7 y 13 end arch check_floor -slaying pshop19 +slaying pshop199 no_pass 1 walk_off 1 x 7 @@ -1163,7 +1163,7 @@ x 7 y 13 end arch check_floor -slaying pshop19 +slaying pshop199 connected 1 walk_off 1 x 7 @@ -2716,7 +2716,7 @@ x 18 y 2 end arch check_floor -slaying pshop19 +slaying pshop199 connected 1 walk_off 1 x 18 @@ -2733,7 +2733,7 @@ x 18 y 4 end arch check_floor -slaying pshop19 +slaying pshop199 no_pass 1 walk_off 1 x 18 @@ -2753,7 +2753,7 @@ x 18 y 4 end arch check_floor -slaying pshop19 +slaying pshop199 connected 1 walk_off 1 x 18 diff --git a/brest/pshops/pshops_changelog b/brest/pshops/pshops_changelog index f93f48d4b..f15b08ac4 100644 --- a/brest/pshops/pshops_changelog +++ b/brest/pshops/pshops_changelog @@ -6,6 +6,11 @@ TODO *auto key tracking system? (python to rename the shop?) *buildable attic +v 1.4.1 -- 22 Sep 2004 +*corrected typo in pshopsinc npc message +*correct end tile on pshopsinc2 +*convinced the monkies to stay on the teleporters! + v 1.4 -- 22 Sep 2004 *added pshops/ugriver1 *added pshops/pshops*/basement diff --git a/brest/pshops/pshopsinc b/brest/pshops/pshopsinc index 89e86e225..8ba254853 100644 --- a/brest/pshops/pshopsinc +++ b/brest/pshops/pshopsinc @@ -4544,7 +4544,7 @@ msg Well as long as you are here, make yourself useful and take these flowers to my wife. Put them on her vanity so she will see them. @match date|Date -*Sigh* She's starting to forget a lot of things. Out date is at 7! +*Sigh* She's starting to forget a lot of things. Our date is at 7! @match contract|Contract I can't finish the contract until I find my pen! @match pen|Pen diff --git a/brest/pshops/pshopsinc2 b/brest/pshops/pshopsinc2 index 7f5e29da0..57b97aec8 100644 --- a/brest/pshops/pshopsinc2 +++ b/brest/pshops/pshopsinc2 @@ -1426,7 +1426,7 @@ arch woodfloor x 11 y 7 end -arch flagstone_2_1_2 +arch flagstone_1_3 x 11 y 7 end