3 files changed, 258 insertions, 11 deletions

diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index b015b54d9aad..a2c84d9418e9 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	crossfire
-PORTVERSION=	1.9.1
+PORTVERSION=	1.10.0
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF \
 		ftp://ftp.real-time.com/pub/games/crossfire/
-MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-server
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME}.maps${EXTRACT_SUFX}
@@ -28,7 +27,7 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--without-check
+CONFIGURE_ARGS=	--disable-check
 
 MAN6=		crossedit.6 crossfire.6 crossfire-config.6 crossloop.6 \
 		crossloop.web.6
diff --git a/games/crossfire-server/distinfo b/games/crossfire-server/distinfo
index 91e19f12738b..a9dcb123e8d3 100644
--- a/games/crossfire-server/distinfo
+++ b/games/crossfire-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (crossfire-1.9.1.tar.gz) = 9444daefe1a457b4a18101c255be6cdc
-SHA256 (crossfire-1.9.1.tar.gz) = 95981b7d34798fec21e5d672debfb9a7dd003554a727c73942a6723b0a22f079
-SIZE (crossfire-1.9.1.tar.gz) = 5584686
-MD5 (crossfire-1.9.1.maps.tar.gz) = 9e3b54a64d74c60acd3b7a1c4532ccd1
-SHA256 (crossfire-1.9.1.maps.tar.gz) = e9eca13268b3e651b84f29dfe8aeb98f645e454ec53d726cb3a7428ab782b720
-SIZE (crossfire-1.9.1.maps.tar.gz) = 22073437
+MD5 (crossfire-1.10.0.tar.gz) = d56ad6cac04ea49f8b6b326b441553a3
+SHA256 (crossfire-1.10.0.tar.gz) = feeaadcd016b6c760adf2a91adbb76d4c605bed93af8db05f416afdf53a8ba3e
+SIZE (crossfire-1.10.0.tar.gz) = 6061251
+MD5 (crossfire-1.10.0.maps.tar.gz) = 0c410171602268b0499f3b62091fafa4
+SHA256 (crossfire-1.10.0.maps.tar.gz) = 4c7813e50588e65015dc5a0b6e9f915cfb89f86ad6bbf7c80fcf12831e4e8a23
+SIZE (crossfire-1.10.0.maps.tar.gz) = 24070723
diff --git a/games/crossfire-server/pkg-plist b/games/crossfire-server/pkg-plist
index 2b2f71a24ec9..cdb4b0b6a0e6 100644
--- a/games/crossfire-server/pkg-plist
+++ b/games/crossfire-server/pkg-plist
@@ -1,3 +1,4 @@
+bin/crossedit
 bin/crossfire
 bin/crossfire-config
 bin/crossloop
@@ -246,84 +247,111 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/brest/pshops/README
 %%DATADIR%%/maps/brest/pshops/pshop1/basement
 %%DATADIR%%/maps/brest/pshops/pshop1/floor1
+%%DATADIR%%/maps/brest/pshops/pshop1/floor2
 %%DATADIR%%/maps/brest/pshops/pshop1/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop10/basement
 %%DATADIR%%/maps/brest/pshops/pshop10/floor1
+%%DATADIR%%/maps/brest/pshops/pshop10/floor2
 %%DATADIR%%/maps/brest/pshops/pshop10/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop11/basement
 %%DATADIR%%/maps/brest/pshops/pshop11/floor1
+%%DATADIR%%/maps/brest/pshops/pshop11/floor2
 %%DATADIR%%/maps/brest/pshops/pshop11/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop12/basement
 %%DATADIR%%/maps/brest/pshops/pshop12/floor1
+%%DATADIR%%/maps/brest/pshops/pshop12/floor2
 %%DATADIR%%/maps/brest/pshops/pshop12/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop13/basement
 %%DATADIR%%/maps/brest/pshops/pshop13/floor1
+%%DATADIR%%/maps/brest/pshops/pshop13/floor2
 %%DATADIR%%/maps/brest/pshops/pshop13/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop14/basement
 %%DATADIR%%/maps/brest/pshops/pshop14/floor1
+%%DATADIR%%/maps/brest/pshops/pshop14/floor2
 %%DATADIR%%/maps/brest/pshops/pshop14/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop15/basement
 %%DATADIR%%/maps/brest/pshops/pshop15/floor1
+%%DATADIR%%/maps/brest/pshops/pshop15/floor2
 %%DATADIR%%/maps/brest/pshops/pshop15/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop16/basement
 %%DATADIR%%/maps/brest/pshops/pshop16/floor1
+%%DATADIR%%/maps/brest/pshops/pshop16/floor2
 %%DATADIR%%/maps/brest/pshops/pshop16/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop17/basement
 %%DATADIR%%/maps/brest/pshops/pshop17/floor1
