summaryrefslogtreecommitdiff
path: root/lib/mods
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2016-10-08 11:38:29 +0200
committerBardur Arantsson <bardur@scientician.net>2016-10-08 11:38:29 +0200
commite2f33131dfed23435a7915daa57b1ddf05c5f898 (patch)
tree47e1338542bd559c9d9b26bd8e2681708d3ee727 /lib/mods
parentd7b410ad837f6d5965c8309b2d55362812d37fa9 (diff)
Remove traps from maps and levels
Diffstat (limited to 'lib/mods')
-rw-r--r--lib/mods/theme/edit/between.map8
-rw-r--r--lib/mods/theme/edit/evil.map6
-rw-r--r--lib/mods/theme/edit/maeglin.map4
-rw-r--r--lib/mods/theme/edit/nirnaeth.map16
-rw-r--r--lib/mods/theme/edit/numenor.txt2
-rw-r--r--lib/mods/theme/edit/qrand1.map3
-rw-r--r--lib/mods/theme/edit/qrand10.map13
-rw-r--r--lib/mods/theme/edit/qrand11.map3
-rw-r--r--lib/mods/theme/edit/qrand12.map3
-rw-r--r--lib/mods/theme/edit/qrand14.map3
-rw-r--r--lib/mods/theme/edit/qrand6.map3
-rw-r--r--lib/mods/theme/edit/qrand7.map13
-rw-r--r--lib/mods/theme/edit/s_bilbo.map37
-rw-r--r--lib/mods/theme/edit/s_crypt.map36
-rw-r--r--lib/mods/theme/edit/s_doom.map40
-rw-r--r--lib/mods/theme/edit/s_factory.map67
-rw-r--r--lib/mods/theme/edit/s_gates.map44
-rw-r--r--lib/mods/theme/edit/s_name.map78
-rw-r--r--lib/mods/theme/edit/s_orthanc.map78
-rw-r--r--lib/mods/theme/edit/s_ship.map73
-rw-r--r--lib/mods/theme/edit/special.txt23
-rw-r--r--lib/mods/theme/edit/spiders.map4
-rw-r--r--lib/mods/theme/edit/t_beorn.txt6
-rw-r--r--lib/mods/theme/edit/t_bree.txt26
-rw-r--r--lib/mods/theme/edit/t_dale.txt6
-rw-r--r--lib/mods/theme/edit/t_edoras.txt24
-rw-r--r--lib/mods/theme/edit/t_esga.txt10
-rw-r--r--lib/mods/theme/edit/t_gondol.txt44
-rw-r--r--lib/mods/theme/edit/t_helm.txt2
-rw-r--r--lib/mods/theme/edit/t_henn.txt6
-rw-r--r--lib/mods/theme/edit/t_hobb.txt8
-rw-r--r--lib/mods/theme/edit/t_imlad.txt6
-rw-r--r--lib/mods/theme/edit/t_khazad.txt20
-rw-r--r--lib/mods/theme/edit/t_lorien.txt38
-rw-r--r--lib/mods/theme/edit/t_minas.txt34
-rw-r--r--lib/mods/theme/edit/t_osgili.txt24
-rw-r--r--lib/mods/theme/edit/t_pelar.txt16
-rw-r--r--lib/mods/theme/edit/t_pref.txt30
-rw-r--r--lib/mods/theme/edit/t_thrand.txt12
-rw-r--r--lib/mods/theme/edit/thieves.map6
-rw-r--r--lib/mods/theme/edit/thrain.map17
-rw-r--r--lib/mods/theme/edit/trolls.map10
-rw-r--r--lib/mods/theme/edit/volcano.txt4
-rw-r--r--lib/mods/theme/edit/wights.map24
44 files changed, 440 insertions, 490 deletions
diff --git a/lib/mods/theme/edit/between.map b/lib/mods/theme/edit/between.map
index 4fed5c95..375d1ef2 100644
--- a/lib/mods/theme/edit/between.map
+++ b/lib/mods/theme/edit/between.map
@@ -23,16 +23,16 @@ F:G:89:5:955
F:L:89:5:956
# Floor with grass with a brown thunderlord
-F:B:89:5:957:0:0:0:0:0:0:2
+F:B:89:5:957:0:0:0:0:0:2
# Floor with grass with a bronze thunderlord
-F:z:89:5:958:0:0:0:0:0:0:2
+F:z:89:5:958:0:0:0:0:0:2
# Floor with dirt with a bronze thunderlord
-F:Z:88:5:958:0:0:0:0:0:0:2
+F:Z:88:5:958:0:0:0:0:0:2
# Floor with grass with a gold thunderlord
-F:D:88:5:959:0:0:0:0:0:0:2
+F:D:88:5:959:0:0:0:0:0:2
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
D:X..T.TT..T...T...T...T.....T....T......T...T.,,.....T......T....T...T.T..T..TT...T..T.TT.T.TT.TX
diff --git a/lib/mods/theme/edit/evil.map b/lib/mods/theme/edit/evil.map
index a2f00914..aff2de9b 100644
--- a/lib/mods/theme/edit/evil.map
+++ b/lib/mods/theme/edit/evil.map
@@ -14,13 +14,13 @@ F:<:6:0
F:.:88:0
# Lesser Balrog
-F:b:88:0:996:0:0:0:0:0:0:2
+F:b:88:0:996:0:0:0:0:0:2
# Greater Balrog
-F:B:88:0:807:0:0:0:0:0:0:2
+F:B:88:0:807:0:0:0:0:0:2
# Pit Fiend
-F:P:88:0:812:0:0:0:0:0:0:2
+F:P:88:0:812:0:0:0:0:0:2
# Dungeon layout
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/mods/theme/edit/maeglin.map b/lib/mods/theme/edit/maeglin.map
index e3be9972..7916fd9b 100644
--- a/lib/mods/theme/edit/maeglin.map
+++ b/lib/mods/theme/edit/maeglin.map
@@ -11,7 +11,7 @@ F:X:63:3
F:<:172:3
# up stairs with maeglin
-F:{:6:3:825:0:0:0:0:0:0:2
+F:{:6:3:825:0:0:0:0:0:2
# Floor with dirt
F:.:88:5
@@ -56,7 +56,7 @@ F:R:88:5:644
F:O:88:5:645
# Floor with dirt with a Lesser Balrog
-F:U:88:5:996:0:0:0:0:0:0:2
+F:U:88:5:996:0:0:0:0:0:2
# Granite wall
F:#:56:5
diff --git a/lib/mods/theme/edit/nirnaeth.map b/lib/mods/theme/edit/nirnaeth.map
index a8c06999..3ad0789c 100644
--- a/lib/mods/theme/edit/nirnaeth.map
+++ b/lib/mods/theme/edit/nirnaeth.map
@@ -14,28 +14,28 @@ F:s:88:5
F:V:84:5
# Dirt with Olog
-F:a:88:5:538:0:0:0:0:0:0:2
+F:a:88:5:538:0:0:0:0:0:2
# Dirt with Cave Troll
-F:b:88:5:496:0:0:0:0:0:0:2
+F:b:88:5:496:0:0:0:0:0:2
# Dirt with with Eldrak
-F:c:88:1:620:0:0:0:0:0:0:2
+F:c:88:1:620:0:0:0:0:0:2
# Dirt with with Ettin
-F:e:88:1:621:0:0:0:0:0:0:2
+F:e:88:1:621:0:0:0:0:0:2
# Dirt with with War troll
-F:f:88:1:631:0:0:0:0:0:0:2
+F:f:88:1:631:0:0:0:0:0:2
# Dirt with with Hru
-F:g:88:1:709:0:0:0:0:0:0:2
+F:g:88:1:709:0:0:0:0:0:2
# Dirt with Ulik the Troll
-F:h:88:5:729:0:0:0:0:0:0:2
+F:h:88:5:729:0:0:0:0:0:2
# Dirt with Ancient green dragon
-F:i:88:5:618:0:0:0:0:0:0:2
+F:i:88:5:618:0:0:0:0:0:2
# Dungeon
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/mods/theme/edit/numenor.txt b/lib/mods/theme/edit/numenor.txt
index ec8621b1..0ca52738 100644
--- a/lib/mods/theme/edit/numenor.txt
+++ b/lib/mods/theme/edit/numenor.txt
@@ -1,7 +1,7 @@
# File: numenor.txt
# Way to the lost land of Numenor
-F:>:7:3:0:0:0:0:0:7
+F:>:7:3:0:0:0:0:7
############### Town Layout ###############
diff --git a/lib/mods/theme/edit/qrand1.map b/lib/mods/theme/edit/qrand1.map
index f42cbf1c..041e221c 100644
--- a/lib/mods/theme/edit/qrand1.map
+++ b/lib/mods/theme/edit/qrand1.map
@@ -16,9 +16,6 @@ F:G:188:6
# Door
F:D:38:6
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
# Deep lava
F:F:85:12
diff --git a/lib/mods/theme/edit/qrand10.map b/lib/mods/theme/edit/qrand10.map
index ae45b9cb..cfe57e16 100644
--- a/lib/mods/theme/edit/qrand10.map
+++ b/lib/mods/theme/edit/qrand10.map
@@ -16,9 +16,6 @@ F:G:188:6
# Door
F:D:38:6
-# Floor with Trap
-F:t:1:2056:0:0:0:0:*
-
# Deep lava
F:F:85:12
@@ -26,11 +23,11 @@ F:F:85:12
D:
D: xxxxxxx
D: xFFFFFx
-D: xxxxxx,t.ttxxxx
-D: xFFG,t....t,,,xxx
-D: xFpG.......t.t.DD
-D: xFFG,t....t,,,xxx
-D: xxxxxx,t.ttxxxx
+D: xxxxxx,....xxxx
+D: xFFG,......,,,xxx
+D: xFpG...........DD
+D: xFFG,......,,,xxx
+D: xxxxxx,....xxxx
D: xFFFFFx
D: xxxxxxx
D:
diff --git a/lib/mods/theme/edit/qrand11.map b/lib/mods/theme/edit/qrand11.map
index 4af3c266..67d5258a 100644
--- a/lib/mods/theme/edit/qrand11.map
+++ b/lib/mods/theme/edit/qrand11.map
@@ -16,9 +16,6 @@ F:G:188:6
# Door
F:D:38:6
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
# Deep lava
F:L:85:6
diff --git a/lib/mods/theme/edit/qrand12.map b/lib/mods/theme/edit/qrand12.map
index 4621ef0b..f24a7927 100644
--- a/lib/mods/theme/edit/qrand12.map
+++ b/lib/mods/theme/edit/qrand12.map
@@ -16,9 +16,6 @@ F:G:188:6
# Door
F:D:38:6
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
# Deep water
F:W:187:6
diff --git a/lib/mods/theme/edit/qrand14.map b/lib/mods/theme/edit/qrand14.map
index 9f339db0..ee6e8975 100644
--- a/lib/mods/theme/edit/qrand14.map
+++ b/lib/mods/theme/edit/qrand14.map
@@ -16,9 +16,6 @@ F:G:188:6
# Door
F:D:38:6
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
# Deep water
F:W:84:6
diff --git a/lib/mods/theme/edit/qrand6.map b/lib/mods/theme/edit/qrand6.map
index 3b55e985..407a9083 100644
--- a/lib/mods/theme/edit/qrand6.map
+++ b/lib/mods/theme/edit/qrand6.map
@@ -16,9 +16,6 @@ F:G:188:6
# Door
F:D:38:6
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
# Deep water
F:W:84:6
diff --git a/lib/mods/theme/edit/qrand7.map b/lib/mods/theme/edit/qrand7.map
index a7c0607f..4da79778 100644
--- a/lib/mods/theme/edit/qrand7.map
+++ b/lib/mods/theme/edit/qrand7.map
@@ -16,9 +16,6 @@ F:G:188:6
# Door
F:D:38:6
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
-
# Deep water
F:W:84:6
@@ -26,10 +23,10 @@ F:W:84:6
F:w:187:6
# Dungeon wayout
-D:ttttt
-D:tGGGt ,x,
-D:tGpGt x,x
-D:tGGGt ,x,
-D:ttttt
+D:
+D: GGG ,x,
+D: GpG x,x
+D: GGG ,x,
+D:
D: ,x,
D:
diff --git a/lib/mods/theme/edit/s_bilbo.map b/lib/mods/theme/edit/s_bilbo.map
index 12c857e2..4f080de0 100644
--- a/lib/mods/theme/edit/s_bilbo.map
+++ b/lib/mods/theme/edit/s_bilbo.map
@@ -16,9 +16,6 @@ F:1:89:0:0:0:0:209
# Random monster and random object on grass
F:2:89:0:*13:*15
-# Random trap on grass
-F:3:89:0:0:0:0:0:*
-
### Previous adventurers
F:a:89:0:0:391
F:b:89:0:0:392
@@ -33,26 +30,26 @@ F:h:89:0:0:398
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
D:XMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMX
-D:XMMMM,g*,,,,,,MMM2,,,,,,,,MMM,,3TMMM,,M,3,M,3,M,,,M+,,,,,,,,,,,,,MM,,,,,,,,,,,,,,,,,,,,T,MX
+D:XMMMM,g*,,,,,,MMM2,,,,,,,,MMM,,,TMMM,,M,,,M,,,M,,,M+,,,,,,,,,,,,,MM,,,,,,,,,,,,,,,,,,,,T,MX
D:XMM,,,MMM,,,MMM,,,MMM,,,MMM,,,MMM,,M,,M,M,M,M,M,M,,MMMMMMMMMMMMM,,MM,,MMMMMMMMMMMMMMMMMMTMX
-D:XM,,MMM,,,MMM,,3MMM,,,MMM,,,MMM,,,,M,,M,M,M,M,M,M,,,MM,,,*,,,,,MM,3MM,,,,,a,,,,,,,c,,,*M,MX
-D:XMMMM,,,MMM,,,MMM,,,MMM,,,MMM,,,,,,M,,M,M,M,M,M,M,,,,M,a,b,c,,,,M,,,M,,,,,,,,,,3,3,,,,,M,MX
-D:XMM,,,MMM,3,MMM,,,MMM,,,MMM,,,,,,,,M,,M,M,M,M,M,M,,,,M,,33,,,,,MM,,MMMM,,,,,,,,,2,,,,,,M,MX
-D:XM,,MMM,3,MMM,,,MMM,,,MMM,,,,,,,,,,M,,,,M,3,M,3,M,,,MM,,,2,,,MMM,MMM,,MMM,,,,,,3,3,,,,,M,MX
-D:XM,MM,,,MMM,,,MMM,,,MMM,,,,,,,,,MM+MMMMMMMMMMMMMM,,MM,,,,33,MMM,MMMMMM,,MMM,,,,,,,,,,,,M,MX
-D:XM,,3,MMM,,,,,,,,,MMM,,,,,,,,,,MM,,M,,,,,3,,,,TM,,MM,,,,,,MMM,,MMM,,MTM,,,MM,,,,b,,,,,*M,MX
-D:XMMMM,MMMMMMMMMMMMM,,,,,,,3,,,,M,h,M,MMMMMMMMMM,,MM,,,,,MMM,,MMM,,h,,MMM,,,MMMMMMMMMMMMM,MX
-D:XM>1M,,,,,,3,,,,,,MMM,*g,323,,,M,23T,,,,,3h,,MMMMM,,,,MMT,,MMT,,,,*3,,MMM,,+,,,,,,,,,,,+,MX
-D:XMM,MMMMMMMMMMMM,MM,,,,,,,3,,,,M,*,M,MMMMMMMMMM,,MM,,,,,MMM,,MMM,,2,,MMM,,,MMMMMMMMMMMMM,MX
-D:XM,,,,MMM,,,,,,,,,MMM,,,,,,,,,,MM,,M,,,,,3,,,,TM,,MM,,,,,,MMM,,MMM,,MTM,,,MM,,,,e,,,,,*M,MX
-D:XM,MMM,,MMM,,,MMM,,,MMM,,,,,,,,,MM+MMMMMMMMMMMMMM,,MM,,,,33,MMM,MMMMMM,,MMM,,,,3,3,,,,,M,MX
-D:XM,,MMM,,,MMM,,,MMM,,,MMM,,,,,,,,,,M,,,,M,3,M,3,M,,,MM,,,2,,,MMM,MMM,,MMM,,,,,,,2,,,,,,M,MX
-D:XMM,3,MMM,,,MMM,,,MMM,,,MMM,,,,,,,,M,,M,M,M,M,M,M,,,,M,,33,,,,,MM,,MMMM,,,,,,,,3,3,,,,,M,MX
+D:XM,,MMM,,,MMM,,,MMM,,,MMM,,,MMM,,,,M,,M,M,M,M,M,M,,,MM,,,*,,,,,MM,,MM,,,,,a,,,,,,,c,,,*M,MX
+D:XMMMM,,,MMM,,,MMM,,,MMM,,,MMM,,,,,,M,,M,M,M,M,M,M,,,,M,a,b,c,,,,M,,,M,,,,,,,,,,,,,,,,,,M,MX
+D:XMM,,,MMM,,,MMM,,,MMM,,,MMM,,,,,,,,M,,M,M,M,M,M,M,,,,M,,,,,,,,,MM,,MMMM,,,,,,,,,2,,,,,,M,MX
+D:XM,,MMM,,,MMM,,,MMM,,,MMM,,,,,,,,,,M,,,,M,,,M,,,M,,,MM,,,2,,,MMM,MMM,,MMM,,,,,,,,,,,,,,M,MX
+D:XM,MM,,,MMM,,,MMM,,,MMM,,,,,,,,,MM+MMMMMMMMMMMMMM,,MM,,,,,,,MMM,MMMMMM,,MMM,,,,,,,,,,,,M,MX
+D:XM,,,,MMM,,,,,,,,,MMM,,,,,,,,,,MM,,M,,,,,,,,,,TM,,MM,,,,,,MMM,,MMM,,MTM,,,MM,,,,b,,,,,*M,MX
+D:XMMMM,MMMMMMMMMMMMM,,,,,,,,,,,,M,h,M,MMMMMMMMMM,,MM,,,,,MMM,,MMM,,h,,MMM,,,MMMMMMMMMMMMM,MX
+D:XM>1M,,,,,,,,,,,,,MMM,*g,,2,,,,M,2,T,,,,,,h,,MMMMM,,,,MMT,,MMT,,,,*,,,MMM,,+,,,,,,,,,,,+,MX
+D:XMM,MMMMMMMMMMMM,MM,,,,,,,,,,,,M,*,M,MMMMMMMMMM,,MM,,,,,MMM,,MMM,,2,,MMM,,,MMMMMMMMMMMMM,MX
+D:XM,,,,MMM,,,,,,,,,MMM,,,,,,,,,,MM,,M,,,,,,,,,,TM,,MM,,,,,,MMM,,MMM,,MTM,,,MM,,,,e,,,,,*M,MX
+D:XM,MMM,,MMM,,,MMM,,,MMM,,,,,,,,,MM+MMMMMMMMMMMMMM,,MM,,,,,,,MMM,MMMMMM,,MMM,,,,,,,,,,,,M,MX
+D:XM,,MMM,,,MMM,,,MMM,,,MMM,,,,,,,,,,M,,,,M,,,M,,,M,,,MM,,,2,,,MMM,MMM,,MMM,,,,,,,2,,,,,,M,MX
+D:XMM,,,MMM,,,MMM,,,MMM,,,MMM,,,,,,,,M,,M,M,M,M,M,M,,,,M,,,,,,,,,MM,,MMMM,,,,,,,,,,,,,,,,M,MX
D:XMMMM,,,MMM,,,MMM,,,MMM,,,MMM,,,,,,M,,M,M,M,M,M,M,,,,M,d,e,f,,,,M,,,+,,,,,,,,,,,,,,,,,,M,MX
-D:XMg3MMM,3,MMM,,,MMM,,,MMM,,,MMM,,,,M,,M,M,M,M,M,M,,,MM,,,*,,,,,MM3,MM,,,,d,,,,,,,f,,,,*M,MX
+D:XMg,MMM,,,MMM,,,MMM,,,MMM,,,MMM,,,,M,,M,M,M,M,M,M,,,MM,,,*,,,,,MM,,MM,,,,d,,,,,,,f,,,,*M,MX
D:XMM*,,MMM,,,MMM,,,MMM,,,MMM,,,MMM,,M,,M,M,M,M,M,M,,MMMMMMMMMMMMM,,MM,,MMMMMMMMMMMMMMMMMM,MX
-D:XMMMM2,,,,3,,,MMM,,,,,,,,,MMM,,3MMMM,,M,3,M,3,M,,,M+,,,,,,,,,,,,,MM,,,,,,,,,,,,,,,,,,,,M,MX
+D:XMMMM2,,,,,,,,MMM,,,,,,,,,MMM,,,MMMM,,M,,,M,,,M,,,M+,,,,,,,,,,,,,MM,,,,,,,,,,,,,,,,,,,,M,MX
D:XMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMX
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-P:22:90 \ No newline at end of file
+P:22:90
diff --git a/lib/mods/theme/edit/s_crypt.map b/lib/mods/theme/edit/s_crypt.map
index 3d6ce71c..e6600cd6 100644
--- a/lib/mods/theme/edit/s_crypt.map
+++ b/lib/mods/theme/edit/s_crypt.map
@@ -67,30 +67,30 @@ D:X.%%@=-=-X99X.....X..XLL..X%X..LLX..XhVV..X99X=-=-..GGX
D:X%%@@...XXX9XX....XX.XX...X.X...XX.XXVVVVXX9XXX=-=.XGGX
D:X@@@....X8X-=XgggggX..X..dX4Xd..X..XWWWWWX-=X8X-=-.XGGX
D:X......XX%XX=XXgddgXX.XX8GXXXG8XX.XXWWWWXX-XX%XX...XGGX
-D:XIXIXXIX*X=X-=XgddggX..X8G^.^G8X..XWWWWWX-=X.X.X&&&XGGX
-D:XXXIXIXX*X-XX=XXggggXX.XXG^.^GXX.XXWWWWXX-XX.X.XX&&XGGX
-D:XXXXXIX**X=-X=-XIIXXXX..XG^.^GX..XVWWWVX=-XX.XddX@@XGGX
-D:X^^^^XX**X=-XX=XXIXIIXX.XX^.^XX.XXVVVVXX-XX%.XedXX@XGGX
-D:X^^f^Xe**X%%.X=-XXIXXIXbbX^.^XbbX.VV.XX=-XbX.XXXIX@IIGX
-D:X^^^XXe..X...XX=-XXXIXXXbXX.XXbXX...XX=-XXbX.XaaaXXXIGX
-D:X^^XXbbb.XGGG.XX=-XXIIXXbbXDXbbX...XX=-XXbbX.XaaaaXXIGX
-D:X^XXcbab.XVdG.cXX=-XXXIXXabXbaXX.XXX=-XXbbbX.XaaaaaXXfX
+D:XIXIXXIX*X=X-=XgddggX..X8G...G8X..XWWWWWX-=X.X.X&&&XGGX
+D:XXXIXIXX*X-XX=XXggggXX.XXG...GXX.XXWWWWXX-XX.X.XX&&XGGX
+D:XXXXXIX**X=-X=-XIIXXXX..XG...GX..XVWWWVX=-XX.XddX@@XGGX
+D:X....XX**X=-XX=XXIXIIXX.XX...XX.XXVVVVXX-XX%.XedXX@XGGX
+D:X..f.Xe**X%%.X=-XXIXXIXbbX...XbbX.VV.XX=-XbX.XXXIX@IIGX
+D:X...XXe..X...XX=-XXXIXXXbXX.XXbXX...XX=-XXbX.XaaaXXXIGX
+D:X..XXbbb.XGGG.XX=-XXIIXXbbXDXbbX...XX=-XXbbX.XaaaaXXIGX
+D:X.XXcbab.XVdG.cXX=-XXXIXXabXbaXX.XXX=-XXbbbX.XaaaaaXXfX
D:X%XbbbbbbXVWG.%.XX.DbXDXXXbXbXXXDXbD.XX....G.XGGGGGGX%X
D:XX.bababa%eWG.%.BXXXbcbbbbX.XbbbbcbXXXC...fX.%.......XX
D:X%XbbbbbbXVWG.%.XX.DbXDXXXbXbXXXDXbD.XX....G.XGGGGGGX%X
D:X8XXcbab.XVdG.cXX=-XXX.XXabXbaXXLXXX=-XXbbbX.XaaaaaXX.X
D:X88XXbbb.XGGG.XX=-XX...XbbXDXbbXLLLXX=-XXbbX.XaaaaXXX.X
D:XXXIXXe..X...XX=-XX.GGXXbXX.XXbXXILIXX=-XXbX.XaaaXXXX.X
-D:X9889Xe**X%%.X=-XXG.GdXbbX^.^XbbXILLIXX=-XbX.XXXIXhGG.X
-D:XXIXXXX**X=-XX=XXdG.GXX.XX^.^XX.XXILIIXX-XX%.XedXXXXX.X
-D:X99999X**X=-X=-XGGG..X..XI^a^IX..XILLIIX=-XX.XddX..eeeX
-D:XXXXIXXX*X=XX-XX....XX.XXI^a^IXX.XXILLIXX=XX.X.XX.GGGGX
-D:X^^^^^cX*X-X=-X.....X..X.I^a^I.X..XIILLIX=-X.X.Xdddd..X
-D:XllllX^XX%XX=XXG.GGXX.XX.IXXXI.XX.XXIILIXX-XX%XXXXXXX.X
-D:X^^^cl^=X8X-=XeG.GeX..X...X4X...X..XILLLIX-=X8X.aaaaaaX
-D:XLLX^l^-XXX9XXGG.GXX.XX...X.X...XX.XXLLLLXX9XXX.GGGGGGX
-D:X..L^l^=-X99X.....X..XWW..X%X..WWX..XLLLL.X99XXbbbbb..X
-D:X7.L^l^=-X8XX5...XX.XXWWW..c..WWWXX.XXLL.AXX8XXbbbbb.6X
+D:X9889Xe**X%%.X=-XXG.GdXbbX...XbbXILLIXX=-XbX.XXXIXhGG.X
+D:XXIXXXX**X=-XX=XXdG.GXX.XX...XX.XXILIIXX-XX%.XedXXXXX.X
+D:X99999X**X=-X=-XGGG..X..XI.a.IX..XILLIIX=-XX.XddX..eeeX
+D:XXXXIXXX*X=XX-XX....XX.XXI.a.IXX.XXILLIXX=XX.X.XX.GGGGX
+D:X.....cX*X-X=-X.....X..X.I.a.I.X..XIILLIX=-X.X.Xdddd..X
+D:XllllX.XX%XX=XXG.GGXX.XX.IXXXI.XX.XXIILIXX-XX%XXXXXXX.X
+D:X...cl.=X8X-=XeG.GeX..X...X4X...X..XILLLIX-=X8X.aaaaaaX
+D:XLLX.l.-XXX9XXGG.GXX.XX...X.X...XX.XXLLLLXX9XXX.GGGGGGX
+D:X..L.l.=-X99X.....X..XWW..X%X..WWX..XLLLL.X99XXbbbbb..X
+D:X7.L.l.=-X8XX5...XX.XXWWW..c..WWWXX.XXLL.AXX8XXbbbbb.6X
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
D:XXXXXXXIIIIXIIIIXXIIIXIIIIXXIIIXXXXggggXc..cXaaaaXbb.CX
D:XIIIIIXIXXIIIXXIIXIXIXIXXIXXIXIXXXXgddg%....%aaaa%bb..X
diff --git a/lib/mods/theme/edit/s_doom.map b/lib/mods/theme/edit/s_doom.map
index 5be3b67d..12ff7d06 100644
--- a/lib/mods/theme/edit/s_doom.map
+++ b/lib/mods/theme/edit/s_doom.map
@@ -15,7 +15,7 @@ F:$:178:0
F:%:205:0
# Hidden Door
-F:+:48:0:0:0:0:0:0:0:177
+F:+:48:0:0:0:0:0:0:177
# Normal Door
F:D:32:0
@@ -29,12 +29,6 @@ F:L:85:0
# Treasure (random) on shallow lava
F:*:86:0:0:*
-# Trap (random) on deep lava
-F:^:85:0:0:0:0:0:*
-
-# Trap (random) on shallow lava
-F:t:86:0:0:0:0:0:*
-
# up staircase
F:<:6:0
@@ -194,28 +188,28 @@ D:X #%%NNLL...JJJ....LL#
D:X ##### #NNNN...Ljjjjj..LLL# #############################################..1!!!!...L### X
D:X##.LL## #nNNN...LLJJj.LLLLL# #L....&!&!&....L%%%%%%%L..mRR%R%%M%MML%LL...DL...!1&..@L%%# X
D:X#LL<..# #nn.LL.LLLL...%%%LL# #..##########################################LLL....LLL%%%# X
-D:X##%LL## #....LLL%%LLL..^LLL# #.L# #LL2.t..q.LLL## X
+D:X##%LL## #....LLL%%LLL..LLLL# #.L# #LL2....q.LLL## X
D:X ###+# #D##############+#######.L# ##%%.LLLL&L...# X
-D:X #!# #.# #.......L%%# ##%%LL..2...t.## X
-D:X #^# #.############ ##########+# XXXXXXXXXX ##.9.t.LLLLL## X
+D:X #!# #.# #.......L%%# ##%%LL..2.....## X
+D:X #L# #.############ ##########+# XXXXXXXXXX ##.9...LLLLL## X
D:X #.# #LL%%%%LL...p# #11111# X########X ###############.2..LQ#+# X
-D:X ##.# ############D## #11211# X#9....9#X #o.....t...# ###^L..#(# X
+D:X ##.# ############D## #11211# X#9....9#X #o.........# ###LL..#(# X
D:X #L## ##%%V## #12221# XXXXXX#..$$..#XXXXXX#LLLLKkk...# ###D#### X
-D:X ##!# ##.VH^%## #12221# X######t....m######X#LLLLkkk.LL# #.# X
-D:X #.# ##.iH%%hv## #11211### X#sSSSrrt%.mVVVLLe#X#.LL.kkk...# ##.# X
-D:X ###D######### #tiI%HHhvL# #11111+9# X#rRssRr.%.mVvvm..#X#%...LLL...# ##Lo###### X
-D:X #.^t^LLL...L## #.LIH%Hc..# ######### X#.MmmM..%..MMLLL.#X#%%......L&# ##.L##EBBB# X
-D:X #.jJ%%%L....L# ##..ICCL.## X#.L..L..%ttL.....#X########D### #.####LAAB## X
+D:X ##!# ##.VHL%## #12221# X######.....m######X#LLLLkkk.LL# #.# X
+D:X #.# ##.iH%%hv## #11211### X#sSSSrr.%.mVVVLLe#X#.LL.kkk...# ##.# X
+D:X ###D######### #.iI%HHhvL# #11111+9# X#rRssRr.%.mVvvm..#X#%...LLL...# ##Lo###### X
+D:X #.L.LLLL...L## #.LIH%Hc..# ######### X#.MmmM..%..MMLLL.#X#%%......L&# ##.L##EBBB# X
+D:X #.jJ%%%L....L# ##..ICCL.## X#.L..L..%..L.....#X########D### #.####LAAB## X
D:X #JJJJL%LLL&..# ##..L.L## X#9LLL...%..LL(LLq#X #..L..# #.LL..LB%%L# X
-D:X #J%J..LLL%%LL## ##.t.## X######......######X #L.#### ###..LL%%%L## X
-D:X #jJJ^..bL%LL..## ##D################# XXXXXX#.LUUL.#XXXXXX #.L# #.PL%%%@(L# X
-D:X ##....BABLL..L.## #.uLL^L..L%^^..L%%# X#.L%%LL#X #L.#### ###.L%LL..##X
-D:X ##....B%%L.....## #################L# X#LLL..t#X #..twW# #L..LL...+pX
+D:X #J%J..LLL%%LL## ##...## X######......######X #L.#### ###..LL%%%L## X
+D:X #jJJL..bL%LL..## ##D################# XXXXXX#.LUUL.#XXXXXX #.L# #.PL%%%@(L# X
+D:X ##....BABLL..L.## #.uLLLL..L%LL..L%%# X#.L%%LL#X #L.#### ###.L%LL..##X
+D:X ##....B%%L.....## #################L# X#LLL...#X #...wW# #L..LL...+pX
D:X ###....LLL...LLL####################.# X#%L..7.#X #####L# ###LL...1###oX
-D:X #9+L%%L...LLL....D.+..%%oF.%%^..%%LL.# X#LLLLt.#X #p# #%%%!@..## #tX
-D:X ##################L###.L###..###.L#### X#7tt.LL#X #.# ######### #EX
+D:X #9+L%%L...LLL....D.+..%%oF.%%L..%%LL.# X#LLLL..#X #p# #%%%!@..## #.X
+D:X ##################L###.L###..###.L#### X#7...LL#X #.# ######### #EX
D:X ##################.# ############## X#.LLLL.#X ######D###################LX
-D:X ##11!!!&LL.+(#L# X#LL%%LL#X #G..LLL.LL...D..LL....^LLL%X
+D:X ##11!!!&LL.+(#L# X#LL%%LL#X #G..LLL.LL...D..LL....LLLL%X
D:X ##1!!!%%%%Lp###L# X#L%%%%Q#X #..LF....K...##############X
D:X ##!!%%%%%LLL..#.# XXXXDDXXXX########.LLLL..KKK..#### X
D:X ##.LLLLLLL...+.# #%%%%%%%%%%%%%+LL7..LL.k..L+o7# X
diff --git a/lib/mods/theme/edit/s_factory.map b/lib/mods/theme/edit/s_factory.map
index 0cc3de1b..02d3e5f9 100644
--- a/lib/mods/theme/edit/s_factory.map
+++ b/lib/mods/theme/edit/s_factory.map
@@ -83,65 +83,62 @@ F:<:6:0
F:>:7:0
# between gate 1
-F:1:160:6:0:0:0:0:0:845
+F:1:160:6:0:0:0:0:845
# between gate 2
-F:2:160:6:0:0:0:0:0:846
+F:2:160:6:0:0:0:0:846
# between gate 3
-F:3:160:6:0:0:0:0:0:4370
+F:3:160:6:0:0:0:0:4370
# between gate 4
-F:4:160:6:0:0:0:0:0:3339
+F:4:160:6:0:0:0:0:3339
# between gate 5
-F:5:160:6:0:0:0:0:0:4119
+F:5:160:6:0:0:0:0:4119
# between gate 6
-F:6:160:6:0:0:0:0:0:6659
+F:6:160:6:0:0:0:0:6659
# between gate 7
-F:7:160:6:0:0:0:0:0:9257
+F:7:160:6:0:0:0:0:9257
# between gate 8
-F:8:160:6:0:0:0:0:0:8018
+F:8:160:6:0:0:0:0:8018
# between gate 9
-F:9:160:6:0:0:0:0:0:9298
+F:9:160:6:0:0:0:0:9298
# between gate A
-F:A:160:6:0:0:0:0:0:805
+F:A:160:6:0:0:0:0:805
# between gate B
-F:B:160:6:0:0:0:0:0:831
+F:B:160:6:0:0:0:0:831
# between gate D
-F:D:160:6:0:0:0:0:0:809
+F:D:160:6:0:0:0:0:809
# between gate E
-F:E:160:6:0:0:0:0:0:2826
+F:E:160:6:0:0:0:0:2826
# between gate F
-F:F:160:6:0:0:0:0:0:2831
+F:F:160:6:0:0:0:0:2831
# between gate H
-F:H:160:6:0:0:0:0:0:4631
+F:H:160:6:0:0:0:0:4631
# between gate J
-F:J:160:6:0:0:0:0:0:7198
+F:J:160:6:0:0:0:0:7198
# between gate K
-F:K:160:6:0:0:0:0:0:7990
+F:K:160:6:0:0:0:0:7990
# between gate N
-F:N:160:6:0:0:0:0:0:9253
+F:N:160:6:0:0:0:0:9253
# Treasure on floor
F:$:1:0:0:*65
-# Trap (random) on floor
-F:^:1:0:0:0:0:0:*
-
### Monsters
@@ -203,9 +200,9 @@ D:X&XXXe.XX~XXeeeXX~XXe..XX~~~~~~ttttXX.....X,,,,Ll,ll,X..XII.X.X.i.XXG_XXXXL%%L
D:X..&..XX~~~XXeXX~?~XX.&X~~~~t~ttttttX.;.;.X,lllll,ll,XX_..XX.XX#X..X#XXf.X_GG_X.fX
D:XGXGXGX?~~~~_c_~~~~~X.&XX~~~~t~ttttXX.....X,L,,,,,lL,.X.#XXi..G.XXiX..XX.........X
D:X.....XX~~?XXcXX~~~XXa..XXX__XX__XXXX.;.;.X,L,.XXX%L%XXXXcXX.XXX.X.X.X.XX.X.ff.X.X
-D:XXgXgXgXX~XXcccXX?XXXXX.a^^a.^^a...bXXXGXXX%L%XX.XX%XXa.aXIX.Xi#.XiXI.X.X........X
-D:XgXgXgXgXXX^^^^^XXX,ccXXXXXXXXXXXb.XX#...#XX%XX.XI_XX....X.X.#XXXIX.#GX.X.X....X.X
-D:X.......4X.^^5^^.X.c.c..c..c.c..c.XX.#...#.XXXIXX.X.a.c..XXi..I.X._.X.XXX...&&...X
+D:XXgXgXgXX~XXcccXX?XXXXX.a..a...a...bXXXGXXX%L%XX.XX%XXa.aXIX.Xi#.XiXI.X.X........X
+D:XgXgXgXgXXX.....XXX,ccXXXXXXXXXXXb.XX#...#XX%XX.XI_XX....X.X.#XXXIX.#GX.X.X....X.X
+D:X.......4X...5...X.c.c..c..c.c..c.XX.#...#.XXXIXX.X.a.c..XXi..I.X._.X.XXX...&&...X
D:X..&&...XXXXXXXXXXc,c,c.XX_XX..ccXX..#...#..XX#iiX.X.a..a.XX.#XX._X.XX.XX.X....X.X
D:X......XXEX,,,c,c,cc,ccXXMRMXXc.XX...#...#...XXX#iXXXXXc..IXGX.XXiX.....X........X
D:XXXXXXXX..X,,,,,,,,,,,XXM..RMXXXX$$XXX...XXX$$XX..XX_GXXXXXX.Ii.X_X.X#XXX.X....X.X
@@ -217,20 +214,20 @@ D:Xs.s._..&.&.XlX_._XlX..gg....X$$$#....%%%....#$$$X.IIX.X..XIXX.X.G#X..dXLl#_._
D:X.s.s_g....XXlXXGXXlXX.g..d&.XX$$XXXXX...XXXXX$$XXXX._XG#X.XX.X_X.XX.c.XXXX...XXXX
D:XXXXXXXXXXIXLLLXGXLLLXgg.g.d..XX$$$XXX...XXX$$$XX<...XiXX.X.Xi.X.X.Xd..X.........X
D:Xgg.gXg.gXIXL%LXGXL%LXGXXX__XXXXX$$XXX...XXX$$XXXXXXIXXiX#XX#XX#X_XX...XXXXXXXIXXX
-D:X^^X^X^X^X^XX_XXGXX_XXGXXg..g.%.XX...X...X...XX.GI.X._iXXG...I..I.GX..dIX#I#I#I#IX
-D:X^^X^X^X^X^Xhl,&c.a&g.l.XX.g.g%RRXX..X###X..XX..#_X..XXX_iXXIXiXi_.Xc..X.IX.XXXIXX
-D:X^^X^X^X^X^X&,,,l&,lac.&.__.g.%.R.XX...>...XX#X.X..XX#.._X.X.X.#.XGX.X.XX_XX.X#i.X
+D:X..X.X.X.X.XX_XXGXX_XXGXXg..g.%.XX...X...X...XX.GI.X._iXXG...I..I.GX..dIX#I#I#I#IX
+D:X..X.X.X.X.Xhl,&c.a&g.l.XX.g.g%RRXX..X###X..XX..#_X..XXX_iXXIXiXi_.Xc..X.IX.XXXIXX
+D:X..X.X.X.X.X&,,,l&,lac.&.__.g.%.R.XX...>...XX#X.X..XX#.._X.X.X.#.XGX.X.XX_XX.X#i.X
D:XH.Xg.gXg.gXla,ca&,f.fl.leXX..%R.RRXX.....XX.G.XX#XXI.XX.#.XGXXXiX.#X.XX.i._X.XGX#
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXGXXXXXXXG.X..X#XXX.XX.XXI._XIX.XIXXI#.XXX.X
D:X,.,G,&&,ee,ff,hgg,&&,,,.,,I7XXXc..aX.;.;.X&..XXXG#XX.G.XXX..XG######.G.#..##..iXX
-D:X^X,G.&&.ee,ff..gg,&&,.,,,,XXX..MRM.X.....X.....XXX.IIX.XGI.XX..IXXXXXXXXXXX._.X._
-D:X^X,XXXXXXXXXXX.XXXXXX,,.XXX..$.....X.;.;.Xh..&...GXXXGXi#IXX.IXX..#.....#.XX##XXX
-D:X^X,llL,LlLL,LXXXlll,XXXXX..aMR..$.cX.....X.....XXXX8XXXXXXXX#IX###..##.#..#XI.XKX
-D:X^XlLCCCCCCCCLllll%%l.R.R.R.R..M.R..X.;.;.X&..XXX.#X#.i.#.XXX#X...###.#.##.#.X#IXX
-D:X^X,lL,llL,Ll,XXX,lllXXXXXc.M..R.c..X.....XXXXX#.#.XIX#Xi.X...X###.#####.#...X#XXX
-D:X^X,XXXXXXXXXXX.XXXXXX,.,XXX...$.M..X.;.;.Xh.##i#.#XX_IX.#X.##I....#.#.###.##X#I.X
-D:X^X.G,&&,,gg.&.,ee,ff,,.,.,XXXa..R..X.....X..#.###.XIXX.X.X.##XX####..#..###II.X.X
-D:X,,,G,&&,,gg.&h.ee,ff,..,.,I^XXXM..9X.;J;.Xh.##.###..iiX#.X....II.....#....IX..XNX
+D:X.X,G.&&.ee,ff..gg,&&,.,,,,XXX..MRM.X.....X.....XXX.IIX.XGI.XX..IXXXXXXXXXXX._.X._
+D:X.X,XXXXXXXXXXX.XXXXXX,,.XXX..$.....X.;.;.Xh..&...GXXXGXi#IXX.IXX..#.....#.XX##XXX
+D:X.X,llL,LlLL,LXXXlll,XXXXX..aMR..$.cX.....X.....XXXX8XXXXXXXX#IX###..##.#..#XI.XKX
+D:X.XlLCCCCCCCCLllll%%l.R.R.R.R..M.R..X.;.;.X&..XXX.#X#.i.#.XXX#X...###.#.##.#.X#IXX
+D:X.X,lL,llL,Ll,XXX,lllXXXXXc.M..R.c..X.....XXXXX#.#.XIX#Xi.X...X###.#####.#...X#XXX
+D:X.X,XXXXXXXXXXX.XXXXXX,.,XXX...$.M..X.;.;.Xh.##i#.#XX_IX.#X.##I....#.#.###.##X#I.X
+D:X.X.G,&&,,gg.&.,ee,ff,,.,.,XXXa..R..X.....X..#.###.XIXX.X.X.##XX####..#..###II.X.X
+D:X,,,G,&&,,gg.&h.ee,ff,..,.,I.XXXM..9X.;J;.Xh.##.###..iiX#.X....II.....#....IX..XNX
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/mods/theme/edit/s_gates.map b/lib/mods/theme/edit/s_gates.map
index 3ac7ccbf..37d39f22 100644
--- a/lib/mods/theme/edit/s_gates.map
+++ b/lib/mods/theme/edit/s_gates.map
@@ -55,35 +55,35 @@ F:1:1:0:0:0:0:10
### Level design
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-D:X*****...@%...aX.X9@********%%%%%%X9.VV....Xd.............A^^.......dX
-D:X*****...@%...aX.X@@********%%%%%%X.VVVV.X.XX.............B^^........X
-D:X*****...@%...aX.X99*XXX****%%88%%XVVWWVVX..XX.............^^.......9X
-D:X*****...@%...aX.X@@XXdXX***%%88%%XVVWWVVX...XX............^^.......CX
-D:X*****...@%...aX.X@XX...XX**%%%%%%X.VVVV.X.X..XX..........5^^........X
-D:X........@%...aX.XXX.....XX*%%%%%%X9.VV..X.XX..XX.........F^^.......dX
+D:X*****...@%...aX.X9@********%%%%%%X9.VV....Xd.............A.........dX
+D:X*****...@%...aX.X@@********%%%%%%X.VVVV.X.XX.............B..........X
+D:X*****...@%...aX.X99*XXX****%%88%%XVVWWVVX..XX......................9X
+D:X*****...@%...aX.X@@XXdXX***%%88%%XVVWWVVX...XX.....................CX
+D:X*****...@%...aX.X@XX...XX**%%%%%%X.VVVV.X.X..XX..........5..........X
+D:X........@%...aX.XXX.....XX*%%%%%%X9.VV..X.XX..XX.........F.........dX
D:X%X......@%...aX.X........XIXXXXXXXXXXX..X..XX..XXXXIXXXXXXXXXXXXXXXXX
D:X.XXX....@%...aX.X..........XXX..>X...X..X...XX..XXXaXaXaXaXaXaXaXaXaX
D:X...XXX..@%...aI.X..........XXX7..X...D..X.X..XX..XX.................X
D:X.....XXX@%...aX.X..........XXXXXXXXXXX..X.XX..XX..XX................X
D:X.......XXX...aX.X..........XXXXXXXaG....X..XX..XX..XX...............X
-D:X..X......XXX.XX%XX^^^^^X...XXXXXXXaG....X...XX..XX..XX..............X
-D:X^^XX.......XXX***X^^^^^X...XIIII7XXXXXXXXXX..XX..XX..XXXXXXXXXXXX+X8X
-D:X^^XX.........X.6.X^^^^^X...XIXXXXX&&&&&&&&XX..XX..XX...........cX.XXX
-D:X..XXX........X***X^^^^^X...XIXXXXX.........XX..XX..XXXXXXXXXXXXXX..XX
-D:X^^X8X........XXXXX^^^^^X...XIIIIIXVVV.......XX..XX.............bXX..X
+D:X..X......XXX.XX%XX.....X...XXXXXXXaG....X...XX..XX..XX..............X
+D:X..XX.......XXX***X.....X...XIIII7XXXXXXXXXX..XX..XX..XXXXXXXXXXXX+X8X
+D:X..XX.........X.6.X.....X...XIXXXXX&&&&&&&&XX..XX..XX...........cX.XXX
+D:X..XXX........X***X.....X...XIXXXXX.........XX..XX..XXXXXXXXXXXXXX..XX
+D:X..X8X........XXXXX.....X...XIIIIIXVVV.......XX..XX.............bXX..X
D:X..X8XX................XX...XXXXXIXVVVV.......XX..XXXXXXXXXXXXXXXXXX+X
-D:X^^X88X................XX...XIIIIIXVVVVVV..@...XX.^^^^^^^^^^^^^a.....X
-D:X^^X99XX...............XX...XIXXXXX4..VVVV......XXXXXXXXXXXXXXXXXXXXXX
+D:X..X88X................XX...XIIIIIXVVVVVV..@...XX..............a.....X
+D:X..X99XX...............XX...XIXXXXX4..VVVV......XXXXXXXXXXXXXXXXXXXXXX
D:X..X999X...............XX...XIXXXXXXXXX.VVVV....***********.........bX
-D:X^^XIIIXX..............XX...XIX...5..fX...VVVVV.@....................X
+D:X..XIIIXX..............XX...XIX...5..fX...VVVVV.@....................X
D:X..X....X........d.....XX...XIXf......X...VVVVVVV...............@....X
-D:X^^X....XX............XXX...XIXXXXXXXXX.......VVVVVVV................X
-D:X^^X&&&&&X............XXX...XIIIIIXe...........VVVVVVVVVVVV..........X
+D:X..X....XX............XXX...XIXXXXXXXXX.......VVVVVVV................X
+D:X..X&&&&&X............XXX...XIIIIIXe...........VVVVVVVVVVVV..........X
D:X..X%%%.%XX..........XXX....XXXXXIX.............@VVVVVVVVVVVV@.......X
-D:X^^X88%.%8X.........XXX.....XXXXXIX...................VVVVVVVVVV.....X
+D:X..X88%.%8X.........XXX.....XXXXXIX...................VVVVVVVVVV.....X
D:X..X%%%.%%XX........XX......XXXXXIX@.....................VVVVVVVVVVVVX
-D:X^^X......cX......XXXX......XXXXXIX........@..........@....VVVVVVVVVVX
-D:X^^^......cXX888XXXXX......dIIIIIIX.........................b.VVV...6X
+D:X..X......cX......XXXX......XXXXXIX........@..........@....VVVVVVVVVVX
+D:X.........cXX888XXXXX......dIIIIIIX.........................b.VVV...6X
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -97,9 +97,9 @@ D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXLgXXXXXXXXXXXXXXXXXXXXXXXXLLLLXXXXXXXXXXXX
D:XXXXXXXXXXXXXXXXXXXfXXXXXXXXLXXXXXXXXXXXXXXXXXXXXXXXXXgLLLLXXXXXXXXXXX
D:XXXXXXXXXXXXXXXXXXX.XXXXXXXghgXXXXbXXXXXXXXaXXXXXXXXXXXXXXLLLLgXXXXXXX
D:XXXXXXXXXXXXXXXXXXX.XXXXXXXg1gXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXgLLXXXXXXX
-D:XXXXXXXXXXXXXXXXXXX^XXXXXXXXXXXXXX^XXXXXXXX^XXXXXXXXXXXXXXXXXXLXXXXXXX
-D:XXXXXXXXXXXXXXX4..^^^..^^^.......^^^......^^^.........EXXXXXXXLXXXXXXX
-D:XXXXXXXXXXXXXXXXXXXXXXXX^XXXXXXXXX^XXXXXXXX^XXXXXXXXXXXXXXXXXLLXXXXXXX
+D:XXXXXXXXXXXXXXXXXXX.XXXXXXXXXXXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXXXLXXXXXXX
+D:XXXXXXXXXXXXXXX4......................................EXXXXXXXLXXXXXXX
+D:XXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXXLLXXXXXXX
D:XXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXX.XXXXXXXX.XXXXXXXXXXXXXXXXLLLXXXXXXX
D:XXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXcXXXXXXXXaXXXXXXXXXXXXXXXLLXXXXXXXXX
D:XXXXXXXXXXXXXXXXXXXXXXXXeXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXgLLLXXXXXXXXXX
diff --git a/lib/mods/theme/edit/s_name.map b/lib/mods/theme/edit/s_name.map
index 795d8786..e1a352ef 100644
--- a/lib/mods/theme/edit/s_name.map
+++ b/lib/mods/theme/edit/s_name.map
@@ -62,46 +62,46 @@ F:1:1:0:0:0:0:16
### Level Design
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-D:X.....LLLLLLLLL.....XXX.G=-&&=-G^.........>X
-D:X.LLL...........LLLXX...G=-&.=-G^........1.X
-D:X.L9L.LLLLLLLLLLLLX%...EGE.=&.FG^..........X
-D:X.L99.L&..........X%....G..&-..G^....j.....X
-D:X.LLLLL&LLLLLLLLL.LXX...G=-=&-=G^..........X
-D:X....&&&L.......L.L*XXX.G-=&&-=G^^^^^^^^^^^X
+D:X.....LLLLLLLLL.....XXX.G=-&&=-G..........>X
+D:X.LLL...........LLLXX...G=-&.=-G.........1.X
+D:X.L9L.LLLLLLLLLLLLX%...EGE.=&.FG...........X
+D:X.L99.L&..........X%....G..&-..G.....j.....X
+D:X.LLLLL&LLLLLLLLL.LXX...G=-=&-=G...........X
+D:X....&&&L.......L.L*XXX.G-=&&-=G...........X
D:XLLLLLLLL.LLLLL..&L**XXXXXXXGGGG%XXXXXXXXXXX
-D:XXXXXXLL..L***LLLLLLLX^^^^8Xi....%@@^^.^^@@X
-D:X5..8X.&.XXXXXX......D^^^^8XIIIIIXbb^^.^^ccX
-D:X...8X...XA...X.LLLLLX^^^^8X.....X..^^.^^..X
-D:X...8X.XXXC...X.LL...XXXIXXX^^^^^X..^^.^^..X
-D:XGXXXX.LfX7...X&LL.L.Xa^^^aXf...fX..^^.^^..X
-D:X.X5XL.L*XB...X&&..L.X^b^b^X^^^^^X..^^.^^..X
-D:X.X^XL.L*XXXXXXLLLLL.X^^7^^X.....X..^^.^^..X
-D:X.X^XL.L***fXL.....&&X^b^b^XIIIIIX..^^.^^..X
-D:X.X^XL.LLLLLXL.LLLLLLXa^^^aXi....X..^^.^^..X
-D:X.X^XL.........XXXXXXXXX%XXXXXXXXX..^^.^^..X
-D:X.X^XXXXXXXXXXLX^...^Xe-^=dX^^..&X..^^.^^..X
-D:X.X^^^^^^^^^^XLX.^^^.X-^^^=X^^..&X..^^.^^..X
-D:X.XXXXXXXXXX^X8Xf^B^.%^^6^^%^^C.&X..^^.^^..X
-D:X.LLLLLLLLL+^XXX.^^^.X-^^^=X^^..&X..^^.^^..X
-D:X.XXXXXXXXXXXXXX^...^Xd-^=eX^^..&X..^^.^^..X
-D:X.Xbbbbb......XXXXXXXXXX%XXXXXXXXX..^^.^^..X
-D:X.XbbbbXXXX^^^^XX....X^^^^^X...h.X..^^.^^..X
-D:X.XbbbXX^^XXX^^^XX...X^ccc^X....0X..^^.^^..X
-D:X.XbbXX.^X%bXX^^^XX..X^.A.^X.....X..^^0^^..X
-D:X.IbXX..XXbbbXX^^^XX.X^ccc^XIXXXXXXXXXXXXXXX
-D:X.XXX..XX.....X%^^^XXX^^^^^XlllllllllllllllX
-D:X.X99.XXW......XX^^^XXXXXXXXlllllllllllllllX
-D:X.X99XXWWW...a..XX^^.XXllllllLLLLLlXXXX%XXXX
-D:X.XXXX..WWW.....cXX^.XXXXXlllllllllXVVVVVVVX
-D:X.X8.....WWW....ccX^.X^^^XLLLlLLLLLXVVVVVVVX
-D:X.X%XXXXXXXWW...cXXX.X+X^XlllllllllXV%%%%%VX
-D:X.X.......XWWW..X%^X.XLX^XlLLLLLLLLXV%8^8%VX
-D:X.XXXXXX%.X.WWWXX^^X.XLX^XlllllllllXV%^a^%VX
-D:X.X.IIIIX.X..WXX..XXcXLX^XLLLlLLLLlXV%^^^%VX
-D:X.X%XXXIX.X..XX..XXccXLX^XlglllLgllXV%^^^%VX
-D:X.Xa.6XIX.X.XX..XXcccXLX^XlllllXXXXXV%^a^%VX
-D:X+XXX.XIX.X.X99XXccccXLX^XXXXXXX888XV%8^8%VX
-D:X%%%Xa%.X.%8X99XcccccXLX^^^^^^4X...XV%%%%%VX
+D:XXXXXXLL..L***LLLLLLLX....8Xi....%@@.....@@X
+D:X5..8X.&.XXXXXX......D....8XIIIIIXbb.....ccX
+D:X...8X...XA...X.LLLLLX....8X.....X.........X
+D:X...8X.XXXC...X.LL...XXXIXXX.....X.........X
+D:XGXXXX.LfX7...X&LL.L.Xa...aXf...fX.........X
+D:X.X5XL.L*XB...X&&..L.X.b.b.X.....X.........X
+D:X.X.XL.L*XXXXXXLLLLL.X..7..X.....X.........X
+D:X.X.XL.L***fXL.....&&X.b.b.XIIIIIX.........X
+D:X.X.XL.LLLLLXL.LLLLLLXa...aXi....X.........X
+D:X.X.XL.........XXXXXXXXX%XXXXXXXXX.........X
+D:X.X.XXXXXXXXXXLX.....Xe-.=dX....&X.........X
+D:X.X..........XLX.....X-...=X....&X.........X
+D:X.XXXXXXXXXX.X8Xf.B..%..6..%..C.&X.........X
+D:X.LLLLLLLLL+.XXX.....X-...=X....&X.........X
+D:X.XXXXXXXXXXXXXX.....Xd-.=eX....&X.........X
+D:X.Xbbbbb......XXXXXXXXXX%XXXXXXXXX.........X
+D:X.XbbbbXXXX....XX....X.....X...h.X.........X
+D:X.XbbbXX..XXX...XX...X.ccc.X....0X.........X
+D:X.XbbXX..X%bXX...XX..X..A..X.....X....0....X
+D:X.IbXX..XXbbbXX...XX.X.ccc.XIXXXXXXXXXXXXXXX
+D:X.XXX..XX.....X%...XXX.....XlllllllllllllllX
+D:X.X99.XXW......XX...XXXXXXXXlllllllllllllllX
+D:X.X99XXWWW...a..XX...XXllllllLLLLLlXXXX%XXXX
+D:X.XXXX..WWW.....cXX..XXXXXlllllllllXVVVVVVVX
+D:X.X8.....WWW....ccX..X...XLLLlLLLLLXVVVVVVVX
+D:X.X%XXXXXXXWW...cXXX.X+X.XlllllllllXV%%%%%VX
+D:X.X.......XWWW..X%.X.XLX.XlLLLLLLLLXV%8.8%VX
+D:X.XXXXXX%.X.WWWXX..X.XLX.XlllllllllXV%.a.%VX
+D:X.X.IIIIX.X..WXX..XXcXLX.XLLLlLLLLlXV%...%VX
+D:X.X%XXXIX.X..XX..XXccXLX.XlglllLgllXV%...%VX
+D:X.Xa.6XIX.X.XX..XXcccXLX.XlllllXXXXXV%.a.%VX
+D:X+XXX.XIX.X.X99XXccccXLX.XXXXXXX888XV%8.8%VX
+D:X%%%Xa%.X.%8X99XcccccXLX......4X...XV%%%%%VX
D:X%.%XXXXXXXXXXXXIXXXXXLXXXXXXXXX...XVVVVVVVX
D:X.%%+..........................G..4X...F...X
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/mods/theme/edit/s_orthanc.map b/lib/mods/theme/edit/s_orthanc.map
index fd14d3d4..9b357c2d 100644
--- a/lib/mods/theme/edit/s_orthanc.map
+++ b/lib/mods/theme/edit/s_orthanc.map
@@ -52,48 +52,48 @@ D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
D:X;;;;;;;;;;;;;;;;;;;;;;;,,,,,,,,,,a,4,a,,,,,,,,,,,,,,,;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;a;&,a,,,,,~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,X
D:X;;;;;;;;;;;;;;;;;,,,,,,,,,,,,,,,,,a,a,,,,,,,,,,,,,,,,,,,,,,,,;;;;;;;;;;;;;;;;;;;;;,,,a,a,,,,~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,X
D:X;;;;;;;;;;;;;;;,,,,,,,,XXXXXXXXXXXXXXXXXXXXXXXXXX,,,,,,,,,,,,,,,,,;;;;;;;;;;;;;,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,X
-D:X;;;;;;;;;;;;;,,,,,,XXXXX2^b^.^.^b^.^.^b^.^.^b^.2XXXXX,,,,,,,,,,,,,,,,,,;;;,,,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,X
-D:X;;;;;;;;;;,,,,,,XXXX2.^.^.^.XX^.^.^.^.^.^.XX^.^.^.^2XXXX,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,X
-D:X;;;;;;;a,a,,,,XXX2.^.^.^b^.^XX.^.^.^b^.^.^XX.^.^b^.^.^2XXX,,,,,,,,,,,,,a,a,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,X
-D:X;;;;;;a,7,a,XXX2^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.2XXX~~~~~,,,,,a,&,a,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,X
-D:X;;;;;;,a,aXXX2.^.^XXXXXXXXXXXXXXXXXXDDDXXXXXXXXXXXXXXXGGGGGXXX~~~~,,,,,a,a,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,,X
-D:X;;;;;;,,XXX2^.^.XXX.^.^.^.^.^.XX^.^.^2^.^.^XX.^b^.^.^XXX.^.^.XXX~~~,,,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,,,,,,X
-D:X;;;;;,,XX2.^.^bXX^.^b^.^.^.^.^XX.^!^.!^.!^.XX^.^.^.^b^.XX.^b^.^XX~~~~,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,;;;;;,,,,,,,X
-D:X;;;;;,XX2.^.^.XX^.^.^.GGGG^.^.XX^.^.^.^.^.^XX.^.^GGGG.^.XX.^.^.^XX~~~~~~~~,,,,,,,~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,;;;;;,,,,,,,,,X
-D:X;;;;,,XX.^b^.XX^.^.^.^G$$G.^.^XX.^.^b^.^b^.XX^.^.G$$G^.^.XX.^b^.XX~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,;;;;,,,,,,,,,,,X
-D:X;;;,,XX2^.^.XX^.^.^.^.G$$G^b^.XX^.^.^.^.^.^XX.^b^G$$G.^b^.XX.^.^.XX~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,,;;;;;,,,,,,,,,,,,X
-D:X;;;,,XX^.^.^XX.^.^b^.^GGGG.^.^XX^b!^.!b^!^.XX^.^.GGGG^.^.^XX^.^b^XX.~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,a,a,,,,,,;;;;;;,,,,,,,,,,,,X
-D:X;;,,XX2.^b^XX.^.^.^.^.^.^.^.^.XX^.^.^.^.^.^DD.^.^.^.^.^.^.^XX^.^.^XX,,~~~~~~~~~~~~~~~~~~,,,,,a,a,a,&,a,,,,;;;;;;;;,,,,,,,,,,,X
-D:X;;,,XX^.!.^XX^.^.^.^.^.^.^XXXXXXXXXXXXXXXXXXXXX^.^b^.^.^b^.XX.^!^.XX,,,~~~~~~~~~~~~~~~~~~~,,a,a,&,a,a,,,,,;;;;;;;;;,,,,,,,,,,X
-D:X;,,,XX.^.^.XX.^b^.^.^b^.^XG.^.^.^.^.^.^.^.^.^.XX^.^.^.^.^.^XX^.^b^XX,,,,~~~~~~~~~~~~~~~~~~~a,a,&,&,a,,,,,,;;;;;;;;;;,,,,,,,,,X
-D:X;,,,XX^b!.^XX^.^.^.^.^.^XG.^.lllllll2lllllll.^.XX^.^GGGGG^.GG.^!^.[[,,a,,~~~~~~~~~~~~~~~~~~,a,a,a,a,,,,,,;;;;;;;;;;;;,,,,,,,,X
-D:X;;,,XX.^.^.XX.^.!.^!^.^XG.^.l!^.^.^l^l^.^.^!l.^.XX^.G$$$G.^GG^.^b^[[,,,,,,~~~~~~~~~~~~~~~~~~,a,a,a,,,,,,;;;;;;;;;;;;;;,,,,,,,X
-D:X;;,,XX^.!b^XX^.^.^b^.!.XX^.ll^.^.^.^.^.^.^.^ll.^XX.^G$$$G^.XX.^!^.[[,,,a,,~~~~~~~~~~~~~~~~~~,,,,,,,,,,,;;;;;;;;;;;;;;,,,,,,,,X
-D:X;;,,XX.^.^.XX.^.^2^!^.2GG.^l$$ll.GGG^GGG.ll$$l^.XX^.G$$$G.^XX^.^b^[[,,,,,,~~~~~~~~~~~~~~~~~~~,,,,,,,,,,;;;;;;;;;;;;;,,,,,,,,,X
-D:X;;,,XX^.4.^XX^.^.^.^.^.DD^.ll^.^GG^$@$^GG^.^ll.^XX.^G$$$G^.XX.^.^.[[,,,a,,~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;;,,,,,,,,,,X
-D:X;;,,XX.^5^.XX.^b^2^.^b^DD.^ll.^.GG^$1$^GG.^.ll^.XX^.G$$$G.^XX^.^b^[[,,,,,~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;;;,,,,,,,,,,X
-D:X;;,,XX^.^.^XX^.^.^.!.^2GG^.l$$ll2GGG>GGG2ll$$l.^XX.^G$$$G^.XX.^.^.[[,,,a,~~~~~~~~~~~~~~~~~~,,,,,,,,,,,;;;;;;;;;;;;,,,,,,,,,,,X
-D:X;;,,XX.^!^.XX.^.^2^.^!^XX.^ll.^.^.^GGG^.^.^.ll^.XX^.G$$$G.^XX^.!b^[[,,,,~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,;;;;;;;;;;;,,,,,,,,,,,,X
-D:X;,,,XX^b^.^XX^.^.^b^.^.XG^.^l!.^.^.lll.^.^.!l^.^XX.^G$$$G^.GG.^.^.[[,a,~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,;;;;;;;;;;;;,,,,,,,,,,,X
-D:X;;,,XX.^!^.XX.^.!.^!^.^.XG^.^lllllll$lllllll^.^XX.^.GGGGG.^GG^.!b^[[,~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;;,,,,,,,,,,X
-D:X;;,,XX^.^b^XX^.^.^.^.^.^.XG^.^.^.^.^.^.^.^.^.^XX.^b^.^.^b^.XX.^.^.XX~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;,,,,,,,,,,X
-D:X;;,,XX.^!^.XX.^b^.^.^b^.^.XXXXXXXXXXXXXXXXXXXXX.^.^.^.^.^.^XX^.!b^XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,;;;;;;;;;;;,,,,,,,,;X
-D:X;,,,XX2.^.^XX^.^.^.^.^.^.^.^.^XX.^.^.^.^.^.XX6.^.^.^.^.^.^.XX.^.^.XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,;;;;;;;;;;,,,,,,,,,;X
-D:X;;,,,XX^b^.^XX^.^.^.^.GGGG^.^.XX^.!.^!^.!.^XX7^b^GGGG.^b^.XX.^b^.XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,;;;;;;;;;;;,,,,,,,;;X
-D:X;;;,,XX2^.^.XX.^.^b^.^G$$G.^.^XX.^A2.^.26^.XXA.^.G$$G^.^.^XX^.^.^XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,;;;;;;;;;;;,,,,,,;;X
-D:X;;;,,,XX.^.^.XX.^.^.^.G$$G^.^FXX^2^.^C^.^2^XXB^.^G$$G.^.^XX^b^.^XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,;;;;;;;;;;;,,,,;;;X
-D:X;;;;,,XX2.^b^.XX.^.^.^GGGG.^.^XX.^52.^.2B^.XXC.^.GGGG^b^XX^.^.^.XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,;;;;;;;;;;;;;;;X
-D:X;;;;,,,XX2.^.^.XX.^.^b^.^.^b^.XX^.!.^!^.!.^XXE^.^.^.^.^XX^b^.^.XX~~~~~~~~~~~~~~~,,,,,,,~~~~~~~~~~~~~~~~~~,,,,a,a;;;;;;;;;;;;;X
-D:X;;;;,,,,XXX2^.^.XXX^.^.^.^.^.^XX.^.^.^.^.^.XXF.^b^.^.XXX^.^.^XXX~~~~~~~~~,,,,,a,a,,,,,,,~~~~~~~~~~~~~~~~~~,,a,&,a;;;;;;;;;;;;X
-D:X;;;;;,,,,,XXX2^b^.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.^b^.XXX~~~~~~~~~a,a,,,a,&,a,,,,,~~~~~~~~~~~~~~~~~~~~,,a,a,,,,,;;;;;;;;X
-D:X;;;;;;,,,,,,XXX2^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.2XXX~~~~~~~~,,a,&,a,,;a;a,,,,~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;X
-D:X;;;;;;;;,,,a,aXXX2.^b^.^b^.^XX.^.^b^.^b^.^XX.^b^.^b^.^2XXX~~~~~~~~,,,,,a,a,;;;;;;,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,;;X
-D:X;;;;;;;;;;a,&,a,XXXX2.^.^.^.XX^.^.^.^.^.^.XX^.^.^.^2XXXX~~~~~~~~~~~~,,,,,,;;;;;;,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,a,a,X
-D:X;;;;;;;;;;;a,a,,,,,XXXXX2^.^b^.^b^.^b^.^b^.^.^.2XXXXX~~~~~~~~~~~~~~~~~,,,;;;;;,,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,a,&,aX
+D:X;;;;;;;;;;;;;,,,,,,XXXXX2.b.....b.....b.....b..2XXXXX,,,,,,,,,,,,,,,,,,;;;,,,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,X
+D:X;;;;;;;;;;,,,,,,XXXX2.......XX............XX.......2XXXX,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,X
+D:X;;;;;;;a,a,,,,XXX2......b...XX......b.....XX....b.....2XXX,,,,,,,,,,,,,a,a,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,X
+D:X;;;;;;a,7,a,XXX2........................................2XXX~~~~~,,,,,a,&,a,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,X
+D:X;;;;;;,a,aXXX2....XXXXXXXXXXXXXXXXXXDDDXXXXXXXXXXXXXXXGGGGGXXX~~~~,,,,,a,a,,,,,,,,,~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,,X
+D:X;;;;;;,,XXX2....XXX...........XX.....2.....XX..b.....XXX.....XXX~~~,,,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,,,,,,X
+D:X;;;;;,,XX2....bXX...b.........XX..!..!..!..XX.......b..XX..b...XX~~~~,,,,,,,,,,,,,~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,;;;;;,,,,,,,X
+D:X;;;;;,XX2.....XX......GGGG....XX...........XX....GGGG...XX......XX~~~~~~~~,,,,,,,~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,;;;;;,,,,,,,,,X
+D:X;;;;,,XX..b..XX.......G$$G....XX....b...b..XX....G$$G....XX..b..XX~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,;;;;,,,,,,,,,,,X
+D:X;;;,,XX2....XX........G$$G.b..XX...........XX..b.G$$G..b..XX.....XX~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,,,;;;;;,,,,,,,,,,,,X
+D:X;;;,,XX.....XX....b...GGGG....XX.b!..!b.!..XX....GGGG.....XX...b.XX.~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,a,a,,,,,,;;;;;;,,,,,,,,,,,,X
+D:X;;,,XX2..b.XX.................XX...........DD..............XX.....XX,,~~~~~~~~~~~~~~~~~~,,,,,a,a,a,&,a,,,,;;;;;;;;,,,,,,,,,,,X
+D:X;;,,XX..!..XX.............XXXXXXXXXXXXXXXXXXXXX...b.....b..XX..!..XX,,,~~~~~~~~~~~~~~~~~~~,,a,a,&,a,a,,,,,;;;;;;;;;,,,,,,,,,,X
+D:X;,,,XX.....XX..b.....b...XG...................XX...........XX...b.XX,,,,~~~~~~~~~~~~~~~~~~~a,a,&,&,a,,,,,,;;;;;;;;;;,,,,,,,,,X
+D:X;,,,XX.b!..XX...........XG...lllllll2lllllll...XX...GGGGG..GG..!..[[,,a,,~~~~~~~~~~~~~~~~~~,a,a,a,a,,,,,,;;;;;;;;;;;;,,,,,,,,X
+D:X;;,,XX.....XX...!..!...XG...l!.....l.l.....!l...XX..G$$$G..GG...b.[[,,,,,,~~~~~~~~~~~~~~~~~~,a,a,a,,,,,,;;;;;;;;;;;;;;,,,,,,,X
+D:X;;,,XX..!b.XX.....b..!.XX..ll...............ll..XX..G$$$G..XX..!..[[,,,a,,~~~~~~~~~~~~~~~~~~,,,,,,,,,,,;;;;;;;;;;;;;;,,,,,,,,X
+D:X;;,,XX.....XX....2.!..2GG..l$$ll.GGG.GGG.ll$$l..XX..G$$$G..XX...b.[[,,,,,,~~~~~~~~~~~~~~~~~~~,,,,,,,,,,;;;;;;;;;;;;;,,,,,,,,,X
+D:X;;,,XX..4..XX..........DD..ll...GG.$@$.GG...ll..XX..G$$$G..XX.....[[,,,a,,~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;;,,,,,,,,,,X
+D:X;;,,XX..5..XX..b.2...b.DD..ll...GG.$1$.GG...ll..XX..G$$$G..XX...b.[[,,,,,~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;;;,,,,,,,,,,X
+D:X;;,,XX.....XX......!..2GG..l$$ll2GGG>GGG2ll$$l..XX..G$$$G..XX.....[[,,,a,~~~~~~~~~~~~~~~~~~,,,,,,,,,,,;;;;;;;;;;;;,,,,,,,,,,,X
+D:X;;,,XX..!..XX....2...!.XX..ll......GGG......ll..XX..G$$$G..XX..!b.[[,,,,~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,;;;;;;;;;;;,,,,,,,,,,,,X
+D:X;,,,XX.b...XX.....b....XG...l!.....lll.....!l...XX..G$$$G..GG.....[[,a,~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,;;;;;;;;;;;;,,,,,,,,,,,X
+D:X;;,,XX..!..XX...!..!....XG...lllllll$lllllll...XX...GGGGG..GG..!b.[[,~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;;,,,,,,,,,,X
+D:X;;,,XX...b.XX............XG...................XX..b.....b..XX.....XX~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;;;;;;,,,,,,,,,,X
+D:X;;,,XX..!..XX..b.....b....XXXXXXXXXXXXXXXXXXXXX............XX..!b.XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,;;;;;;;;;;;,,,,,,,,;X
+D:X;,,,XX2....XX.................XX...........XX6.............XX.....XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,;;;;;;;;;;,,,,,,,,,;X
+D:X;;,,,XX.b...XX........GGGG....XX..!..!..!..XX7.b.GGGG..b..XX..b..XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,;;;;;;;;;;;,,,,,,,;;X
+D:X;;;,,XX2....XX....b...G$$G....XX..A2...26..XXA...G$$G.....XX.....XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,;;;;;;;;;;;,,,,,,;;X
+D:X;;;,,,XX.....XX.......G$$G...FXX.2...C...2.XXB...G$$G....XX.b...XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,;;;;;;;;;;;,,,,;;;X
+D:X;;;;,,XX2..b..XX......GGGG....XX..52...2B..XXC...GGGG.b.XX......XX~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,;;;;;;;;;;;;;;;X
+D:X;;;;,,,XX2.....XX....b.....b..XX..!..!..!..XXE.........XX.b....XX~~~~~~~~~~~~~~~,,,,,,,~~~~~~~~~~~~~~~~~~,,,,a,a;;;;;;;;;;;;;X
+D:X;;;;,,,,XXX2....XXX...........XX...........XXF..b....XXX.....XXX~~~~~~~~~,,,,,a,a,,,,,,,~~~~~~~~~~~~~~~~~~,,a,&,a;;;;;;;;;;;;X
+D:X;;;;;,,,,,XXX2.b..XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..b..XXX~~~~~~~~~a,a,,,a,&,a,,,,,~~~~~~~~~~~~~~~~~~~~,,a,a,,,,,;;;;;;;;X
+D:X;;;;;;,,,,,,XXX2........................................2XXX~~~~~~~~,,a,&,a,,;a;a,,,,~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,;;;;;;;X
+D:X;;;;;;;;,,,a,aXXX2..b...b...XX....b...b...XX..b...b...2XXX~~~~~~~~,,,,,a,a,;;;;;;,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,,,,,;;X
+D:X;;;;;;;;;;a,&,a,XXXX2.......XX............XX.......2XXXX~~~~~~~~~~~~,,,,,,;;;;;;,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,,,,a,a,X
+D:X;;;;;;;;;;;a,a,,,,,XXXXX2...b...b...b...b......2XXXXX~~~~~~~~~~~~~~~~~,,,;;;;;,,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,a,&,aX
D:X;;;;;;;;;;;;;;,,,,,,,,,XXXXXXXXXXXXXXXXXXXXXXXXXX,,~~~~~~~~~~~~~~~~,,,,;;;;;;;;,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,a,a,X
D:X;;;;;;;;;;;;;;;;;,,,,,,,,,,,,,,,,,a,a,,,,,,,,,,~~~~~~~~~~~~~~~,,,,;;;;;;;;;;;;;,,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,,X
D:X;;;;;;;;;;;;;;;;;;;;;,,,,,,,,,,,,a,E,a,,,,,~~~~~~~~~~~~~~~~~,,;;;;;;;;;;;;;;;;;,,~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,X
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
### Starting Location
-P:31:125 \ No newline at end of file
+P:31:125
diff --git a/lib/mods/theme/edit/s_ship.map b/lib/mods/theme/edit/s_ship.map
index dbbbe50d..6dcb239d 100644
--- a/lib/mods/theme/edit/s_ship.map
+++ b/lib/mods/theme/edit/s_ship.map
@@ -19,8 +19,6 @@
# I'm not sure esp. about the correct exit of gate #3.
-#%:special.txt
-
### Terrain Features
@@ -157,15 +155,6 @@ F:$:90:0:0:*47
# Treasure (good) on ice
F:%:90:0:0:*60
-# Trap (random) on ice
-F:^:90:0:0:0:0:0:*
-
-# Trap (random) on shallow water
-F:t:84:0:0:0:0:0:*
-
-# Trap (random) on fog
-F:@:210:0:0:0:0:0:*
-
# Human skeleton on ice
F:x:90:0:0:395
@@ -173,16 +162,16 @@ F:x:90:0:0:395
### Between Gates
# between gate 3: was 711
-F:3:160:6:0:0:0:0:0:1136
+F:3:160:6:0:0:0:0:1136
# between gate A: was 6247
-F:A:160:6:0:0:0:0:0:6761
+F:A:160:6:0:0:0:0:6761
# between gate 4: was 3339
-F:4:160:6:0:0:0:0:0:3853
+F:4:160:6:0:0:0:0:3853
# between gate B: was 3085
-F:B:160:6:0:0:0:0:0:3599
+F:B:160:6:0:0:0:0:3599
### Guaranteed Items
@@ -197,33 +186,33 @@ D:XXXXXXXXXXXXXXXX XXXXXXXXXXXX
D:X###############..~ .#. k w ~.#XX######### .~~ s G..#####.. w .###.######X##~~ .GX.###
D:X####%####...~ ~.~ s .#.X#~~.##### .~ s w G..#.##.#.XGG~XXk~.####A####.~X ~~.X...
D:X##%#$#######...~ w wXXXXXX#XXXX###XXX #~XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..XX....~.XX X#xX.#..#.#G. w ~X G~~
-D:X##$#########.... s XXXTT^...~.~#####w~###~~~~8....**.tE.&E ^^.M^.xx.....x..ZZ..^XTTTT M...GG.~.. w G.###~XX~~#XX . s X
-D:X#########...~ w XXXTTTT.^..x~.H#### ###~~D....8**.~M~.E..M^.MM^..xh.h...ZZZZ^~M.,.,.,.~~ .G...~~ ~###. w . w M.d.
-D:X#####.x.x~~~ XXXTTTXXXMxx.H.####### ~##~~~8...#.**.~tE&EE^^~%M^.h.x.E.xh.ZZ..^X.,.^....~ ...G.~ s ~# XX ~~ w X
-D:X######...~~ MM~ w XXX^^XXX.MMMxx...G#####w ~#~.~..&...**E.MEt.^^.MM^~..i.....ZZZZ^~M.,.,,.gM.~.,~.,G.G~~ G~. G~.MM XX..~
-D:X##.....~~ XXX^E=^XX$b.MMMMxH..HG#.## w ~#~##~8....*E~.&EM^^.M^h..i..x.x..ZZ..^XTTTTX.,.,~........~.G~~..w . G~...G~X
-D:X...~~~ K XXX^^EXXXX$$$..MMXXXXXXX#### #####XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..,.X..M~.........~G..G ~~.G...G~
-D: ~~~ w XXX^^EXXXdX%d$$b$$XXd~~~~##### s ###.,.W.**,.x.,.,.,.,.,.***,,....,x....,,.SX.,.,.,..,o.,.,.~~.G..~.G..G..~X k
-D: w MMM. w XXX^E^XXX.,*XDDd$$$XXd$..~~~~#### ###.,.,.,.**..,.,i.,.,W,.,**..z.,.,.q...g.,......~.,.,.,.,.~.~..F.~M~......~
-D: MM. XXX4EEXXXi^**.XX%%$dXX$d$.H#####~G~~####.~.,~..,.h*,,~,.,.,.,~,.,.,.H.,.~.,..~,.,,,.~,.,.~.,.,.X.~,g.~~..~.~..,..,X
-D: s XXXBXXXXX^.**.W.,XDD%XXb$$b####..G~~~G###~.,,.,.,.,...,,.x,.~.,.,~..,.~.,.,~,.,.,,.,.,~,.,.,.~,.,..,X.,.***.~***,W.,X
-D: XXX.o..X.g***i.*.,.XX%XX######^^^^t ##ttt^^^^^t^^^^^^t^^^^^t^^^^^^^t^^^^^^t^^^^t^^tt^^^tt^^^^t^tXo..x************X
-D: k XXX^E..o.XX8.****,.g..XXX..#........~~~~~ttt###~~.,.G~.......XXXXX..~,..,,..,,.~.,..,.,..,,..,.,x..,.ooX******W***g.*.g*X
-D: XXX%S^^E..ooX,*****,..,.X.....h........XXX~~~tt#tt w ~~G~...XXXXXXX.,**.,..D.**.G.,~,..XXX...~~~.....o8X***.~.,.****$$..X
-D: XX%%%^mm.E..oXH**.^.*i.....#.....i..*..XXXXX~~ G~~.XXXXXXXXX~.*..,.,*..~,..,.,XXXXX...~..,.XXXXXo.W.$$.g.x....o.X
-D: XXX%S^^E..ooX8.*~~...,~~##...,..,.***,.XXX~G~ k ~~~~XXXXXXX.,.*. g...*..x..W.~.XXX.***.,,o..oO8X.o.,.o.xx$$$XXXXX
-D: XXX^E..o.XXH.###....###~~~.,h..,.*.,..~~.~~ s ~~.XXXXX.~..**...i~**.....~.,,.,,.***~,,,.oXXXXXXXXXXXXXXXX.!.X
-D: s XXX.o..X&..w~##..##~~~X~^^^^^^^^^^t^ttt^tt w tt^tttt^^tt^^^^^ttt^^^^ttt@@^^^^ttt^^^^^ttt@^^ttXXXW ^^.M*.t^oo.^^...X s
-D: ~~~ XXX>XXH~G..#####~G~~Gt..,.,..,.,xx..x ~~~ i~~xx.~...x....~.~..~..,~..***..~..~...,~.~*.~.XXXE.^^H..SM.~^.oo....JX
-D: ~~....~~ XXX$8w~.^####G~G ~i.XX.,,.,...........G~~~s~~ iiF~...........~.......x.,.**~....,~....~.*XXX.EE.W.^^.M*.~^^^o^O^..X
-D: ~.#..#..~~ XXX8##t..##~#.G.t..XX..,H...,.W...,...,~~...,...*,,.x...,.i.....g.....**.........XXXXXXX...EE.^^H..SM.~.^oo...^JX
-D: ~.##.##..~ XXX###GG~~~*h~.^..XX.....,....,.W...,.G....W.***...,...,...,....,...,**..q....SX3tttW#...EE.W.^^.M*.t.oo.^.^.XX
-D: ~~.###..~~ X##.##~~G^~~~~i*^XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX~~
-D: ~~...###.~ k ~###X.G~~@Gh~x*~^..^i.zX8~i.~..h....zzzXiX..^$.T.t$......F.t..XX..^TTT*..M..Y....^.Y.^*.^..~....X.x..x~.<XX~.
-D: ~.....####.....#####XXXx@@~i~.z..z.it,#**t..h..Gzh.zzX@.@Xd*t.~...*~.t......^X..T.^T*@*TXMM...^....^**@.^.x*...+..~....XX..~
-D: ~~.#$%#########....XXX~h~i.HH...h,i^X*.H..h.^G..WX@.E.^X**8..Y.~*8...Y...^+XXXXXXXXXXXMF...~....^.*..x.***..X..x..~XX...~~w
-D: ~~.#$$######.~ ~w XXX$~.x..~G^..,i.,.~.h.^~~..zzX@.@Xd*......F**..~....^XbM..^~ZZZZXMM..*.....~^......*.XXXXXXXIXX.~~#~w
-D: L ~~xx########.~~ XXX$$.G#GX#.i,,^ih.^W.zG^zzzXiX.$.t88.~..^**F..T...tXX~~.^^ZZZZM~..**@~~.Y~..^#^..xXI&X8&..XX ~~~## w
+D:X##$#########.... s XXXTT....~.~#####w~###~~~~8....**.~E.&E ...M..xx.....x..ZZ...XTTTT M...GG.~.. w G.###~XX~~#XX . s X
+D:X#########...~ w XXXTTTT....x~.H#### ###~~D....8**.~M~.E..M..MM...xh.h...ZZZZ.~M.,.,.,.~~ .G...~~ ~###. w . w M.d.
+D:X#####.x.x~~~ XXXTTTXXXMxx.H.####### ~##~~~8...#.**.~~E&EE..~%M..h.x.E.xh.ZZ...X.,......~ ...G.~ s ~# XX ~~ w X
+D:X######...~~ MM~ w XXX..XXX.MMMxx...G#####w ~#~.~..&...**E.ME~....MM.~..i.....ZZZZ.~M.,.,,.gM.~.,~.,G.G~~ G~. G~.MM XX..~
+D:X##.....~~ XXX.E=.XX$b.MMMMxH..HG#.## w ~#~##~8....*E~.&EM...M.h..i..x.x..ZZ...XTTTTX.,.,~........~.G~~..w . G~...G~X
+D:X...~~~ K XXX..EXXXX$$$..MMXXXXXXX#### #####XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..,.X..M~.........~G..G ~~.G...G~
+D: ~~~ w XXX..EXXXdX%d$$b$$XXd~~~~##### s ###.,.W.**,.x.,.,.,.,.,.***,,....,x....,,.SX.,.,.,..,o.,.,.~~.G..~.G..G..~X k
+D: w MMM. w XXX.E.XXX.,*XDDd$$$XXd$..~~~~#### ###.,.,.,.**..,.,i.,.,W,.,**..z.,.,.q...g.,......~.,.,.,.,.~.~..F.~M~......~
+D: MM. XXX4EEXXXi.**.XX%%$dXX$d$.H#####~G~~####.~.,~..,.h*,,~,.,.,.,~,.,.,.H.,.~.,..~,.,,,.~,.,.~.,.,.X.~,g.~~..~.~..,..,X
+D: s XXXBXXXXX..**.W.,XDD%XXb$$b####..G~~~G###~.,,.,.,.,...,,.x,.~.,.,~..,.~.,.,~,.,.,,.,.,~,.,.,.~,.,..,X.,.***.~***,W.,X
+D: XXX.o..X.g***i.*.,.XX%XX######....~ ##~~~.....~......~.....~.......~......~....~..~~...~~....~.~Xo..x************X
+D: k XXX.E..o.XX8.****,.g..XXX..#........~~~~~~~~###~~.,.G~.......XXXXX..~,..,,..,,.~.,..,.,..,,..,.,x..,.ooX******W***g.*.g*X
+D: XXX%S..E..ooX,*****,..,.X.....h........XXX~~~~~#~~ w ~~G~...XXXXXXX.,**.,..D.**.G.,~,..XXX...~~~.....o8X***.~.,.****$$..X
+D: XX%%%.mm.E..oXH**...*i.....#.....i..*..XXXXX~~ G~~.XXXXXXXXX~.*..,.,*..~,..,.,XXXXX...~..,.XXXXXo.W.$$.g.x....o.X
+D: XXX%S..E..ooX8.*~~...,~~##...,..,.***,.XXX~G~ k ~~~~XXXXXXX.,.*. g...*..x..W.~.XXX.***.,,o..oO8X.o.,.o.xx$$$XXXXX
+D: XXX.E..o.XXH.###....###~~~.,h..,.*.,..~~.~~ s ~~.XXXXX.~..**...i~**.....~.,,.,,.***~,,,.oXXXXXXXXXXXXXXXX.!.X
+D: s XXX.o..X&..w~##..##~~~X~..........~.~~~.~~ w ~~.~~~~..~~.....~~~....~~~**....~~~.....~~~*..~~XXXW ...M*.~.oo......X s
+D: ~~~ XXX>XXH~G..#####~G~~G~..,.,..,.,xx..x ~~~ i~~xx.~...x....~.~..~..,~..***..~..~...,~.~*.~.XXXE...H..SM.~..oo....JX
+D: ~~....~~ XXX$8w~..####G~G ~i.XX.,,.,...........G~~~s~~ iiF~...........~.......x.,.**~....,~....~.*XXX.EE.W....M*.~...o.O...X
+D: ~.#..#..~~ XXX8##~..##~#.G.~..XX..,H...,.W...,...,~~...,...*,,.x...,.i.....g.....**.........XXXXXXX...EE...H..SM.~..oo....JX
+D: ~.##.##..~ XXX###GG~~~*h~....XX.....,....,.W...,.G....W.***...,...,...,....,...,**..q....SX3~~~W#...EE.W....M*.~.oo.....XX
+D: ~~.###..~~ X##.##~~G.~~~~i*.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX~~
+D: ~~...###.~ k ~###X.G~~*Gh~x*~....i.zX8~i.~..h....zzzXiX...$.T.~$......F.~..XX...TTT*..M..Y......Y..*....~....X.x..x~.<XX~.
+D: ~.....####.....#####XXXx**~i~.z..z.i~,#**~..h..Gzh.zzX*.*Xd*~.~...*~.~.......X..T..T***TXMM.........***...x*...+..~....XX..~
+D: ~~.#$%#########....XXX~h~i.HH...h,i.X*.H..h..G..WX*.E..X**8..Y.~*8...Y....+XXXXXXXXXXXMF...~......*..x.***..X..x..~XX...~~w
+D: ~~.#$$######.~ ~w XXX$~.x..~G...,i.,.~.h..~~..zzX*.*Xd*......F**..~.....XbM...~ZZZZXMM..*.....~.......*.XXXXXXXIXX.~~#~w
+D: L ~~xx########.~~ XXX$$.G#GX#.i,,.ih..W.zG.zzzXiX.$.~88.~...**F..T...~XX~~...ZZZZM~..***~~.Y~...#...xXI&X8&..XX ~~~## w
D: ~.########..~~ XXXXX~#X~X#XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ~###~w
D: ~~.#########..~ w K w ~##### w ~.M.~ ~..####.~ s~~~~.~~ s K ~##..~
D: ~..#########.~ ~##### ~...~ k ~..###.~ ~~####~~~ w w ~###..~
diff --git a/lib/mods/theme/edit/special.txt b/lib/mods/theme/edit/special.txt
index 8d1c94b9..4ac3f0ac 100644
--- a/lib/mods/theme/edit/special.txt
+++ b/lib/mods/theme/edit/special.txt
@@ -48,20 +48,17 @@ F:I:189:0
# Treasure (random) on normal floor
F:*:1:0:0:*
-# Trap (random) on normal floor
-F:^:1:0:0:0:0:0:*
-
# down staircase
F:>:7:0
# between gates
-F:4:160:0:0:0:0:0:0:-1
-F:5:160:0:0:0:0:0:0:-1
-F:6:160:0:0:0:0:0:0:-1
-F:7:160:0:0:0:0:0:0:-1
-F:A:160:0:0:0:0:0:0:-1
-F:B:160:0:0:0:0:0:0:-1
-F:C:160:0:0:0:0:0:0:-1
-F:E:160:0:0:0:0:0:0:-1
-F:F:160:0:0:0:0:0:0:-1
-F:0:160:0:0:0:0:0:0:-1
+F:4:160:0:0:0:0:0:-1
+F:5:160:0:0:0:0:0:-1
+F:6:160:0:0:0:0:0:-1
+F:7:160:0:0:0:0:0:-1
+F:A:160:0:0:0:0:0:-1
+F:B:160:0:0:0:0:0:-1
+F:C:160:0:0:0:0:0:-1
+F:E:160:0:0:0:0:0:-1
+F:F:160:0:0:0:0:0:-1
+F:0:160:0:0:0:0:0:-1
diff --git a/lib/mods/theme/edit/spiders.map b/lib/mods/theme/edit/spiders.map
index 146c152c..f473cc31 100644
--- a/lib/mods/theme/edit/spiders.map
+++ b/lib/mods/theme/edit/spiders.map
@@ -20,10 +20,10 @@ F:b:89:3:275
F:c:89:3:277
# Grass with Aranea
-F:d:89:3:963:0:0:0:0:0:0:2
+F:d:89:3:963:0:0:0:0:0:2
# Grass with Elder aranea
-F:e:89:3:964:0:0:0:0:0:0:2
+F:e:89:3:964:0:0:0:0:0:2
# Dungeon layout
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
diff --git a/lib/mods/theme/edit/t_beorn.txt b/lib/mods/theme/edit/t_beorn.txt
index e60c5d29..57a15b01 100644
--- a/lib/mods/theme/edit/t_beorn.txt
+++ b/lib/mods/theme/edit/t_beorn.txt
@@ -32,13 +32,13 @@ F:]:236:3
### Buildings ###
#The House of Beorn
-F:a:74:3:0:0:0:0:0:76
+F:a:74:3:0:0:0:0:76
#The Farm
-F:f:74:3:0:0:0:0:0:67
+F:f:74:3:0:0:0:0:67
#The Beastmaster
-F:r:74:3:0:0:0:0:0:16
+F:r:74:3:0:0:0:0:16
D:######################################################################################################################################################################################################
D:# ------TT-TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT--T-TTT------------------ #
diff --git a/lib/mods/theme/edit/t_bree.txt b/lib/mods/theme/edit/t_bree.txt
index e5fe559a..c6b50340 100644
--- a/lib/mods/theme/edit/t_bree.txt
+++ b/lib/mods/theme/edit/t_bree.txt
@@ -5,7 +5,7 @@
############### Additional default terrain settings ###############
# Default for Quest 1 = entrance is quest entrance
-F:z:8:3:0:0:0:0:0:4
+F:z:8:3:0:0:0:0:4
# Default for Quest 18 = entrance is tree
F:y:96:3
@@ -15,46 +15,46 @@ F:x:96:3
############### Quest 4 - Thieves Hideout finished = house ###############
?:[EQU $QUEST4 2]
-F:z:74:3:0:0:0:0:0:7
+F:z:74:3:0:0:0:0:7
?:[EQU $QUEST4 5]
-F:z:74:3:0:0:0:0:0:7
+F:z:74:3:0:0:0:0:7
?:1
############### Quest 8 - Troll Glade ###############
?:[AND [EQU $QUEST8 1] [EQU $DAYTIME 0] ]
-F:y:8:3:0:0:0:0:0:8
+F:y:8:3:0:0:0:0:8
?:1
############### Quest 9 - Wights Grave ###############
?:[EQU $QUEST9 1]
-F:x:8:3:0:0:0:0:0:9
+F:x:8:3:0:0:0:0:9
?:1
###### Additionnal buildings #######
# Castle: Plot Bree
-F:B:75:3:0:0:0:0:0:1
+F:B:75:3:0:0:0:0:1
# Mayor's house
-F:b:74:3:0:0:0:0:0:10
+F:b:74:3:0:0:0:0:10
# The Prancing Pony
-F:a:74:3:0:0:0:0:0:58
+F:a:74:3:0:0:0:0:58
# Soothsayer
-F:c:74:3:0:0:0:0:0:12
+F:c:74:3:0:0:0:0:12
# Music Store
-F:d:74:3:0:0:0:0:0:64
+F:d:74:3:0:0:0:0:64
# The Museum
-F:e:74:3:0:0:0:0:0:57
+F:e:74:3:0:0:0:0:57
# Map store
-F:f:74:3:0:0:0:0:0:66
+F:f:74:3:0:0:0:0:66
# The Library
-F:g:74:3:0:0:0:0:0:13
+F:g:74:3:0:0:0:0:13
############### Town Layout ###############
diff --git a/lib/mods/theme/edit/t_dale.txt b/lib/mods/theme/edit/t_dale.txt
index 5c2dcf6c..23d483cf 100644
--- a/lib/mods/theme/edit/t_dale.txt
+++ b/lib/mods/theme/edit/t_dale.txt
@@ -20,13 +20,13 @@ F:]:236:3
### Buildings ###
# Bard's Hut
-F:b:74:3:0:0:0:0:0:77
+F:b:74:3:0:0:0:0:77
# Construction Supply Store
-F:c:74:3:0:0:0:0:0:63
+F:c:74:3:0:0:0:0:63
# Builder Barracks
-F:i:74:3:0:0:0:0:0:71
+F:i:74:3:0:0:0:0:71
D:######################################################################################################################################################################################################
D:# #
diff --git a/lib/mods/theme/edit/t_edoras.txt b/lib/mods/theme/edit/t_edoras.txt
index a4257661..9ab17db6 100644
--- a/lib/mods/theme/edit/t_edoras.txt
+++ b/lib/mods/theme/edit/t_edoras.txt
@@ -14,40 +14,40 @@ F:m:240:3
### Buildings ###
#Meduseld
-F:k:74:3:0:0:0:0:0:82
+F:k:74:3:0:0:0:0:82
#Inn
-F:i:74:3:0:0:0:0:0:72
+F:i:74:3:0:0:0:0:72
#Map store
-F:a:74:3:0:0:0:0:0:66
+F:a:74:3:0:0:0:0:66
#Music store
-F:c:74:3:0:0:0:0:0:64
+F:c:74:3:0:0:0:0:64
#The Library
-F:g:74:3:0:0:0:0:0:13
+F:g:74:3:0:0:0:0:13
#Rune shop
-F:r:74:3:0:0:0:0:0:62
+F:r:74:3:0:0:0:0:62
#The Beastmaster
-F:b:74:3:0:0:0:0:0:16
+F:b:74:3:0:0:0:0:16
#Fighters Hall
-F:d:74:3:0:0:0:0:0:17
+F:d:74:3:0:0:0:0:17
#Tower of Magery
-F:h:74:3:0:0:0:0:0:18
+F:h:74:3:0:0:0:0:18
#Inner Temple
-F:j:74:3:0:0:0:0:0:19
+F:j:74:3:0:0:0:0:19
#Paladins Guild
-F:l:74:3:0:0:0:0:0:20
+F:l:74:3:0:0:0:0:20
#Rangers Guild
-F:n:74:3:0:0:0:0:0:21
+F:n:74:3:0:0:0:0:21
D:######################################################################################################################################################################################################
D:#-----------------------------------------------------------------------------------------#####OOOOOOO#####,,,,,,,,----------------------------------------------------------------------------------#
diff --git a/lib/mods/theme/edit/t_esga.txt b/lib/mods/theme/edit/t_esga.txt
index 6665e914..36b97429 100644
--- a/lib/mods/theme/edit/t_esga.txt
+++ b/lib/mods/theme/edit/t_esga.txt
@@ -23,19 +23,19 @@ F:e:241
### Buildings ###
#The Dancing Dragon
-F:i:74:3:0:0:0:0:0:73
+F:i:74:3:0:0:0:0:73
#The Master's House
-F:k:74:3:0:0:0:0:0:83
+F:k:74:3:0:0:0:0:83
#The Library
-F:l:74:3:0:0:0:0:0:13
+F:l:74:3:0:0:0:0:13
#The Music Store
-F:m:74:3:0:0:0:0:0:64
+F:m:74:3:0:0:0:0:64
#The Hunter store
-F:n:74:3:0:0:0:0:0:61
+F:n:74:3:0:0:0:0:61
D:######################################################################################################################################################################################################
D:#WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW#
diff --git a/lib/mods/theme/edit/t_gondol.txt b/lib/mods/theme/edit/t_gondol.txt
index 66807868..50f0d271 100644
--- a/lib/mods/theme/edit/t_gondol.txt
+++ b/lib/mods/theme/edit/t_gondol.txt
@@ -15,7 +15,7 @@ F:y:1:3
F:x:1:3
# Default for Quest 23 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:23
+F:w:8:3:0:0:0:0:23
# Decoration = Straight Road (B)
F:":66:3
@@ -33,7 +33,7 @@ F:Z:63:3
# Quest 13 assigned, entrance is quest entrance
?:[EQU $QUEST13 1]
-F:z:8:3:0:0:0:0:0:13
+F:z:8:3:0:0:0:0:13
?:1
@@ -41,11 +41,11 @@ F:z:8:3:0:0:0:0:0:13
# Quest 14 assigned, entrance is quest entrance
?:[EQU $QUEST14 1]
-F:y:8:3:0:0:0:0:0:14
+F:y:8:3:0:0:0:0:14
# Quest 14 finished, reward is a rare jewelry shop
?:[EQU $QUEST14 5]
-F:!:74:3:0:0:0:0:0:42
+F:!:74:3:0:0:0:0:42
?:1
@@ -53,7 +53,7 @@ F:!:74:3:0:0:0:0:0:42
# Quest 15 assigned, entrance is quest entrance
?:[EQU $QUEST15 1]
-F:x:8:3:0:0:0:0:0:15
+F:x:8:3:0:0:0:0:15
?:1
@@ -61,15 +61,15 @@ F:x:8:3:0:0:0:0:0:15
# Quest 16 finished, reward is a between gate
?:[EQU $QUEST16 5]
-F:Z:176:3:0:0:0:0:0:1
+F:Z:176:3:0:0:0:0:1
?:1
############### Quest 23 - Wolves hut finished = house ###############
?:[EQU $QUEST23 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
?:[EQU $QUEST23 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
?:1
#################### Buildings ####################
@@ -82,46 +82,46 @@ F:w:74:3:0:0:0:0:0:7
# m: White (Paladin)
# Tower of the King
-F:a:74:3:0:0:0:0:0:27
+F:a:74:3:0:0:0:0:27
# Library
-F:b:74:3:0:0:0:0:0:28
+F:b:74:3:0:0:0:0:28
# Castle: Gondolin Plot
-F:B:75:3:0:0:0:0:0:4
+F:B:75:3:0:0:0:0:4
# The White Tree:Aerandir:High-Elf
-F:c:74:3:0:0:0:0:0:29
+F:c:74:3:0:0:0:0:29
# Craftsmaster
-F:d:74:3:0:0:0:0:0:30
+F:d:74:3:0:0:0:0:30
# Earth-Dome
-F:e:74:3:0:0:0:0:0:31
+F:e:74:3:0:0:0:0:31
# Prophet
-F:f:74:3:0:0:0:0:0:12
+F:f:74:3:0:0:0:0:12
# Minstrels Haven
-F:h:74:3:0:0:0:0:0:32
+F:h:74:3:0:0:0:0:32
# Star-Dome:Sulraen:High-Elf
-F:i:74:3:0:0:0:0:0:33
+F:i:74:3:0:0:0:0:33
# Valarin Temple
-F:j:74:3:0:0:0:0:0:34
+F:j:74:3:0:0:0:0:34
# Sea-Dome
-F:k:74:3:0:0:0:0:0:35
+F:k:74:3:0:0:0:0:35
# The Golden Flower
-F:l:74:3:0:0:0:0:0:36
+F:l:74:3:0:0:0:0:36
# The Fountain
-F:m:74:3:0:0:0:0:0:37
+F:m:74:3:0:0:0:0:37
# Thunderlord's Hide
-F:n:74:3:0:0:0:0:0:22
+F:n:74:3:0:0:0:0:22
# Force elven monsters
f:ELVEN
diff --git a/lib/mods/theme/edit/t_helm.txt b/lib/mods/theme/edit/t_helm.txt
index 0ecaf913..d2ff3536 100644
--- a/lib/mods/theme/edit/t_helm.txt
+++ b/lib/mods/theme/edit/t_helm.txt
@@ -3,7 +3,7 @@
# Helm's Deep map by furiosity <furiosity@zionmainframe.net>
#The Hornburg
-F:k:74:3:0:0:0:0:0:80
+F:k:74:3:0:0:0:0:80
D:######################################################################################################################################################################################################
D:#TT,,,,TTTTTTTTTTTTTTTTTTTTTTTT^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^#
diff --git a/lib/mods/theme/edit/t_henn.txt b/lib/mods/theme/edit/t_henn.txt
index 49e91867..a98de034 100644
--- a/lib/mods/theme/edit/t_henn.txt
+++ b/lib/mods/theme/edit/t_henn.txt
@@ -20,13 +20,13 @@ F:l:239:3
### Buildings ###
# Ranger Conclave
-F:k:74:3:0:0:0:0:0:78
+F:k:74:3:0:0:0:0:78
# Fighters Hall
-F:a:74:3:0:0:0:0:0:17
+F:a:74:3:0:0:0:0:17
# Rangers Guild
-F:b:74:3:0:0:0:0:0:21
+F:b:74:3:0:0:0:0:21
D:######################################################################################################################################################################################################
D:#hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhWWWWWWWWWWhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh#
diff --git a/lib/mods/theme/edit/t_hobb.txt b/lib/mods/theme/edit/t_hobb.txt
index 6043f188..6de1143e 100644
--- a/lib/mods/theme/edit/t_hobb.txt
+++ b/lib/mods/theme/edit/t_hobb.txt
@@ -29,16 +29,16 @@ F:m:243:3
### Buildings ###
# Farm
-F:f:74:3:0:0:0:0:0:67
+F:f:74:3:0:0:0:0:67
# Green Dragon
-F:g:74:3:0:0:0:0:0:74
+F:g:74:3:0:0:0:0:74
# Bag End
-F:i:74:3:0:0:0:0:0:84
+F:i:74:3:0:0:0:0:84
# Beastmaster
-F:j:74:3:0:0:0:0:0:16
+F:j:74:3:0:0:0:0:16
D:######################################################################################################################################################################################################
D:#bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbhhhhhhhhhhhhhhhhhhhhhhhhhhihhhhhhhccccchhOOhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh#
diff --git a/lib/mods/theme/edit/t_imlad.txt b/lib/mods/theme/edit/t_imlad.txt
index af06a709..35270534 100644
--- a/lib/mods/theme/edit/t_imlad.txt
+++ b/lib/mods/theme/edit/t_imlad.txt
@@ -14,13 +14,13 @@ F:f:238:3
### Buildings ###
# Imladris
-F:a:74:3:0:0:0:0:0:79
+F:a:74:3:0:0:0:0:79
# Forge
-F:b:74:3:0:0:0:0:0:88
+F:b:74:3:0:0:0:0:88
# Stable (Beastmaster)
-F:c:74:3:0:0:0:0:0:16
+F:c:74:3:0:0:0:0:16
D:######################################################################################################################################################################################################
D:# @^^^@ @@WWWWWWWWWW^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^WWW^#
diff --git a/lib/mods/theme/edit/t_khazad.txt b/lib/mods/theme/edit/t_khazad.txt
index 73e93956..a707afbd 100644
--- a/lib/mods/theme/edit/t_khazad.txt
+++ b/lib/mods/theme/edit/t_khazad.txt
@@ -8,37 +8,37 @@ F:o:207:3
###################### Buildings ########################
# Fighters Hall
-F:f:74:3:0:0:0:0:0:17
+F:f:74:3:0:0:0:0:17
# Paladins Guild
-F:g:74:3:0:0:0:0:0:20
+F:g:74:3:0:0:0:0:20
# Inner Temple
-F:h:74:3:0:0:0:0:0:19
+F:h:74:3:0:0:0:0:19
# Mining Supplies
-F:i:74:3:0:0:0:0:0:59
+F:i:74:3:0:0:0:0:59
# Default for Quest 25 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:25
+F:w:8:3:0:0:0:0:25
# Seat of Durin
-F:k:74:3:0:0:0:0:0:87
+F:k:74:3:0:0:0:0:87
# Inn
-F:n:74:3:0:0:0:0:0:70
+F:n:74:3:0:0:0:0:70
# Eagles
-F:p:74:3:0:0:0:0:0:22
+F:p:74:3:0:0:0:0:22
# Force dwarven monsters
f:DWARVEN
############### Quest 25 - Evil cave finished = house ###############
?:[EQU $QUEST25 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
?:[EQU $QUEST25 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
?:1
# Town Layout
diff --git a/lib/mods/theme/edit/t_lorien.txt b/lib/mods/theme/edit/t_lorien.txt
index a4a63172..efe4a4af 100644
--- a/lib/mods/theme/edit/t_lorien.txt
+++ b/lib/mods/theme/edit/t_lorien.txt
@@ -21,30 +21,30 @@ F:x:96:3
F:v:88:3
# Default for Quest 22 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:22
+F:w:8:3:0:0:0:0:22
############### Quest 22 - Wolves hut finished = house ###############
?:[EQU $QUEST22 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
?:[EQU $QUEST22 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
?:1
############### Entrance to the Void ###############
?:[EQU $QUEST20 1]
-F:v:7:3:0:0:0:0:0:11
+F:v:7:3:0:0:0:0:11
?:1
############### Quest 10 - Spiders of Mirkwood ###############
# Quest 10 taken, entrance is quest entrance
?:[EQU $QUEST10 1]
-F:y:8:3:0:0:0:0:0:10
+F:y:8:3:0:0:0:0:10
?:1
############### Quest - Mage/Fireroof quest ###############
# Mage/Fireproof Quest taken, entrance is quest entrance
?:[EQU $QUEST"Old Mages quest" 1]
-F:z:8:3:0:0:0:0:0:"Old Mages quest"
+F:z:8:3:0:0:0:0:"Old Mages quest"
?:1
### Additional terrain features ###
@@ -64,43 +64,43 @@ F:l:202:3
###################### Buildings ########################
# The Mirror
-F:a:74:3:0:0:0:0:0:23
+F:a:74:3:0:0:0:0:23
# Castle: Plot Lorien
-F:B:75:3:0:0:0:0:0:2
+F:B:75:3:0:0:0:0:2
# Seat of Ruling
-F:b:74:3:0:0:0:0:0:24
+F:b:74:3:0:0:0:0:24
# Inn
-F:c:74:3:0:0:0:0:0:69
+F:c:74:3:0:0:0:0:69
# Beastmaster Shanty
-F:d:74:3:0:0:0:0:0:16
+F:d:74:3:0:0:0:0:16
# Fighters Hall
-F:f:74:3:0:0:0:0:0:17
+F:f:74:3:0:0:0:0:17
# Wizards Spire
-F:g:74:3:0:0:0:0:0:25
+F:g:74:3:0:0:0:0:25
# Priests Circle
-F:h:74:3:0:0:0:0:0:26
+F:h:74:3:0:0:0:0:26
# Rangers Guild
-F:i:74:3:0:0:0:0:0:21
+F:i:74:3:0:0:0:0:21
# Nest
-F:j:74:3:0:0:0:0:0:22
+F:j:74:3:0:0:0:0:22
# Hunter store
-F:k:74:3:0:0:0:0:0:61
+F:k:74:3:0:0:0:0:61
# Museum
-F:q:74:3:0:0:0:0:0:57
+F:q:74:3:0:0:0:0:57
# Music shop
-F:r:74:3:0:0:0:0:0:64
+F:r:74:3:0:0:0:0:64
# Force elven monsters
f:ELVEN
diff --git a/lib/mods/theme/edit/t_minas.txt b/lib/mods/theme/edit/t_minas.txt
index cea53634..ea5c0fe5 100644
--- a/lib/mods/theme/edit/t_minas.txt
+++ b/lib/mods/theme/edit/t_minas.txt
@@ -9,66 +9,66 @@
F:Z:63:3
# Default for Quest 24 = entrance is quest entrance
-F:w:8:3:0:0:0:0:0:24
+F:w:8:3:0:0:0:0:24
#################### Quest 16 - The last Alliance ####################
# Quest 16 finished, reward is a between gate
?:[EQU $QUEST16 5]
-F:Z:176:3:0:0:0:0:0:2
+F:Z:176:3:0:0:0:0:2
?:1
############### Quest 24 - Haunted House finished = house ###############
?:[EQU $QUEST24 2]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
?:[EQU $QUEST24 5]
-F:w:74:3:0:0:0:0:0:7
+F:w:74:3:0:0:0:0:7
?:1
#################### Buildings ####################
# Library
-F:a:74:3:0:0:0:0:0:60
+F:a:74:3:0:0:0:0:60
# Castle
-F:b:74:3:0:0:0:0:0:14
+F:b:74:3:0:0:0:0:14
# Casino
-F:d:74:3:0:0:0:0:0:15
+F:d:74:3:0:0:0:0:15
# Inn
-F:e:74:3:0:0:0:0:0:11
+F:e:74:3:0:0:0:0:11
# Beastmaster Shanty
-F:f:74:3:0:0:0:0:0:16
+F:f:74:3:0:0:0:0:16
# Fighters hall
-F:g:74:3:0:0:0:0:0:17
+F:g:74:3:0:0:0:0:17
# Tower of Magery
-F:h:74:3:0:0:0:0:0:18
+F:h:74:3:0:0:0:0:18
# Inner temple
-F:i:74:3:0:0:0:0:0:19
+F:i:74:3:0:0:0:0:19
# Paladin guild
-F:j:74:3:0:0:0:0:0:20
+F:j:74:3:0:0:0:0:20
# Ranger guild
-F:k:74:3:0:0:0:0:0:21
+F:k:74:3:0:0:0:0:21
# Thunderlord's Hide
-F:l:74:3:0:0:0:0:0:22
+F:l:74:3:0:0:0:0:22
# Castle: Plot Minas Anor
-F:B:75:3:0:0:0:0:0:5
+F:B:75:3:0:0:0:0:5
# Library Quest
F:x:63:3
?:[EQU $QUEST"Library quest" 1]
-F:x:8:3:0:0:0:0:0:"Library quest"
+F:x:8:3:0:0:0:0:"Library quest"
?:1
############### Town Layout ###############
diff --git a/lib/mods/theme/edit/t_osgili.txt b/lib/mods/theme/edit/t_osgili.txt
index ea74d660..7011cd16 100644
--- a/lib/mods/theme/edit/t_osgili.txt
+++ b/lib/mods/theme/edit/t_osgili.txt
@@ -33,40 +33,40 @@ F:z:169:3
### Buildings ###
# The Twinkling Star inn
-F:e:74:3:0:0:0:0:0:68
+F:e:74:3:0:0:0:0:68
# The Castle of Stars
-F:f:74:3:0:0:0:0:0:85
+F:f:74:3:0:0:0:0:85
# Map store
-F:g:74:3:0:0:0:0:0:66
+F:g:74:3:0:0:0:0:66
# Museum
-F:h:74:3:0:0:0:0:0:57
+F:h:74:3:0:0:0:0:57
# Soothsayer
-F:i:74:3:0:0:0:0:0:12
+F:i:74:3:0:0:0:0:12
# Library
-F:j:74:3:0:0:0:0:0:13
+F:j:74:3:0:0:0:0:13
# Casino
-F:o:74:3:0:0:0:0:0:15
+F:o:74:3:0:0:0:0:15
# Fighters Hall
-F:p:74:3:0:0:0:0:0:17
+F:p:74:3:0:0:0:0:17
# Tower of Magery
-F:q:74:3:0:0:0:0:0:18
+F:q:74:3:0:0:0:0:18
# Inner Temple
-F:r:74:3:0:0:0:0:0:19
+F:r:74:3:0:0:0:0:19
# Paladins Guild
-F:u:74:3:0:0:0:0:0:20
+F:u:74:3:0:0:0:0:20
# Rangers Guild
-F:v:74:3:0:0:0:0:0:21
+F:v:74:3:0:0:0:0:21
D:######################################################################################################################################################################################################
D:#---------------------------------------------------------#################@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@##########################---------------------------------------------------------#
diff --git a/lib/mods/theme/edit/t_pelar.txt b/lib/mods/theme/edit/t_pelar.txt
index 0057518b..fcc31244 100644
--- a/lib/mods/theme/edit/t_pelar.txt
+++ b/lib/mods/theme/edit/t_pelar.txt
@@ -14,28 +14,28 @@ F:a:227:3
### Buildings ###
# The Grey Swan inn
-F:b:74:3:0:0:0:0:0:68
+F:b:74:3:0:0:0:0:68
# The Prince's Tower
-F:c:74:3:0:0:0:0:0:86
+F:c:74:3:0:0:0:0:86
# Music store
-F:d:74:3:0:0:0:0:0:64
+F:d:74:3:0:0:0:0:64
# Rune Shop
-F:e:74:3:0:0:0:0:0:62
+F:e:74:3:0:0:0:0:62
# Hunting Store
-F:f:74:3:0:0:0:0:0:61
+F:f:74:3:0:0:0:0:61
# Library
-F:i:74:3:0:0:0:0:0:13
+F:i:74:3:0:0:0:0:13
# Casino
-F:j:74:3:0:0:0:0:0:15
+F:j:74:3:0:0:0:0:15
# Beastmaster
-F:k:74:3:0:0:0:0:0:16
+F:k:74:3:0:0:0:0:16
D:######################################################################################################################################################################################################
D:#-------------------------------------------------@VVVVV@##VVVVV@@-----------------------------------------------------------------------------------------------------------------------------------# #
diff --git a/lib/mods/theme/edit/t_pref.txt b/lib/mods/theme/edit/t_pref.txt
index 1159e817..e8a601bb 100644
--- a/lib/mods/theme/edit/t_pref.txt
+++ b/lib/mods/theme/edit/t_pref.txt
@@ -1,19 +1,19 @@
# File: t_pref.txt
# Defines the preferences for the town features
-# letter:feature:cave_info:monster:object:ego:artifact:trap:special
+# letter:feature:cave_info:monster:object:ego:artifact:special
# Barrow-Downs entrance
-F:{:7:3:0:0:0:0:0:4
+F:{:7:3:0:0:0:0:4
# Mirkwood Forest entrance
-F:~:7:3:0:0:0:0:0:1
+F:~:7:3:0:0:0:0:1
# Land of Mordor entrance
-F:|:7:3:0:0:0:0:0:2
+F:|:7:3:0:0:0:0:2
# Angband Dungeon entrance
-F:>:7:3:0:0:0:0:0:3
+F:>:7:3:0:0:0:0:3
# Mountain chain
F:^:97:3
@@ -72,34 +72,34 @@ F:Y:192:3
F:O:200:3
# General Store
-F:1:74:3:0:0:0:0:0:0
+F:1:74:3:0:0:0:0:0
# Armoury
-F:2:74:3:0:0:0:0:0:1
+F:2:74:3:0:0:0:0:1
# Weapons Smith
-F:3:74:3:0:0:0:0:0:2
+F:3:74:3:0:0:0:0:2
# Temple
-F:4:74:3:0:0:0:0:0:3
+F:4:74:3:0:0:0:0:3
# Alchemy Shop
-F:5:74:3:0:0:0:0:0:4
+F:5:74:3:0:0:0:0:4
# Magic Shop
-F:6:74:3:0:0:0:0:0:5
+F:6:74:3:0:0:0:0:5
# Black Market
-F:7:74:3:0:0:0:0:0:6
+F:7:74:3:0:0:0:0:6
# Home
-F:8:74:3:0:0:0:0:0:7
+F:8:74:3:0:0:0:0:7
# Bookstore
-F:9:74:3:0:0:0:0:0:8
+F:9:74:3:0:0:0:0:8
# Pet Shop
-F:0:74:3:0:0:0:0:0:9
+F:0:74:3:0:0:0:0:9
# Underground Tunnels -- used for tunnels in towns
F:I:173:3
diff --git a/lib/mods/theme/edit/t_thrand.txt b/lib/mods/theme/edit/t_thrand.txt
index cce9d684..f8c17f9b 100644
--- a/lib/mods/theme/edit/t_thrand.txt
+++ b/lib/mods/theme/edit/t_thrand.txt
@@ -18,22 +18,22 @@ f:ELVEN
### Buildings ###
# Thranduil's Hall
-F:b:74:3:0:0:0:0:0:81
+F:b:74:3:0:0:0:0:81
# Beastmaster
-F:d:74:3:0:0:0:0:0:16
+F:d:74:3:0:0:0:0:16
# Hunter
-F:e:74:3:0:0:0:0:0:61
+F:e:74:3:0:0:0:0:61
# Music Store
-F:f:74:3:0:0:0:0:0:64
+F:f:74:3:0:0:0:0:64
# Map store
-F:g:74:3:0:0:0:0:0:66
+F:g:74:3:0:0:0:0:66
#The Library
-F:h:74:3:0:0:0:0:0:13
+F:h:74:3:0:0:0:0:13
D:######################################################################################################################################################################################################
D:#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^#
diff --git a/lib/mods/theme/edit/thieves.map b/lib/mods/theme/edit/thieves.map
index ba025ff6..43b1a299 100644
--- a/lib/mods/theme/edit/thieves.map
+++ b/lib/mods/theme/edit/thieves.map
@@ -23,13 +23,13 @@ F:d:4:6
F:<:6:8
# Floor with Novice rogue
-F:a:1:6:44:0:0:0:0:0:0:2
+F:a:1:6:44:0:0:0:0:0:2
# Floor with Bandit
-F:b:1:6:150:43:*:0:0:0:0:2
+F:b:1:6:150:43:*:0:0:0:2
# Dark floor with novice rogue
-F:f:1:4:44:0:0:0:0:0:0:2
+F:f:1:4:44:0:0:0:0:0:2
# Floor with human skeleton
F:z:1:6:0:395
diff --git a/lib/mods/theme/edit/thrain.map b/lib/mods/theme/edit/thrain.map
index 8adc41be..7c60a839 100644
--- a/lib/mods/theme/edit/thrain.map
+++ b/lib/mods/theme/edit/thrain.map
@@ -1,25 +1,22 @@
# Floor
-F:.:1:0:0:0:0:0:0:0:61
+F:.:1:0:0:0:0:0:0:61
# Some Nazguls
-F:1:1:0:951:0:0:0:0:0:61:2
-F:2:1:0:952:0:0:0:0:0:61:2
-F:o:1:0:866:0:0:0:0:0:61
+F:1:1:0:951:0:0:0:0:61:2
+F:2:1:0:952:0:0:0:0:61:2
+F:o:1:0:866:0:0:0:0:61
# Marker
-F:,:172:6:0:0:0:0:0:0:61
+F:,:172:6:0:0:0:0:0:61
# Lit permanent wall
F:x:61:6
# Door
-F:D:48:0:0:0:0:0:0:0:61
-
-# Floor with Trap
-F:t:1:8:0:0:0:0:*
+F:D:48:0:0:0:0:0:0:61
# Deep lava
-F:l:85:0:0:0:0:0:0:0:61
+F:l:85:0:0:0:0:0:0:61
# Dungeon layout
D:
diff --git a/lib/mods/theme/edit/trolls.map b/lib/mods/theme/edit/trolls.map
index e5d104fd..c54a5418 100644
--- a/lib/mods/theme/edit/trolls.map
+++ b/lib/mods/theme/edit/trolls.map
@@ -17,19 +17,19 @@ F:.:88:3
F:;:89:3
# Floor with forest troll
-F:f:89:3:297:0:0:0:0:0:0:2
+F:f:89:3:297:0:0:0:0:0:2
# Floor with stone troll
-F:s:89:3:401:0:0:0:0:0:0:2
+F:s:89:3:401:0:0:0:0:0:2
# Floor with algroth
-F:a:89:3:424:0:0:0:0:0:0:2
+F:a:89:3:424:0:0:0:0:0:2
# Floor with Bert
-F:b:89:3:493:0:0:0:0:0:0:2
+F:b:89:3:493:0:0:0:0:0:2
# Floor with Bill
-F:i:89:3:494:0:0:0:0:0:0:2
+F:i:89:3:494:0:0:0:0:0:2
# Floor with a Dwarven skeleton
F:k:89:8:0:396
diff --git a/lib/mods/theme/edit/volcano.txt b/lib/mods/theme/edit/volcano.txt
index 1b89cf3d..c7e64dee 100644
--- a/lib/mods/theme/edit/volcano.txt
+++ b/lib/mods/theme/edit/volcano.txt
@@ -1,10 +1,10 @@
# File: volcano.txt
# Stairway to the Hell
-F:$:7:3:0:0:0:0:0:6
+F:$:7:3:0:0:0:0:6
# Hole to the center of the Volcano
-F:>:7:3:0:0:0:0:0:5
+F:>:7:3:0:0:0:0:5
############### Town Layout ###############
diff --git a/lib/mods/theme/edit/wights.map b/lib/mods/theme/edit/wights.map
index b67963ac..cc4bae88 100644
--- a/lib/mods/theme/edit/wights.map
+++ b/lib/mods/theme/edit/wights.map
@@ -17,13 +17,13 @@ F:;:88:3
F:f:88:3:381
# Floor with grave wight
-F:g:88:3:470:0:0:0:0:0:0:2
+F:g:88:3:470:0:0:0:0:0:2
# Floor with barrow wight
-F:b:88:3:499:0:0:0:0:0:0:2
+F:b:88:3:499:0:0:0:0:0:2
# Floor with Emperor Wight
-F:e:88:3:604:0:0:0:0:0:0:2
+F:e:88:3:604:0:0:0:0:0:2
# Floor with a Human Skeleton
F:k:88:8:0:395
@@ -32,31 +32,31 @@ F:k:88:8:0:395
F:,:172:6
# between gate 1
-F:1:160:6:0:0:0:0:0:2057
+F:1:160:6:0:0:0:0:2057
# between gate 2
-F:2:160:6:0:0:0:0:0:1036
+F:2:160:6:0:0:0:0:1036
# between gate 3
-F:3:160:6:0:0:0:0:0:3847
+F:3:160:6:0:0:0:0:3847
# between gate 4
-F:4:160:6:0:0:0:0:0:2321
+F:4:160:6:0:0:0:0:2321
# between gate 5
-F:5:160:6:0:0:0:0:0:1043
+F:5:160:6:0:0:0:0:1043
# between gate 6
-F:6:160:6:0:0:0:0:0:3599
+F:6:160:6:0:0:0:0:3599
# between gate 7
-F:7:160:6:0:0:0:0:0:2071
+F:7:160:6:0:0:0:0:2071
# between gate 8
-F:8:160:6:0:0:0:0:0:3350
+F:8:160:6:0:0:0:0:3350
# between gate 9
-F:9:160:6:0:0:0:0:0:771
+F:9:160:6:0:0:0:0:771
# Dungeon layout
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXX