Merged Darcap Circus into the world map world_116_102.

Updated all exits of the affected maps.


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9694 282e977c-c81d-0410-88c4-b93c2d0d6712

darcap/darcap/circus/bigtop

@@ -8,6 +8,7 @@ enter_x 17
 enter_y 30
 msg
 Created:  1999-01-27 Cater & Wade & Fouras (john_cater@yahoo.com)
+Modified: 2008-07-31 Raphaël Quinet
 endmsg
 end
 arch grassmedium
@@ -3682,9 +3683,9 @@ x 16
 y 31
 end
 arch invis_exit
-slaying circus
-hp 11
-sp 10
+slaying /world/world_116_102
+hp 35
+sp 17
 x 17
 end
 arch pstone_1
@@ -3861,9 +3862,9 @@ x 17
 y 30
 end
 arch invis_exit
-slaying circus
-hp 11
-sp 12
+slaying /world/world_116_102
+hp 35
+sp 19
 x 17
 y 31
 end
@@ -6651,9 +6652,9 @@ x 29
 y 31
 end
 arch invis_exit
-slaying circus
-hp 13
-sp 10
+slaying /world/world_116_102
+hp 37
+sp 17
 x 30
 end
 arch pstone_1
@@ -6812,9 +6813,9 @@ x 30
 y 30
 end
 arch invis_exit
-slaying circus
-hp 13
-sp 12
+slaying /world/world_116_102
+hp 37
+sp 19
 x 30
 y 31
 end

darcap/darcap/circus/chess

@@ -6,6 +6,7 @@ width 20
 height 16
 msg
 Created:  1999-03-10 Cater & Wade (john_cater@yahoo.com)
+Modified: 2008-07-31 Raphaël Quinet
 endmsg
 end
 arch pstone_1
@@ -294,9 +295,9 @@ x 4
 y 4
 end
 arch exit
-slaying circus
-hp 17
-sp 11
+slaying /world/world_116_102
+hp 41
+sp 18
 x 4
 y 4
 end
@@ -309,9 +310,9 @@ x 4
 y 5
 end
 arch exit
-slaying circus
-hp 17
-sp 11
+slaying /world/world_116_102
+hp 41
+sp 18
 x 4
 y 5
 end

darcap/darcap/circus/double

@@ -6,6 +6,7 @@ width 36
 height 32
 msg
 Created:  1999-01-29 Cater&Wade&Fouras (john_cater@yahoo.com)
+Modified: 2008-07-31 Raphaël Quinet
 endmsg
 end
 arch pstone_1
@@ -619,9 +620,9 @@ x 4
 y 15
 end
 arch exit
-slaying circus
-hp 17
-sp 9
+slaying /world/world_116_102
+hp 41
+sp 16
 x 4
 y 15
 end
@@ -642,9 +643,9 @@ x 4
 y 16
 end
 arch exit
-slaying circus
-hp 17
-sp 9
+slaying /world/world_116_102
+hp 41
+sp 16
 x 4
 y 16
 end

darcap/darcap/circus/ghost

@@ -8,6 +8,7 @@ height 16
 msg
 Created:  1999-01-28 Cater & Wade (john_cater@yahoo.com)
 Modified: 2008-05-22 Arvid Norlander
+Modified: 2008-07-31 Raphaël Quinet
 endmsg
 end
 arch dungeon_floor
@@ -377,9 +378,9 @@ x 2
 y 15
 end
 arch exit
-slaying circus
-hp 9
-sp 7
+slaying /world/world_116_102
+hp 33
+sp 14
 x 2
 y 15
 end
@@ -3866,9 +3867,9 @@ x 27
 y 15
 end
 arch exit
-slaying circus
-hp 11
-sp 7
+slaying /world/world_116_102
+hp 35
+sp 14
 x 27
 y 15
 end

darcap/darcap/circus/illusions

@@ -9,6 +9,7 @@ enter_y 11
 msg
 Created:  1999-01-28 Cater & Wade (john_cater@yahoo.com)
 Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-07-31 Raphaël Quinet
 endmsg
 end
 arch small_stones
@@ -1086,9 +1087,9 @@ x 4
 y 11
 end
 arch invis_exit
-slaying circus
-hp 7
-sp 11
+slaying /world/world_116_102
+hp 31
+sp 18
 x 4
 y 11
 end
@@ -1107,9 +1108,9 @@ x 4
 y 12
 end
 arch invis_exit