+%%DATADIR%%/maps/brest/pshops/pshop17/floor2
 %%DATADIR%%/maps/brest/pshops/pshop17/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop18/basement
 %%DATADIR%%/maps/brest/pshops/pshop18/floor1
+%%DATADIR%%/maps/brest/pshops/pshop18/floor2
 %%DATADIR%%/maps/brest/pshops/pshop18/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop19/basement
 %%DATADIR%%/maps/brest/pshops/pshop19/floor1
+%%DATADIR%%/maps/brest/pshops/pshop19/floor2
 %%DATADIR%%/maps/brest/pshops/pshop19/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop2/basement
 %%DATADIR%%/maps/brest/pshops/pshop2/floor1
+%%DATADIR%%/maps/brest/pshops/pshop2/floor2
 %%DATADIR%%/maps/brest/pshops/pshop2/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop20/basement
 %%DATADIR%%/maps/brest/pshops/pshop20/floor1
+%%DATADIR%%/maps/brest/pshops/pshop20/floor2
 %%DATADIR%%/maps/brest/pshops/pshop20/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop21/basement
 %%DATADIR%%/maps/brest/pshops/pshop21/floor1
+%%DATADIR%%/maps/brest/pshops/pshop21/floor2
 %%DATADIR%%/maps/brest/pshops/pshop21/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop22/basement
 %%DATADIR%%/maps/brest/pshops/pshop22/floor1
+%%DATADIR%%/maps/brest/pshops/pshop22/floor2
 %%DATADIR%%/maps/brest/pshops/pshop22/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop23/basement
 %%DATADIR%%/maps/brest/pshops/pshop23/floor1
+%%DATADIR%%/maps/brest/pshops/pshop23/floor2
 %%DATADIR%%/maps/brest/pshops/pshop23/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop24/basement
 %%DATADIR%%/maps/brest/pshops/pshop24/floor1
+%%DATADIR%%/maps/brest/pshops/pshop24/floor2
 %%DATADIR%%/maps/brest/pshops/pshop24/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop25/basement
 %%DATADIR%%/maps/brest/pshops/pshop25/floor1
+%%DATADIR%%/maps/brest/pshops/pshop25/floor2
 %%DATADIR%%/maps/brest/pshops/pshop25/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop26/basement
 %%DATADIR%%/maps/brest/pshops/pshop26/floor1
+%%DATADIR%%/maps/brest/pshops/pshop26/floor2
 %%DATADIR%%/maps/brest/pshops/pshop26/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop27/basement
 %%DATADIR%%/maps/brest/pshops/pshop27/floor1
+%%DATADIR%%/maps/brest/pshops/pshop27/floor2
 %%DATADIR%%/maps/brest/pshops/pshop27/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop3/basement
 %%DATADIR%%/maps/brest/pshops/pshop3/floor1
+%%DATADIR%%/maps/brest/pshops/pshop3/floor2
 %%DATADIR%%/maps/brest/pshops/pshop3/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop4/basement
 %%DATADIR%%/maps/brest/pshops/pshop4/floor1
+%%DATADIR%%/maps/brest/pshops/pshop4/floor2
 %%DATADIR%%/maps/brest/pshops/pshop4/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop5/basement
 %%DATADIR%%/maps/brest/pshops/pshop5/floor1
+%%DATADIR%%/maps/brest/pshops/pshop5/floor2
 %%DATADIR%%/maps/brest/pshops/pshop5/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop6/basement
 %%DATADIR%%/maps/brest/pshops/pshop6/floor1
+%%DATADIR%%/maps/brest/pshops/pshop6/floor2
 %%DATADIR%%/maps/brest/pshops/pshop6/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop7/basement
 %%DATADIR%%/maps/brest/pshops/pshop7/floor1
+%%DATADIR%%/maps/brest/pshops/pshop7/floor2
 %%DATADIR%%/maps/brest/pshops/pshop7/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop8/basement
 %%DATADIR%%/maps/brest/pshops/pshop8/floor1
+%%DATADIR%%/maps/brest/pshops/pshop8/floor2
 %%DATADIR%%/maps/brest/pshops/pshop8/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop9/basement
 %%DATADIR%%/maps/brest/pshops/pshop9/floor1
+%%DATADIR%%/maps/brest/pshops/pshop9/floor2
 %%DATADIR%%/maps/brest/pshops/pshop9/gfloor
 %%DATADIR%%/maps/brest/pshops/pshop_copier
 %%DATADIR%%/maps/brest/pshops/pshops_changelog
@@ -333,11 +361,16 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/brest/pshops/ugriver1
 %%DATADIR%%/maps/brest/shops/buildshop
 %%DATADIR%%/maps/brest/shops/buildshop2
