From 0894910280d8b408d8e2a11d9e096aff2f58077c Mon Sep 17 00:00:00 2001
From: Nicolas Weeger <ryo_saeba@users.sourceforge.net>
Date: Sat, 10 Dec 2022 20:33:58 +0100
Subject: [PATCH] Better hide the room with pixies, making the map non
 rectangular

---
 wolfsburg/slave_pit2 | 436 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 332 insertions(+), 104 deletions(-)

diff --git a/wolfsburg/slave_pit2 b/wolfsburg/slave_pit2
index 3cd22e090..08ad7c561 100644
--- a/wolfsburg/slave_pit2
+++ b/wolfsburg/slave_pit2
@@ -3,11 +3,11 @@ name Slave Pit 2
 difficulty 9
 region wolfsburg
 width 35
-height 25
+height 29
 enter_x 2
 enter_y 1
 msg
-Modified: 2022-08-07 Rick Tanner
+Modified: 2022-12-10 Nicolas Weeger
 endmsg
 reset_group wolfsburg_slave-pit-2
 end
@@ -115,7 +115,7 @@ end
 arch woodfloor
 y 20
 end
-arch mine11
+arch mine3
 y 20
 end
 arch woodfloor
@@ -139,10 +139,34 @@ end
 arch woodfloor
 y 24
 end
-arch mine4
+arch mine11
 y 24
 end
 arch woodfloor
+y 25
+end
+arch mine3
+y 25
+end
+arch woodfloor
+y 26
+end
+arch mine3
+y 26
+end
+arch woodfloor
+y 27
+end
+arch mine3
+y 27
+end
+arch woodfloor
+y 28
+end
+arch mine4
+y 28
+end
+arch woodfloor
 x 1
 end
 arch mine10
@@ -272,30 +296,22 @@ arch woodfloor
 x 1
 y 17
 end
-arch generate_ogre
-x 1
-y 17
-end
 arch woodfloor
 x 1
 y 18
 end
+arch generate_ogre
+x 1
+y 18
+end
 arch woodfloor
 x 1
 y 19
 end
-arch random_treasure
-x 1
-y 19
-end
 arch woodfloor
 x 1
 y 20
 end
-arch mine2
-x 1
-y 20
-end
 arch woodfloor
 x 1
 y 21
@@ -308,7 +324,7 @@ arch woodfloor
 x 1
 y 23
 end
-arch generate_pixie
+arch random_treasure
 x 1
 y 23
 end
@@ -321,6 +337,30 @@ x 1
 y 24
 end
 arch woodfloor
+x 1
+y 25
+end
+arch woodfloor
+x 1
+y 26
+end
+arch woodfloor
+x 1
+y 27
+end
+arch generate_pixie
+x 1
+y 27
+end
+arch woodfloor
+x 1
+y 28
+end
+arch mine2
+x 1
+y 28
+end
+arch woodfloor
 x 2
 end
 arch mine2
@@ -421,18 +461,10 @@ arch woodfloor
 x 2
 y 19
 end
-arch generate_ogre
-x 2
-y 19
-end
 arch woodfloor
 x 2
 y 20
 end
-arch mine2
-x 2
-y 20
-end
 arch woodfloor
 x 2
 y 21
@@ -445,6 +477,10 @@ arch woodfloor
 x 2
 y 23
 end
+arch generate_ogre
+x 2
+y 23
+end
 arch woodfloor
 x 2
 y 24
@@ -454,6 +490,26 @@ x 2
 y 24
 end
 arch woodfloor
+x 2
+y 25
+end
+arch woodfloor
+x 2
+y 26
+end
+arch woodfloor
+x 2
+y 27
+end
+arch woodfloor
+x 2
+y 28
+end
+arch mine2
+x 2
+y 28
+end
+arch woodfloor
 x 3
 end
 arch mine16
@@ -559,10 +615,6 @@ arch woodfloor
 x 3
 y 17
 end
-arch ogre
-x 3
-y 17
-end
 arch woodfloor
 x 3
 y 18
@@ -579,14 +631,14 @@ arch woodfloor
 x 3
 y 20
 end
