From 674539a42a65b72cd65d16f98e46136bcc425201 Mon Sep 17 00:00:00 2001
From: silvernexus <silvernexus@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Fri, 11 Aug 2017 17:36:51 +0000
Subject: [PATCH] Fix bug #836 by adding and modifying movers to keep flying
 players behind the game line in Darcap Circus throwing and shooting games.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20481 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 ChangeLog                     |  4 +++
 darcap/darcap/circus/shooting | 20 +++++++----
 darcap/darcap/circus/wurfbude | 63 ++++++++++++++++++++++++++++++++++-
 3 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 02e82c0e6..5357695f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-08-11  Daniel Hawkins
+    * darcap/darcap/circus/wurfbude: Add player movers to prevent players from flying past barrier.
+    * darcap/darcap/circus/shooting: Modify player movers to also move flying players behind the line.
+
 2017-08-06  Daniel Hawkins
     * lake_country/RETower/tower3: Fix teleporter to first floor coordinates.
 
diff --git a/darcap/darcap/circus/shooting b/darcap/darcap/circus/shooting
index b64bcf0f7..b9ba481d8 100644
--- a/darcap/darcap/circus/shooting
+++ b/darcap/darcap/circus/shooting
@@ -9,7 +9,7 @@ width 20
 height 16
 msg
 Created:  1999-01-28 Cater & Wade (john_cater@yahoo.com)
-Modified: 2014-08-27 Rick Tanner
+Modified: 2017-08-11 SilverNexus
 endmsg
 end
 arch pstone_1
@@ -822,9 +822,10 @@ end
 arch mover_3
 x 6
 y 5
-speed -20.000000
+speed -20.0
 level 1
 attacktype 1
+move_type walk fly_low
 end
 arch unholy_ground
 x 6
@@ -845,9 +846,10 @@ end
 arch mover_3
 x 6
 y 6
-speed -20.000000
+speed -20.0
 level 1
 attacktype 1
+move_type walk fly_low
 end
 arch unholy_ground
 x 6
@@ -868,9 +870,10 @@ end
 arch mover_3
 x 6
 y 7
-speed -20.000000
+speed -20.0
 level 1
 attacktype 1
+move_type walk fly_low
 end
 arch unholy_ground
 x 6
@@ -891,9 +894,10 @@ end
 arch mover_3
 x 6
 y 8
-speed -20.000000
+speed -20.0
 level 1
 attacktype 1
+move_type walk fly_low
 end
 arch unholy_ground
 x 6
@@ -914,9 +918,10 @@ end
 arch mover_3
 x 6
 y 9
-speed -20.000000
+speed -20.0
 level 1
 attacktype 1
+move_type walk fly_low
 end
 arch unholy_ground
 x 6
@@ -937,9 +942,10 @@ end
 arch mover_3
 x 6
 y 10
-speed -20.000000
+speed -20.0
 level 1
 attacktype 1
+move_type walk fly_low
 end
 arch unholy_ground
 x 6
diff --git a/darcap/darcap/circus/wurfbude b/darcap/darcap/circus/wurfbude
index 5c5b637d7..faeaf6c3e 100644
--- a/darcap/darcap/circus/wurfbude
+++ b/darcap/darcap/circus/wurfbude
@@ -11,7 +11,7 @@ enter_x 8
 enter_y 24
 msg
 Created:  2002-04-02 Bernd Edler (edler@heydernet.de)
-Modified: 2013-09-28 Rick Tanner
+Modified: 2017-08-11 SilverNexus
 endmsg
 end
 arch dungeon_magic
@@ -131,6 +131,7 @@ Don't step beyond the line!
 endmsg
 y 6
 connected 4
+move_on 0
 end
 arch dungeon_magic
 y 6
@@ -148,6 +149,7 @@ Good. You smashed the vampire.
 endmsg
 y 7
 connected 32
+move_on 0
 end
 arch dungeon_magic
 y 7
@@ -289,6 +291,7 @@ endmsg
 x 1
 y 6
 connected 31
+move_on 0
 end
 arch dungeon_magic
 x 1
@@ -310,6 +313,7 @@ endmsg
 x 1
 y 7
 connected 33
+move_on 0
 end
 arch dungeon_magic
 x 1
@@ -630,6 +634,7 @@ endmsg
 x 2
 y 19
 connected 2
+move_on 0
 end
 arch dungeon_magic
 x 2
@@ -1271,6 +1276,15 @@ arch woodfloor
 x 4
 y 7
 end
+arch mover_5
+x 4
+y 7
+speed -20.0
+level 1
+attacktype 1
+move_type walk fly_low fly_high
+move_on walk fly_low fly_high
+end
 arch dungeon_magic
 x 4
 y 8
@@ -1630,6 +1644,15 @@ arch woodfloor
 x 5
 y 7
 end
+arch mover_5
+x 5
+y 7
+speed -20.0
+level 1
+attacktype 1
+move_type walk fly_low fly_high
+move_on walk fly_low fly_high
+end
 arch dungeon_magic
 x 5
 y 8
@@ -2060,6 +2083,15 @@ arch woodfloor
 x 6
 y 7
 end
+arch mover_5
+x 6
+y 7
+speed -20.0
+level 1
+attacktype 1
+move_type walk fly_low fly_high
+move_on walk fly_low fly_high
+end
 arch dungeon_magic
 x 6
 y 8
@@ -2440,6 +2472,15 @@ arch woodfloor
 x 7
 y 7
 end
+arch mover_5
+x 7
+y 7
+speed -20.0
+level 1
+attacktype 1
+move_type walk fly_low fly_high
+move_on walk fly_low fly_high
+end
 arch dungeon_magic
 x 7
 y 8
@@ -2793,6 +2834,15 @@ arch woodfloor
 x 8
 y 7
 end
+arch mover_5
+x 8
+y 7
+speed -20.0
+level 1
+attacktype 1
+move_type walk fly_low fly_high
+move_on walk fly_low fly_high
+end
 arch dungeon_magic
 x 8
 y 8
@@ -3167,6 +3217,15 @@ arch woodfloor
 x 9
 y 7
 end
+arch mover_5
+x 9
+y 7
+speed -20.0
+level 1
+attacktype 1
+move_type walk fly_low fly_high
+move_on walk fly_low fly_high
+end
 arch dungeon_magic
 x 9
 y 8
@@ -4104,6 +4163,7 @@ food 1
 x 11
 y 20
 connected 3
+move_on 0
 end
 arch dungeon_magic
 x 11
@@ -4137,6 +4197,7 @@ food 1
 x 11
 y 23
 connected 1
+move_on 0
 end
 arch dungeon_magic
 x 11