+%%DATADIR%%/maps/brest/sow/sow
+%%DATADIR%%/maps/brest/sow/sow.1
 %%DATADIR%%/maps/brest/sport.jess
+%%DATADIR%%/maps/brest/taverns/brest.seaside.tavern
 %%DATADIR%%/maps/brest/underground
 %%DATADIR%%/maps/brest/underground2
 %%DATADIR%%/maps/brest/zorn/castle.basement0
 %%DATADIR%%/maps/brest/zorn/castle.mainfloor
+%%DATADIR%%/maps/brest/zorn/castle.upper.floor.one
+%%DATADIR%%/maps/brest/zorn/castle.upper.floor.two
 %%DATADIR%%/maps/darcap/README
 %%DATADIR%%/maps/darcap/castle/castle2.0
 %%DATADIR%%/maps/darcap/castle/castle2.1
@@ -376,6 +409,7 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/darcap/darcap/houses
 %%DATADIR%%/maps/darcap/darcap/inn
 %%DATADIR%%/maps/darcap/darcap/maze
+%%DATADIR%%/maps/darcap/darcap/pirates.1
 %%DATADIR%%/maps/darcap/darcap/potionshop
 %%DATADIR%%/maps/darcap/darcap/quest
 %%DATADIR%%/maps/darcap/darcap/shop_a
@@ -391,6 +425,8 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/darcap/forgotten_town/inn
 %%DATADIR%%/maps/darcap/forgotten_town/palace
 %%DATADIR%%/maps/darcap/forgotten_town/quests/ft_quest_1
+%%DATADIR%%/maps/darcap/forgotten_town/quests/ft_quest_2
+%%DATADIR%%/maps/darcap/forgotten_town/quests/ft_quest_40
 %%DATADIR%%/maps/darcap/forgotten_town/shops/armour
 %%DATADIR%%/maps/darcap/forgotten_town/shops/general
 %%DATADIR%%/maps/darcap/forgotten_town/shops/general2
@@ -404,6 +440,20 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/darcap/lynn/castle1.3
 %%DATADIR%%/maps/darcap/quest/fire
 %%DATADIR%%/maps/darcap/quest/water
+%%DATADIR%%/maps/darcap/temple_justice/temple_justice.1
+%%DATADIR%%/maps/darcap/temple_justice/temple_justice.10
+%%DATADIR%%/maps/darcap/temple_justice/temple_justice.11
+%%DATADIR%%/maps/darcap/temple_justice/temple_justice.12
+%%DATADIR%%/maps/darcap/temple_justice/temple_justice.13
+%%DATADIR%%/maps/darcap/temple_justice/temple_justice.14
+%%DATADIR%%/maps/darcap/temple_justice/temple_justice.2
+%%DATADIR%%/maps/darcap/temple_justice/temple_justice.3
+%%DATADIR%%/maps/darcap/temple_justice/temple_justice.4
+%%DATADIR%%/maps/darcap/temple_justice/temple_justice.5
+%%DATADIR%%/maps/darcap/temple_justice/temple_justice.6
+%%DATADIR%%/maps/darcap/temple_justice/temple_justice.7
+%%DATADIR%%/maps/darcap/temple_justice/temple_justice.8
+%%DATADIR%%/maps/darcap/temple_justice/temple_justice.9
 %%DATADIR%%/maps/darcap/town2/shop_b
 %%DATADIR%%/maps/darcap/town2/shop_f
 %%DATADIR%%/maps/darcap/town2/tower1
@@ -452,6 +502,8 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/dragonisland/thievesden
 %%DATADIR%%/maps/dungeons/barad_dur
 %%DATADIR%%/maps/dungeons/castle_aaaarg
+%%DATADIR%%/maps/dungeons/gorokh/gorokh_final
+%%DATADIR%%/maps/dungeons/gorokh/gorokh_treasure
 %%DATADIR%%/maps/dungeons/grukks/grukks.1
 %%DATADIR%%/maps/dungeons/grukks/grukks.2
 %%DATADIR%%/maps/dungeons/grukks/grukks.3
@@ -475,6 +527,8 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/dungeons/train/undead_train
 %%DATADIR%%/maps/dungeons/train/zombie
 %%DATADIR%%/maps/dungeons/trollbridge
+%%DATADIR%%/maps/dungeons/valriel/valriel_final
+%%DATADIR%%/maps/dungeons/valriel/valriel_treasure
 %%DATADIR%%/maps/dungeons/xyzzy-mines
 %%DATADIR%%/maps/editor/picks/TownStaff
 %%DATADIR%%/maps/editor/picks/alchemy
@@ -596,6 +650,15 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/lake_country/ebony/entrance1
 %%DATADIR%%/maps/lake_country/ebony/entrance2
 %%DATADIR%%/maps/lake_country/ebony/masterlev
