diff --git a/brest/zorn/castle.upper.floor.two b/brest/zorn/castle.upper.floor.two
index 387f70531..a2cbab61d 100644
--- a/brest/zorn/castle.upper.floor.two
+++ b/brest/zorn/castle.upper.floor.two
@@ -743,7 +743,7 @@ name Security light
 x 3
 y 7
 glow_radius 5
-no_pass 1
+move_block all
 end
 arch dungeon_magic
 x 3
@@ -3102,7 +3102,7 @@ x 9
 y 12
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor
@@ -3123,7 +3123,7 @@ x 9
 y 14
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor
@@ -3260,7 +3260,7 @@ x 9
 y 44
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor
@@ -3281,7 +3281,7 @@ x 9
 y 46
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor
@@ -4366,7 +4366,7 @@ x 12
 y 9
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor2
@@ -4427,7 +4427,7 @@ x 12
 y 19
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor2
@@ -4524,7 +4524,7 @@ x 12
 y 39
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor2
@@ -4585,7 +4585,7 @@ x 12
 y 49
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch cobblestones2
@@ -5313,7 +5313,7 @@ x 14
 y 9
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor2
@@ -5558,7 +5558,7 @@ x 14
 y 49
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch cobblestones2
@@ -6457,7 +6457,7 @@ x 17
 y 22
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch cobblestones2
@@ -6530,7 +6530,7 @@ x 17
 y 36
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor
@@ -7366,7 +7366,7 @@ x 19
 y 12
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor
@@ -7434,7 +7434,7 @@ x 19
 y 22
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch cobblestones2
@@ -7507,7 +7507,7 @@ x 19
 y 36
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor
@@ -7575,7 +7575,7 @@ x 19
 y 46
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor
@@ -8912,7 +8912,7 @@ x 22
 y 17
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor2
@@ -8933,7 +8933,7 @@ x 22
 y 19
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor2
@@ -9052,7 +9052,7 @@ x 22
 y 39
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor2
@@ -9073,7 +9073,7 @@ x 22
 y 41
 material 0
 glow_radius 4
-no_pass 0
+move_block 0
 identified 1
 end
 arch woodfloor2
@@ -11355,7 +11355,7 @@ arch bench_1_1
 name railing
 x 27
 y 51
-no_pass 1
+move_block all
 end
 arch sea
 name moat
@@ -11370,7 +11370,7 @@ arch bench_2_1_1
 name railing
 x 27
 y 52
-no_pass 1
+move_block all
 end
 arch sea
 name moat
@@ -11385,7 +11385,7 @@ arch bench_2_1_1
 name railing
 x 27
 y 53
-no_pass 1
+move_block all
 end
 arch sea
 name moat
@@ -11400,7 +11400,7 @@ arch bench_2_1_1
 name railing
 x 27
 y 54
-no_pass 1
+move_block all
 end
 arch dungeon_magic
 x 27
@@ -11418,7 +11418,7 @@ arch bench_1_2
 name railing
 x 27
 y 55
-no_pass 1
+move_block all
 end
 arch brush
 x 27
@@ -11863,7 +11863,7 @@ arch sea
 name moat
 x 28
 y 52
-no_pass 0
+move_block 0
 end
 arch cobblestones2
 x 28
@@ -12033,7 +12033,7 @@ endmsg
 face dwall_AA.111
 x 29
 y 14
-no_pass 0
+move_block 0
 end
 arch stonefloor2
 x 29
@@ -12396,7 +12396,7 @@ arch sea
 name moat
 x 29
 y 52
-no_pass 0
+move_block 0
 end
 arch cobblestones2
 x 29
@@ -12818,7 +12818,7 @@ arch sea
 name moat
 x 30
 y 52
-no_pass 0
+move_block 0
 end
 arch cobblestones2
 x 30
@@ -13248,7 +13248,7 @@ arch bench_1_1
 name railing
 x 31
 y 51
-no_pass 1
+move_allow 1
 end
 arch sea
 name moat
@@ -13263,7 +13263,7 @@ arch bench_2_1_1
 name railing
 x 31
 y 52
-no_pass 1
+move_allow 1
 end
 arch sea
 name moat
@@ -13278,7 +13278,7 @@ arch bench_2_1_1
 name railing
 x 31
 y 53
-no_pass 1
+move_allow 1
 end
 arch sea
 name moat
@@ -13293,7 +13293,7 @@ arch bench_2_1_1
 name railing
 x 31
 y 54
-no_pass 1
+move_allow 1
 end
 arch dungeon_magic
 x 31
@@ -13311,7 +13311,7 @@ arch bench_1_2
 name railing
 x 31
 y 55
-no_pass 1
+move_allow 1
 end
 arch brush
 x 31
@@ -13706,7 +13706,7 @@ speed 0.0
 level 300
 invisible 1
 connected 12000
-no_pass 0
+move_allow 0
 blocksview 0
 arch spell_earth_to_dust
 end
@@ -15201,7 +15201,7 @@ x 36
 y 17
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor2
@@ -15222,7 +15222,7 @@ x 36
 y 19
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor2
@@ -15423,7 +15423,7 @@ x 36
 y 39
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor2
@@ -15444,7 +15444,7 @@ x 36
 y 41
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor2
@@ -16695,7 +16695,7 @@ x 39
 y 12
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor
@@ -16763,7 +16763,7 @@ x 39
 y 22
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch cobblestones2
@@ -16836,7 +16836,7 @@ x 39
 y 36
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor
@@ -16904,7 +16904,7 @@ x 39
 y 46
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor
@@ -17744,7 +17744,7 @@ x 41
 y 22
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch cobblestones2
@@ -17817,7 +17817,7 @@ x 41
 y 36
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor
@@ -18712,7 +18712,7 @@ x 44
 y 9
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor2
@@ -18957,7 +18957,7 @@ x 44
 y 49
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch cobblestones2
@@ -19685,7 +19685,7 @@ x 46
 y 9
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor2
@@ -19746,7 +19746,7 @@ x 46
 y 19
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor2
@@ -19843,7 +19843,7 @@ x 46
 y 39
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor2
@@ -19904,7 +19904,7 @@ x 46
 y 49
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch cobblestones2
@@ -20990,7 +20990,7 @@ x 49
 y 12
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor
@@ -21011,7 +21011,7 @@ x 49
 y 14
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor
@@ -21148,7 +21148,7 @@ x 49
 y 44
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor
@@ -21169,7 +21169,7 @@ x 49
 y 46
 material 0
 glow_radius 4
-no_pass 0
+move_allow 0
 identified 1
 end
 arch woodfloor
@@ -23189,7 +23189,7 @@ name Security light
 x 55
 y 7
 glow_radius 5
-no_pass 1
+move_allow 1
 end
 arch dungeon_magic
 x 55