-arch mine2
-x 3
-y 20
-end
 arch woodfloor
 x 3
 y 21
 end
+arch ogre
+x 3
+y 21
+end
 arch woodfloor
 x 3
 y 22
@@ -595,10 +647,6 @@ arch woodfloor
 x 3
 y 23
 end
-arch random_spells
-x 3
-y 23
-end
 arch woodfloor
 x 3
 y 24
@@ -608,6 +656,30 @@ x 3
 y 24
 end
 arch woodfloor
+x 3
+y 25
+end
+arch woodfloor
+x 3
+y 26
+end
+arch woodfloor
+x 3
+y 27
+end
+arch random_spells
+x 3
+y 27
+end
+arch woodfloor
+x 3
+y 28
+end
+arch mine2
+x 3
+y 28
+end
+arch woodfloor
 x 4
 end
 arch mine2
@@ -705,10 +777,6 @@ arch woodfloor
 x 4
 y 20
 end
-arch mine2
-x 4
-y 20
-end
 arch woodfloor
 x 4
 y 21
@@ -721,10 +789,6 @@ arch woodfloor
 x 4
 y 23
 end
-arch generate_pixie
-x 4
-y 23
-end
 arch woodfloor
 x 4
 y 24
@@ -734,6 +798,30 @@ x 4
 y 24
 end
 arch woodfloor
+x 4
+y 25
+end
+arch woodfloor
+x 4
+y 26
+end
+arch woodfloor
+x 4
+y 27
+end
+arch generate_pixie
+x 4
+y 27
+end
+arch woodfloor
+x 4
+y 28
+end
+arch mine2
+x 4
+y 28
+end
+arch woodfloor
 x 5
 end
 arch mine2
@@ -835,30 +923,46 @@ arch woodfloor
 x 5
 y 20
 end
+arch woodfloor
+x 5
+y 21
+end
+arch woodfloor
+x 5
+y 22
+end
+arch woodfloor
+x 5
+y 23
+end
+arch woodfloor
+x 5
+y 24
+end
 arch mine2
 x 5
-y 20
+y 24
 move_block 0
 end
 arch woodfloor
 x 5
-y 21
+y 25
 end
 arch woodfloor
 x 5
-y 22
+y 26
 end
 arch woodfloor
 x 5
-y 23
+y 27
 end
 arch woodfloor
 x 5
-y 24
+y 28
 end
 arch mine2
 x 5
-y 24
+y 28
 end
 arch woodfloor
 x 6
@@ -946,14 +1050,14 @@ arch woodfloor
 x 6
 y 17
 end
-arch small_troll
-x 6
-y 17
-end
 arch woodfloor
 x 6
 y 18
 end
+arch small_troll
+x 6
+y 18
+end
 arch woodfloor
 x 6
 y 19
@@ -962,10 +1066,6 @@ arch woodfloor
 x 6
 y 20
 end
-arch mine2
-x 6
-y 20
-end
 arch woodfloor
 x 6
 y 21
@@ -987,6 +1087,26 @@ x 6
 y 24
 end
 arch woodfloor
+x 6
+y 25
+end
+arch woodfloor
+x 6
+y 26
+end
+arch woodfloor
+x 6
+y 27
+end
+arch woodfloor
+x 6
+y 28
+end
+arch mine2
+x 6
+y 28
+end
+arch woodfloor
 x 7
 end
 arch mine2
@@ -1072,6 +1192,10 @@ arch woodfloor
 x 7
 y 17
 end
+arch ogre
+x 7
+y 17
+end
 arch woodfloor
 x 7
 y 18
@@ -1080,41 +1204,65 @@ arch woodfloor
 x 7
 y 19
 end
+arch woodfloor
+x 7
+y 20
+end
+arch small_troll
+x 7
+y 20
+end
+arch woodfloor
+x 7
+y 21
+end
+arch woodfloor
+x 7
+y 22
+end
+arch ogre
+x 7
+y 22
+end
+arch woodfloor
+x 7
+y 23
+end
 arch random_shield
 x 7