+%%DATADIR%%/maps/lake_country/elven_moon/elvenmoon.1
+%%DATADIR%%/maps/lake_country/elven_moon/elvenmoon.2
+%%DATADIR%%/maps/lake_country/elven_moon/elvenmoon.3
+%%DATADIR%%/maps/lake_country/elven_moon/elvenmoon.4
+%%DATADIR%%/maps/lake_country/elven_moon/elvenmoon.5
+%%DATADIR%%/maps/lake_country/elven_moon/elvenmoon.6
+%%DATADIR%%/maps/lake_country/elven_moon/elvenmoon.7
+%%DATADIR%%/maps/lake_country/elven_moon/elvenmoon.8
+%%DATADIR%%/maps/lake_country/elven_moon/elvenmoon.9
 %%DATADIR%%/maps/lake_country/marsh/marsh1_1
 %%DATADIR%%/maps/lake_country/marsh/marsh1_2
 %%DATADIR%%/maps/lake_country/marsh/marsh2_1
@@ -726,6 +789,7 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/navar_city/misc/library
 %%DATADIR%%/maps/navar_city/misc/market1
 %%DATADIR%%/maps/navar_city/misc/market2
+%%DATADIR%%/maps/navar_city/misc/navarwiz
 %%DATADIR%%/maps/navar_city/misc/tannery
 %%DATADIR%%/maps/navar_city/misc/thamshop
 %%DATADIR%%/maps/navar_city/misc/theater
@@ -814,6 +878,19 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/navar_city/tower/magetower5
 %%DATADIR%%/maps/navar_city/tower/magetower_low
 %%DATADIR%%/maps/navar_city/tower/magetowfinal
+%%DATADIR%%/maps/navar_city/troll_canyon/troll_canyon.0
+%%DATADIR%%/maps/navar_city/troll_canyon/troll_canyon.1
+%%DATADIR%%/maps/navar_city/troll_canyon/troll_canyon.10
+%%DATADIR%%/maps/navar_city/troll_canyon/troll_canyon.11
+%%DATADIR%%/maps/navar_city/troll_canyon/troll_canyon.12
+%%DATADIR%%/maps/navar_city/troll_canyon/troll_canyon.2
+%%DATADIR%%/maps/navar_city/troll_canyon/troll_canyon.3
+%%DATADIR%%/maps/navar_city/troll_canyon/troll_canyon.4
+%%DATADIR%%/maps/navar_city/troll_canyon/troll_canyon.5
+%%DATADIR%%/maps/navar_city/troll_canyon/troll_canyon.6
+%%DATADIR%%/maps/navar_city/troll_canyon/troll_canyon.7
+%%DATADIR%%/maps/navar_city/troll_canyon/troll_canyon.8
+%%DATADIR%%/maps/navar_city/troll_canyon/troll_canyon.9
 %%DATADIR%%/maps/navar_city/warehouse1
 %%DATADIR%%/maps/navar_city/warehouse2
 %%DATADIR%%/maps/navar_city/warehouse3
@@ -1261,14 +1338,17 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/pup_land/terminal
 %%DATADIR%%/maps/pup_land/terminal_u1
 %%DATADIR%%/maps/pup_land/world
+%%DATADIR%%/maps/python/.cvsignore
 %%DATADIR%%/maps/python/CFBank.py
 %%DATADIR%%/maps/python/CFBoard.py
+%%DATADIR%%/maps/python/CFCampfire.py
 %%DATADIR%%/maps/python/CFDataFile.py
 %%DATADIR%%/maps/python/CFGamble.py
 %%DATADIR%%/maps/python/CFGuilds.py
 %%DATADIR%%/maps/python/CFItemBroker.py
 %%DATADIR%%/maps/python/CFLog.py
 %%DATADIR%%/maps/python/CFMail.py
+%%DATADIR%%/maps/python/CFWorld.py
 %%DATADIR%%/maps/python/IPO/README
 %%DATADIR%%/maps/python/IPO/banksay.py
 %%DATADIR%%/maps/python/IPO/board.py
@@ -1294,6 +1374,7 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/python/events/remove/bank_remove.py
 %%DATADIR%%/maps/python/events/remove/guild_remove.py
 %%DATADIR%%/maps/python/events/remove/log_remove.py
+%%DATADIR%%/maps/python/gods/altar_valkyrie.py
 %%DATADIR%%/maps/python/guilds/README.txt
 %%DATADIR%%/maps/python/guilds/guild_dues.py
 %%DATADIR%%/maps/python/guilds/guild_entry.py
@@ -1302,7 +1383,10 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/python/guilds/guildbuy.py
 %%DATADIR%%/maps/python/guilds/guildjoin.py
 %%DATADIR%%/maps/python/guilds/guildoracle.py