-slaying circus
-hp 7
-sp 11
+slaying /world/world_116_102
+hp 31
+sp 18
 x 4
 y 12
 end
@@ -6485,9 +6486,9 @@ x 19
 y 11
 end
 arch invis_exit
-slaying circus
-hp 7
-sp 11
+slaying /world/world_116_102
+hp 31
+sp 18
 x 19
 y 11
 end
@@ -6506,9 +6507,9 @@ x 19
 y 12
 end
 arch invis_exit
-slaying circus
-hp 7
-sp 11
+slaying /world/world_116_102
+hp 31
+sp 18
 x 19
 y 12
 end
@@ -6743,9 +6744,9 @@ x 19
 y 36
 end
 arch invis_exit
-slaying circus
-hp 7
-sp 11
+slaying /world/world_116_102
+hp 31
+sp 18
 x 19
 y 36
 end
@@ -6768,9 +6769,9 @@ x 19
 y 37
 end
 arch invis_exit
-slaying circus
-hp 7
-sp 11
+slaying /world/world_116_102
+hp 31
+sp 18
 x 19
 y 37
 end
@@ -14623,9 +14624,9 @@ x 44
 y 11
 end
 arch invis_exit
-slaying circus
-hp 7
-sp 11
+slaying /world/world_116_102
+hp 31
+sp 18
 x 44
 y 11
 end
@@ -14648,9 +14649,9 @@ x 44
 y 12
 end
 arch invis_exit
-slaying circus
-hp 7
-sp 11
+slaying /world/world_116_102
+hp 31
+sp 18
 x 44
 y 12
 end
@@ -14885,9 +14886,9 @@ x 44
 y 36
 end
 arch invis_exit
-slaying circus
-hp 7
-sp 11
+slaying /world/world_116_102
+hp 31
+sp 18
 x 44
 y 36
 end
@@ -14910,9 +14911,9 @@ x 44
 y 37
 end
 arch invis_exit
-slaying circus
-hp 7
-sp 11
+slaying /world/world_116_102
+hp 31
+sp 18
 x 44
 y 37
 end

darcap/darcap/circus/roller1

@@ -6,6 +6,7 @@ width 16
 height 8
 msg
 Created:  1999-01-29 Cater & Wade & Fouras (john_cater@yahoo.com)
+Modified: 2008-07-31 Raphaël Quinet
 endmsg
 end
 arch pstone_1
@@ -19,9 +20,9 @@ arch woodwall_1_2
 y 1
 end
 arch invis_exit
-slaying circus
-hp 14
-sp 7
+slaying /world/world_116_102
+hp 38
+sp 14
 y 2
 end
 arch pstone_1
@@ -36,9 +37,9 @@ y 2
 move_block 0
 end
 arch invis_exit
-slaying circus
-hp 14
-sp 7
+slaying /world/world_116_102
+hp 38
+sp 14
 y 3
 end
 arch pstone_1

darcap/darcap/circus/shooting

@@ -9,6 +9,7 @@ width 20
 height 16
 msg
 Created:  1999-01-28 Cater & Wade (john_cater@yahoo.com)
+Modified: 2008-07-31 Raphaël Quinet
 endmsg
 end
 arch pstone_1
@@ -2472,9 +2473,9 @@ x 15
 y 7
 end
 arch exit
-slaying circus
-hp 7
-sp 9
+slaying /world/world_116_102
+hp 31
+sp 16
 x 15
 y 7
 end
@@ -2491,9 +2492,9 @@ x 15
 y 8
 end
 arch exit
-slaying circus
-hp 7
-sp 9
+slaying /world/world_116_102
+hp 31
+sp 16
 x 15
 y 8
 end

darcap/darcap/circus/strength

@@ -7,6 +7,7 @@ height 16
 msg
 Created:  1999-01-28 Cater & Wade (john_cater@yahoo.com)
 Modified: 2008-05-29 Nicolas Weeger
+Modified: 2008-07-31 Raphaël Quinet
 endmsg
 end
 arch pstone_1
@@ -1691,9 +1692,9 @@ x 15
 y 7
 end
 arch exit
-slaying circus
-hp 7
-sp 13
+slaying /world/world_116_102
+hp 31
+sp 20
 x 15
 y 7
 end
@@ -1702,9 +1703,9 @@ x 15
 y 8
 end
 arch exit