-y 19
+y 23
 end
 arch woodfloor
 x 7
-y 20
+y 24
 end
 arch mine2
 x 7
-y 20
+y 24
 end
 arch woodfloor
 x 7
-y 21
+y 25
 end
 arch woodfloor
 x 7
-y 22
+y 26
 end
 arch woodfloor
 x 7
-y 23
+y 27
 end
 arch generate_pixie
 x 7
-y 23
+y 27
 end
 arch woodfloor
 x 7
-y 24
+y 28
 end
 arch mine2
 x 7
-y 24
+y 28
 end
 arch woodfloor
 x 8
@@ -1214,10 +1362,6 @@ arch woodfloor
 x 8
 y 20
 end
-arch mine2
-x 8
-y 20
-end
 arch woodfloor
 x 8
 y 21
@@ -1230,17 +1374,37 @@ arch woodfloor
 x 8
 y 23
 end
+arch woodfloor
+x 8
+y 24
+end
+arch mine2
+x 8
+y 24
+end
+arch woodfloor
+x 8
+y 25
+end
+arch woodfloor
+x 8
+y 26
+end
+arch woodfloor
+x 8
+y 27
+end
 arch random_talisman
 x 8
-y 23
+y 27
 end
 arch woodfloor
 x 8
-y 24
+y 28
 end
 arch mine2
 x 8
-y 24
+y 28
 end
 arch woodfloor
 x 9
@@ -1332,28 +1496,24 @@ arch woodfloor
 x 9
 y 19
 end
+arch woodfloor
+x 9
+y 20
+end
+arch woodfloor
+x 9
+y 21
+end
+arch woodfloor
+x 9
+y 22
+end
+arch woodfloor
+x 9
+y 23
+end
 arch small_troll
 x 9
-y 19
-end
-arch woodfloor
-x 9
-y 20
-end
-arch mine2
-x 9
-y 20
-end
-arch woodfloor
-x 9
-y 21
-end
-arch woodfloor
-x 9
-y 22
-end
-arch woodfloor
-x 9
 y 23
 end
 arch woodfloor
@@ -1365,6 +1525,26 @@ x 9
 y 24
 end
 arch woodfloor
+x 9
+y 25
+end
+arch woodfloor
+x 9
+y 26
+end
+arch woodfloor
+x 9
+y 27
+end
+arch woodfloor
+x 9
+y 28
+end
+arch mine2
+x 9
+y 28
+end
+arch woodfloor
 x 10
 end
 arch mine2
@@ -1458,10 +1638,6 @@ arch woodfloor
 x 10
 y 20
 end
-arch mine2
-x 10
-y 20
-end
 arch woodfloor
 x 10
 y 21
@@ -1474,10 +1650,6 @@ arch woodfloor
 x 10
 y 23
 end
-arch generate_pixie
-x 10
-y 23
-end
 arch woodfloor
 x 10
 y 24
@@ -1487,6 +1659,30 @@ x 10
 y 24
 end
 arch woodfloor
+x 10
+y 25
+end
+arch woodfloor
+x 10
+y 26
+end
+arch woodfloor
+x 10
+y 27
+end
+arch generate_pixie
+x 10
+y 27
+end
+arch woodfloor
+x 10
+y 28
+end
+arch mine2
+x 10
+y 28
+end
+arch woodfloor
 x 11
 end
 arch mine2
@@ -1630,7 +1826,7 @@ arch woodfloor
 x 11
 y 20
 end
-arch mine14
+arch mine3
 x 11
 y 20
 end
@@ -1667,6 +1863,38 @@ x 11
 y 24
 end
 arch woodfloor
+x 11
+y 25
+end
+arch mine3
+x 11
+y 25
+end
+arch woodfloor
+x 11
+y 26
+end
+arch mine3
+x 11
+y 26
+end
+arch woodfloor
+x 11
+y 27
+end
+arch mine3
+x 11
+y 27
+end
+arch woodfloor
+x 11
+y 28
+end
+arch mine12
+x 11
+y 28
+end
+arch woodfloor
 x 12
 end
 arch mine2