+%%DATADIR%%/maps/python/items/campfire_say.py
+%%DATADIR%%/maps/python/items/campfire_timer.py
 %%DATADIR%%/maps/python/items/positioning_system.py
+%%DATADIR%%/maps/python/items/rhyzian_amulet.py
 %%DATADIR%%/maps/python/items/ring_occidental_mages.py
 %%DATADIR%%/maps/python/items/weapon_occidental_mages.py
 %%DATADIR%%/maps/python/misc/CFInsulter.py
@@ -1452,6 +1536,7 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/quests/todd/aljwaf/tower2
 %%DATADIR%%/maps/quests/todd/aljwaf/tower3
 %%DATADIR%%/maps/quests/todd/aljwaf/tower4
+%%DATADIR%%/maps/regions
 %%DATADIR%%/maps/santo_dominion/basement
 %%DATADIR%%/maps/santo_dominion/city_hall
 %%DATADIR%%/maps/santo_dominion/crossfire
@@ -1498,6 +1583,10 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/santo_dominion/north_farm
 %%DATADIR%%/maps/santo_dominion/peacock
 %%DATADIR%%/maps/santo_dominion/sdomino_appartment
+%%DATADIR%%/maps/santo_dominion/shaft/undeadshaft.1
+%%DATADIR%%/maps/santo_dominion/shaft/undeadshaft.2
+%%DATADIR%%/maps/santo_dominion/shaft/undeadshaft.3
+%%DATADIR%%/maps/santo_dominion/shaft/undeadshaft.4
 %%DATADIR%%/maps/santo_dominion/shops/armour
 %%DATADIR%%/maps/santo_dominion/shops/eliks
 %%DATADIR%%/maps/santo_dominion/shops/erash
@@ -1507,6 +1596,8 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/santo_dominion/tavern
 %%DATADIR%%/maps/santo_dominion/tavern.2ndfloor
 %%DATADIR%%/maps/santo_dominion/tavern.downstairs
+%%DATADIR%%/maps/santo_dominion/temple_naive/templenaive.1
+%%DATADIR%%/maps/santo_dominion/temple_naive/templenaive.2
 %%DATADIR%%/maps/santo_dominion/tobias
 %%DATADIR%%/maps/santo_dominion/tobias.top
 %%DATADIR%%/maps/santo_dominion/tollpost
@@ -1617,6 +1708,7 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/scorn/misc/templedevour
 %%DATADIR%%/maps/scorn/misc/templelyth
 %%DATADIR%%/maps/scorn/misc/testing_area
+%%DATADIR%%/maps/scorn/misc/wizhide
 %%DATADIR%%/maps/scorn/misc/zoo
 %%DATADIR%%/maps/scorn/misc/zoo2
 %%DATADIR%%/maps/scorn/oldcity/end
@@ -1703,6 +1795,9 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/sisters/tower1
 %%DATADIR%%/maps/sisters/tower2
 %%DATADIR%%/maps/sisters/tower3
+%%DATADIR%%/maps/start/HallsOfSelection/fireborn_player
+%%DATADIR%%/maps/start/HallsOfSelection/pl_dragon
+%%DATADIR%%/maps/start/HallsOfSelection/wraith_player
 %%DATADIR%%/maps/start/Nexus
 %%DATADIR%%/maps/start/newbieshouse
 %%DATADIR%%/maps/styles/decorstyles/alchemy
@@ -2080,8 +2175,140 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/templates/keep/keep3.tpl
 %%DATADIR%%/maps/templates/keep/keep_b.tpl
 %%DATADIR%%/maps/templates/keep/keep_roof.tpl
+%%DATADIR%%/maps/test/README
+%%DATADIR%%/maps/test/anthony/README
+%%DATADIR%%/maps/test/anthony/cascades
+%%DATADIR%%/maps/test/anthony/connected_objects
+%%DATADIR%%/maps/test/anthony/conveyor
+%%DATADIR%%/maps/test/anthony/raffles_cascade
+%%DATADIR%%/maps/test/anthony/roller_cades
+%%DATADIR%%/maps/test/anthony/special_objects
+%%DATADIR%%/maps/test/barrel
+%%DATADIR%%/maps/test/bigmonpit
+%%DATADIR%%/maps/test/connected_bug
+%%DATADIR%%/maps/test/cyclops
+%%DATADIR%%/maps/test/diagonal
+%%DATADIR%%/maps/test/faceofdeath
+%%DATADIR%%/maps/test/gen_test
+%%DATADIR%%/maps/test/insert_bug
+%%DATADIR%%/maps/test/lighting
+%%DATADIR%%/maps/test/multisquare
+%%DATADIR%%/maps/test/paralyze
+%%DATADIR%%/maps/test/pit
+%%DATADIR%%/maps/test/playermover
+%%DATADIR%%/maps/test/python
+%%DATADIR%%/maps/test/python.py
+%%DATADIR%%/maps/test/python_timer.py
+%%DATADIR%%/maps/test/quest
+%%DATADIR%%/maps/test/randomtreasure
+%%DATADIR%%/maps/test/reaper
+%%DATADIR%%/maps/test/remote_altar
+%%DATADIR%%/maps/test/templatetest
+%%DATADIR%%/maps/test/throw
+%%DATADIR%%/maps/test/tile1
+%%DATADIR%%/maps/test/tile2
+%%DATADIR%%/maps/test/tile3
+%%DATADIR%%/maps/test/trapdoor
+%%DATADIR%%/maps/test/traps
+%%DATADIR%%/maps/test/treasurelist
+%%DATADIR%%/maps/test/trigger
 %%DATADIR%%/maps/under_world/README
 %%DATADIR%%/maps/under_world/uworld_120_109
+%%DATADIR%%/maps/unlinked/Fogs
+%%DATADIR%%/maps/unlinked/Greyshield/Archery
+%%DATADIR%%/maps/unlinked/Greyshield/Arena
+%%DATADIR%%/maps/unlinked/Greyshield/Castle
+%%DATADIR%%/maps/unlinked/Greyshield/Cave
+%%DATADIR%%/maps/unlinked/Greyshield/Cavern
+%%DATADIR%%/maps/unlinked/Greyshield/Cavern2
+%%DATADIR%%/maps/unlinked/Greyshield/Chamber
+%%DATADIR%%/maps/unlinked/Greyshield/Doors
+%%DATADIR%%/maps/unlinked/Greyshield/Dungeon
+%%DATADIR%%/maps/unlinked/Greyshield/Elements
+%%DATADIR%%/maps/unlinked/Greyshield/Factory
+%%DATADIR%%/maps/unlinked/Greyshield/Finish
+%%DATADIR%%/maps/unlinked/Greyshield/Fortress
+%%DATADIR%%/maps/unlinked/Greyshield/GreyMaster
+%%DATADIR%%/maps/unlinked/Greyshield/Greysword
+%%DATADIR%%/maps/unlinked/Greyshield/Island
+%%DATADIR%%/maps/unlinked/Greyshield/Island1
+%%DATADIR%%/maps/unlinked/Greyshield/Ruins
+%%DATADIR%%/maps/unlinked/Greyshield/Sphinx
+%%DATADIR%%/maps/unlinked/academy.crap/Entrance
+%%DATADIR%%/maps/unlinked/academy.crap/Fighter.2
+%%DATADIR%%/maps/unlinked/academy.crap/Fighter.3
+%%DATADIR%%/maps/unlinked/academy.crap/Fighter.4
+%%DATADIR%%/maps/unlinked/academy.crap/Fighter.5
+%%DATADIR%%/maps/unlinked/academy.crap/Fighter.5_2
+%%DATADIR%%/maps/unlinked/academy.crap/MainFloor
+%%DATADIR%%/maps/unlinked/academy.crap/README
+%%DATADIR%%/maps/unlinked/casino/README
+%%DATADIR%%/maps/unlinked/casino/casino_infernal
+%%DATADIR%%/maps/unlinked/kandora/ambush1
+%%DATADIR%%/maps/unlinked/kandora/cave/a_mine
+%%DATADIR%%/maps/unlinked/kandora/cave/a_mine2
+%%DATADIR%%/maps/unlinked/kandora/cave/cave1
+%%DATADIR%%/maps/unlinked/kandora/cave/cave2
+%%DATADIR%%/maps/unlinked/kandora/cave/cave3
+%%DATADIR%%/maps/unlinked/kandora/cave/entrance
+%%DATADIR%%/maps/unlinked/kandora/cave/m_inn
+%%DATADIR%%/maps/unlinked/kandora/cave/m_inn2
+%%DATADIR%%/maps/unlinked/kandora/cave/m_temple
+%%DATADIR%%/maps/unlinked/kandora/cave/mithril
+%%DATADIR%%/maps/unlinked/kandora/circus/mp_castle
+%%DATADIR%%/maps/unlinked/kandora/circus/mp_cave
+%%DATADIR%%/maps/unlinked/kandora/circus/mp_church
+%%DATADIR%%/maps/unlinked/kandora/circus/mp_s
+%%DATADIR%%/maps/unlinked/kandora/circus/mp_start
+%%DATADIR%%/maps/unlinked/kandora/circus/mp_tavern
+%%DATADIR%%/maps/unlinked/kandora/circus/mp_world
+%%DATADIR%%/maps/unlinked/kandora/circus/petshop
+%%DATADIR%%/maps/unlinked/kandora/dd_alchemy
+%%DATADIR%%/maps/unlinked/kandora/dd_alchemy2
+%%DATADIR%%/maps/unlinked/kandora/dd_alchemy3
+%%DATADIR%%/maps/unlinked/kandora/dd_baron
+%%DATADIR%%/maps/unlinked/kandora/dd_baron2
+%%DATADIR%%/maps/unlinked/kandora/dd_chaos
+%%DATADIR%%/maps/unlinked/kandora/dd_church
+%%DATADIR%%/maps/unlinked/kandora/dd_court
+%%DATADIR%%/maps/unlinked/kandora/dd_inn
+%%DATADIR%%/maps/unlinked/kandora/dd_keep
+%%DATADIR%%/maps/unlinked/kandora/dd_market
+%%DATADIR%%/maps/unlinked/kandora/dd_shop
+%%DATADIR%%/maps/unlinked/kandora/dd_tavern
+%%DATADIR%%/maps/unlinked/kandora/denray
+%%DATADIR%%/maps/unlinked/kandora/dm_cellar
+%%DATADIR%%/maps/unlinked/kandora/dm_church
+%%DATADIR%%/maps/unlinked/kandora/dm_inn
+%%DATADIR%%/maps/unlinked/kandora/dm_keep
+%%DATADIR%%/maps/unlinked/kandora/dm_shop
+%%DATADIR%%/maps/unlinked/kandora/dm_tavern
+%%DATADIR%%/maps/unlinked/kandora/dm_wizard
+%%DATADIR%%/maps/unlinked/kandora/dun_marksel
+%%DATADIR%%/maps/unlinked/kandora/elcyon/elcyon_start
+%%DATADIR%%/maps/unlinked/kandora/elcyon/elf_grove
+%%DATADIR%%/maps/unlinked/kandora/elcyon/fall
+%%DATADIR%%/maps/unlinked/kandora/elcyon/g_store
+%%DATADIR%%/maps/unlinked/kandora/elcyon/gnome_hut
+%%DATADIR%%/maps/unlinked/kandora/elcyon/merchant
+%%DATADIR%%/maps/unlinked/kandora/elcyon/old_temple
+%%DATADIR%%/maps/unlinked/kandora/elcyon/palace
+%%DATADIR%%/maps/unlinked/kandora/elcyon/plaza
+%%DATADIR%%/maps/unlinked/kandora/elcyon/seacity
+%%DATADIR%%/maps/unlinked/kandora/elcyon/seacity_west
+%%DATADIR%%/maps/unlinked/kandora/elcyon/temple
+%%DATADIR%%/maps/unlinked/kandora/elcyon/witch_house
+%%DATADIR%%/maps/unlinked/kandora/kandora
+%%DATADIR%%/maps/unlinked/kandora/ship_city
+%%DATADIR%%/maps/unlinked/kandora/ship_dog
+%%DATADIR%%/maps/unlinked/kandora/ship_home
+%%DATADIR%%/maps/unlinked/kandora/ship_treasure
+%%DATADIR%%/maps/unlinked/kandora/signal
+%%DATADIR%%/maps/unlinked/kandora/signal2
+%%DATADIR%%/maps/unlinked/kandora/signal3
+%%DATADIR%%/maps/unlinked/lefttower2
+%%DATADIR%%/maps/unlinked/vol_vill_shops
+%%DATADIR%%/maps/unlinked/zornstuff/zornstuff.NOT.a.map
 %%DATADIR%%/maps/whalingoutpost/houses/fishershouse1
 %%DATADIR%%/maps/whalingoutpost/houses/infestedhouse1
 %%DATADIR%%/maps/whalingoutpost/lighthouse1