-slaying circus
-hp 7
-sp 13
+slaying /world/world_116_102
+hp 31
+sp 20
 x 15
 y 8
 end

darcap/darcap/circus/wheel

@@ -6,6 +6,7 @@ width 20
 height 16
 msg
 Created:  1999-03-10 Cater & Wade (john_cater@yahoo.com)
+Modified: 2008-07-31 Raphaël Quinet
 endmsg
 end
 arch pstone_1
@@ -354,9 +355,9 @@ x 4
 y 12
 end
 arch exit
-slaying circus
-hp 17
-sp 13
+slaying /world/world_116_102
+hp 41
+sp 20
 x 4
 y 12
 end
@@ -365,9 +366,9 @@ x 4
 y 13
 end
 arch exit
-slaying circus
-hp 17
-sp 13
+slaying /world/world_116_102
+hp 41
+sp 20
 x 4
 y 13
 end

darcap/darcap/circus/wurfbude

@@ -12,6 +12,7 @@ enter_y 24
 msg
 Created:  2002-04-02 Bernd Edler (edler@heydernet.de)
 Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-07-31 Raphaël Quinet
 endmsg
 end
 arch dungeon_magic
@@ -2623,9 +2624,9 @@ x 7
 y 26
 end
 arch invis_exit
-slaying circus
-hp 12
-sp 8
+slaying /world/world_116_102
+hp 36
+sp 15
 x 7
 y 26
 end
@@ -2989,9 +2990,9 @@ x 8
 y 25
 end
 arch oakdoor
-slaying circus
-hp 12
-sp 7
+slaying /world/world_116_102
+hp 36
+sp 15
 x 8
 y 25
 end
@@ -3004,9 +3005,9 @@ x 8
 y 26
 end
 arch invis_exit
-slaying circus
-hp 12
-sp 8
+slaying /world/world_116_102
+hp 36
+sp 15
 x 8
 y 26
 end
@@ -3438,9 +3439,9 @@ x 9
 y 26
 end
 arch invis_exit
-slaying circus
-hp 12
-sp 8
+slaying /world/world_116_102
+hp 36
+sp 15
 x 9
 y 26
 end

darcap/raffle/raffle1

@@ -8,9 +8,9 @@ region darcap
 width 18
 height 30
 msg
-Creator: Gnat the Gnu
-Email: gnu@foo.bar
-Date: Sun Dec 29 03:15:18 1996
+Created:  2007-10-28
+Modified: 2008-02-29
+Modified: 2008-08-01 Raphaël Quinet
 endmsg
 end
 arch blocked
@@ -78,7 +78,7 @@ end
 arch oakdoor
 slaying ../../world/world_116_102
 hp 39
-sp 24
+sp 9
 y 7
 end
 arch dungeon_magic
@@ -548,7 +548,7 @@ end
 arch cobblestones2
 x 2
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 16
@@ -716,8 +716,8 @@ x 2
 y 13
 material 0
 randomitems none
+move_block 0
 alive 0
-no_pass 0
 pass_thru 0
 end
 arch dungeon_magic
@@ -883,7 +883,7 @@ end
 arch cobblestones2
 x 3
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 16
@@ -1220,7 +1220,7 @@ end
 arch cobblestones2
 x 4
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 16
@@ -1563,7 +1563,7 @@ end
 arch cobblestones2
 x 5
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 16
@@ -1892,7 +1892,7 @@ end
 arch cobblestones2
 x 6
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 16
@@ -2248,7 +2248,7 @@ end
 arch cobblestones2
 x 7
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 16
@@ -2590,7 +2590,7 @@ end
 arch cobblestones2
 x 8
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 16
@@ -2943,7 +2943,7 @@ end
 arch cobblestones2
 x 9
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 16
@@ -3303,7 +3303,7 @@ end
 arch cobblestones2
 x 10
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 16
@@ -3649,7 +3649,7 @@ end
 arch cobblestones2
 x 11
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 16
@@ -3987,7 +3987,7 @@ end
 arch cobblestones2
 x 12
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 16
@@ -4338,7 +4338,7 @@ end
 arch cobblestones2
 x 13
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 16
@@ -4688,7 +4688,7 @@ end
 arch cobblestones2
 x 14
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 16
@@ -4983,7 +4983,7 @@ end
 arch cobblestones2
 x 15
 y 1
-no_pass 1
+move_block all
 end
 arch pit_closed
 hp 16