@@ -3080,7 +3307,6 @@ lib/crossfire/random_map
 %%DATADIR%%/materials
 %%DATADIR%%/messages
 %%DATADIR%%/races
-%%DATADIR%%/regions
 %%DATADIR%%/smooth
 %%DATADIR%%/treasures
 %%DATADIR%%/wizhelp/abil
@@ -3155,7 +3381,18 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/whalingoutpost/misc
 @dirrm %%DATADIR%%/maps/whalingoutpost/houses
 @dirrm %%DATADIR%%/maps/whalingoutpost
+@dirrm %%DATADIR%%/maps/unlinked/zornstuff
+@dirrm %%DATADIR%%/maps/unlinked/kandora/elcyon
+@dirrm %%DATADIR%%/maps/unlinked/kandora/circus
+@dirrm %%DATADIR%%/maps/unlinked/kandora/cave
+@dirrm %%DATADIR%%/maps/unlinked/kandora
+@dirrm %%DATADIR%%/maps/unlinked/casino
+@dirrm %%DATADIR%%/maps/unlinked/academy.crap
+@dirrm %%DATADIR%%/maps/unlinked/Greyshield
+@dirrm %%DATADIR%%/maps/unlinked
 @dirrm %%DATADIR%%/maps/under_world
+@dirrm %%DATADIR%%/maps/test/anthony
+@dirrm %%DATADIR%%/maps/test
 @dirrm %%DATADIR%%/maps/templates/keep
 @dirrm %%DATADIR%%/maps/templates/guild
 @dirrm %%DATADIR%%/maps/templates/bungalo
@@ -3197,6 +3434,7 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/styles/doorstyles
 @dirrm %%DATADIR%%/maps/styles/decorstyles
 @dirrm %%DATADIR%%/maps/styles
+@dirrm %%DATADIR%%/maps/start/HallsOfSelection
 @dirrm %%DATADIR%%/maps/start
 @dirrm %%DATADIR%%/maps/sisters
 @dirrm %%DATADIR%%/maps/scorn/towers
@@ -3220,7 +3458,9 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/scorn/apartment
 @dirrm %%DATADIR%%/maps/scorn/anthony
 @dirrm %%DATADIR%%/maps/scorn
+@dirrm %%DATADIR%%/maps/santo_dominion/temple_naive
 @dirrm %%DATADIR%%/maps/santo_dominion/shops
+@dirrm %%DATADIR%%/maps/santo_dominion/shaft
 @dirrm %%DATADIR%%/maps/santo_dominion/mudman
 @dirrm %%DATADIR%%/maps/santo_dominion/magara/well
 @dirrm %%DATADIR%%/maps/santo_dominion/magara/south_lighthouse
@@ -3259,6 +3499,7 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/python/misc
 @dirrm %%DATADIR%%/maps/python/items
 @dirrm %%DATADIR%%/maps/python/guilds
+@dirrm %%DATADIR%%/maps/python/gods
 @dirrm %%DATADIR%%/maps/python/events/remove
 @dirrm %%DATADIR%%/maps/python/events/muzzle
 @dirrm %%DATADIR%%/maps/python/events/login
@@ -3317,6 +3558,7 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/port_joseph/goblin
 @dirrm %%DATADIR%%/maps/port_joseph
 @dirrm %%DATADIR%%/maps/planes
+@dirrm %%DATADIR%%/maps/navar_city/troll_canyon
 @dirrm %%DATADIR%%/maps/navar_city/tower
 @dirrm %%DATADIR%%/maps/navar_city/temples
 @dirrm %%DATADIR%%/maps/navar_city/smugglers_cove
@@ -3344,6 +3586,7 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/lake_country/small_buildings
 @dirrm %%DATADIR%%/maps/lake_country/shops
 @dirrm %%DATADIR%%/maps/lake_country/marsh
+@dirrm %%DATADIR%%/maps/lake_country/elven_moon
 @dirrm %%DATADIR%%/maps/lake_country/ebony
 @dirrm %%DATADIR%%/maps/lake_country/dragon_hangar
 @dirrm %%DATADIR%%/maps/lake_country/Sunset_Lake
@@ -3357,14 +3600,17 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/editor/walls
 @dirrm %%DATADIR%%/maps/editor/picks
 @dirrm %%DATADIR%%/maps/editor
+@dirrm %%DATADIR%%/maps/dungeons/valriel
 @dirrm %%DATADIR%%/maps/dungeons/train
 @dirrm %%DATADIR%%/maps/dungeons/monkey_temple
 @dirrm %%DATADIR%%/maps/dungeons/hut
 @dirrm %%DATADIR%%/maps/dungeons/grukks
+@dirrm %%DATADIR%%/maps/dungeons/gorokh
 @dirrm %%DATADIR%%/maps/dungeons
 @dirrm %%DATADIR%%/maps/dragonisland
 @dirrm %%DATADIR%%/maps/darcap/undead
 @dirrm %%DATADIR%%/maps/darcap/town2
+@dirrm %%DATADIR%%/maps/darcap/temple_justice
 @dirrm %%DATADIR%%/maps/darcap/quest
 @dirrm %%DATADIR%%/maps/darcap/lynn
 @dirrm %%DATADIR%%/maps/darcap/forgotten_town/shops
@@ -3379,6 +3625,8 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/darcap/castle
 @dirrm %%DATADIR%%/maps/darcap
 @dirrm %%DATADIR%%/maps/brest/zorn
+@dirrm %%DATADIR%%/maps/brest/taverns
+@dirrm %%DATADIR%%/maps/brest/sow
 @dirrm %%DATADIR%%/maps/brest/shops
 @dirrm %%DATADIR%%/maps/brest/pshops/pshop9
 @dirrm %%DATADIR%%/maps/brest/pshops/pshop8