- Update to version 1.16.0

PR:		155819
Submitted by:	Ports Fury

3 files changed, 440 insertions, 38 deletions

diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 23e7dab955ca..b43c4fa3f393 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	crossfire
-PORTVERSION=	1.50.0
+PORTVERSION=	1.60.0
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-server/${PORTVERSION} \
 		SF/${PORTNAME}/${PORTNAME}-maps/${PORTVERSION}:maps
@@ -21,13 +21,16 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
 		png.6:${PORTSDIR}/graphics/png
 
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
+
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 USE_SQLITE=	3
 USE_PERL5=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-check=no
 
 MAN6=		crossfire-config.6 crossfire-server.6 crossloop.6 \
diff --git a/games/crossfire-server/distinfo b/games/crossfire-server/distinfo
index 2bf2de56c36c..5899723ceb29 100644
--- a/games/crossfire-server/distinfo
+++ b/games/crossfire-server/distinfo
@@ -1,6 +1,4 @@
-MD5 (crossfire-1.50.0.tar.gz) = d52f092031f11bd8cf5c6387057d5f8f
-SHA256 (crossfire-1.50.0.tar.gz) = eef737c4ce98017325dc2864faac9e89eae5507b08d9eb7095ea1f62f2735982
-SIZE (crossfire-1.50.0.tar.gz) = 6215543
-MD5 (crossfire-1.50.0.maps.tar.gz) = aa66671704b6b0163fa234689ecfbd95
-SHA256 (crossfire-1.50.0.maps.tar.gz) = f859ffaffcda1053cc40fc3eda8741ba1fc0f08d0eea303b513354967ab44c3d
-SIZE (crossfire-1.50.0.maps.tar.gz) = 27392351
+SHA256 (crossfire-1.60.0.tar.gz) = db60901128d44715ca354c17ec8ba22756de398156836f02cfc60afa406ec563
+SIZE (crossfire-1.60.0.tar.gz) = 6323410
+SHA256 (crossfire-1.60.0.maps.tar.gz) = f21005c1f6e81ae02012cef047bb63fe08faa14bb54f5e72c512fd81b8a38528
+SIZE (crossfire-1.60.0.maps.tar.gz) = 28826670
diff --git a/games/crossfire-server/pkg-plist b/games/crossfire-server/pkg-plist
index d3b943ba09f2..e08070eced49 100644
--- a/games/crossfire-server/pkg-plist
+++ b/games/crossfire-server/pkg-plist
@@ -16,9 +16,6 @@ etc/crossfire/settings
 lib/crossfire/add_throw.perl
 lib/crossfire/metaserver.pl
 lib/crossfire/mktable.script
-lib/crossfire/plugins/cf_darcap.a
-lib/crossfire/plugins/cf_darcap.la
-lib/crossfire/plugins/cf_darcap.so
 lib/crossfire/plugins/cfanim.a
 lib/crossfire/plugins/cfanim.la
 lib/crossfire/plugins/cfanim.so
@@ -152,8 +149,24 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/azumauindo/minatomachi/buildings/guildkeybuildingB2c
 %%DATADIR%%/maps/azumauindo/minatomachi/gates/gate1
 %%DATADIR%%/maps/azumauindo/minatomachi/gates/gate2
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/basement
 %%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/bigchest
 %%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/ground
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/guild_alchemy
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/guild_bbq
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/guild_hq
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/guild_jeweler
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/guild_tan
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/guild_thaum
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/guild_toolshed
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/guildman_lounge
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/guildmaster_lounge
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/hallofjoining
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/journeyman_lounge
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/mainfloor
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/master_lounge
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/novice_lounge
+%%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/secondfloor
 %%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/storage_room
 %%DATADIR%%/maps/azumauindo/minatomachi/ketsueki_itsuryuu/upper
 %%DATADIR%%/maps/azumauindo/minatomachi/stores/buildshop
@@ -195,8 +208,24 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/azumauindo/suno-yamatoshi/gates/gate1
 %%DATADIR%%/maps/azumauindo/suno-yamatoshi/gates/gate2
 %%DATADIR%%/maps/azumauindo/suno-yamatoshi/gates/gate3
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/basement
 %%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/bigchest
 %%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/ground
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/guild_alchemy
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/guild_bbq
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/guild_hq
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/guild_jeweler
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/guild_tan
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/guild_thaum
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/guild_toolshed
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/guildman_lounge
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/guildmaster_lounge
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/hallofjoining
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/journeyman_lounge
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/mainfloor
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/master_lounge
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/novice_lounge
+%%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/secondfloor
 %%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/storage_room
 %%DATADIR%%/maps/azumauindo/suno-yamatoshi/nenshou_youso/upper
 %%DATADIR%%/maps/azumauindo/suno-yamatoshi/shops/armourshop1
@@ -218,8 +247,24 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/azumauindo/suno-yamatoshi/towers/tou3
 %%DATADIR%%/maps/azumauindo/suno-yamatoshi/towers/tou4
 %%DATADIR%%/maps/azumauindo/suno-yamatoshi/towers/tou5
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/basement
 %%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/bigchest
 %%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/ground
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/guild_alchemy
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/guild_bbq
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/guild_hq
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/guild_jeweler
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/guild_tan
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/guild_thaum
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/guild_toolshed
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/guildman_lounge
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/guildmaster_lounge
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/hallofjoining
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/journeyman_lounge
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/mainfloor
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/master_lounge
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/novice_lounge
+%%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/secondfloor
 %%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/storage_room
 %%DATADIR%%/maps/azumauindo/zaseki_dzuki_ryoku/upper
 %%DATADIR%%/maps/brest/Castle/AcidChamber
@@ -241,8 +286,24 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/brest/asyvan/palace1
 %%DATADIR%%/maps/brest/asyvan/palace2
 %%DATADIR%%/maps/brest/asyvan/palace3
+%%DATADIR%%/maps/brest/black_shield/basement
 %%DATADIR%%/maps/brest/black_shield/bigchest
 %%DATADIR%%/maps/brest/black_shield/ground
+%%DATADIR%%/maps/brest/black_shield/guild_alchemy
+%%DATADIR%%/maps/brest/black_shield/guild_bbq
+%%DATADIR%%/maps/brest/black_shield/guild_hq
+%%DATADIR%%/maps/brest/black_shield/guild_jeweler
+%%DATADIR%%/maps/brest/black_shield/guild_tan
+%%DATADIR%%/maps/brest/black_shield/guild_thaum
+%%DATADIR%%/maps/brest/black_shield/guild_toolshed
+%%DATADIR%%/maps/brest/black_shield/guildman_lounge
+%%DATADIR%%/maps/brest/black_shield/guildmaster_lounge
+%%DATADIR%%/maps/brest/black_shield/hallofjoining
+%%DATADIR%%/maps/brest/black_shield/journeyman_lounge
+%%DATADIR%%/maps/brest/black_shield/mainfloor
+%%DATADIR%%/maps/brest/black_shield/master_lounge
+%%DATADIR%%/maps/brest/black_shield/novice_lounge
+%%DATADIR%%/maps/brest/black_shield/secondfloor
 %%DATADIR%%/maps/brest/black_shield/storage_room
 %%DATADIR%%/maps/brest/black_shield/upper
 %%DATADIR%%/maps/brest/brest.IPO
@@ -283,6 +344,35 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/brest/ludo2
 %%DATADIR%%/maps/brest/nasty_house
 %%DATADIR%%/maps/brest/pantheon
+%%DATADIR%%/maps/brest/privateshops/privateshop_1
+%%DATADIR%%/maps/brest/privateshops/privateshop_10
+%%DATADIR%%/maps/brest/privateshops/privateshop_11
+%%DATADIR%%/maps/brest/privateshops/privateshop_12
+%%DATADIR%%/maps/brest/privateshops/privateshop_13
+%%DATADIR%%/maps/brest/privateshops/privateshop_14
+%%DATADIR%%/maps/brest/privateshops/privateshop_15
+%%DATADIR%%/maps/brest/privateshops/privateshop_16
+%%DATADIR%%/maps/brest/privateshops/privateshop_17
+%%DATADIR%%/maps/brest/privateshops/privateshop_18
+%%DATADIR%%/maps/brest/privateshops/privateshop_19
+%%DATADIR%%/maps/brest/privateshops/privateshop_2
+%%DATADIR%%/maps/brest/privateshops/privateshop_20
+%%DATADIR%%/maps/brest/privateshops/privateshop_21
+%%DATADIR%%/maps/brest/privateshops/privateshop_22
+%%DATADIR%%/maps/brest/privateshops/privateshop_23
+%%DATADIR%%/maps/brest/privateshops/privateshop_24
+%%DATADIR%%/maps/brest/privateshops/privateshop_25
+%%DATADIR%%/maps/brest/privateshops/privateshop_26
+%%DATADIR%%/maps/brest/privateshops/privateshop_27
+%%DATADIR%%/maps/brest/privateshops/privateshop_28
+%%DATADIR%%/maps/brest/privateshops/privateshop_3
+%%DATADIR%%/maps/brest/privateshops/privateshop_4
+%%DATADIR%%/maps/brest/privateshops/privateshop_5
+%%DATADIR%%/maps/brest/privateshops/privateshop_6
+%%DATADIR%%/maps/brest/privateshops/privateshop_7
+%%DATADIR%%/maps/brest/privateshops/privateshop_8
+%%DATADIR%%/maps/brest/privateshops/privateshop_9
+%%DATADIR%%/maps/brest/privateshops/privateshop_main
 %%DATADIR%%/maps/brest/pshops/README
 %%DATADIR%%/maps/brest/pshops/pshop1/basement
 %%DATADIR%%/maps/brest/pshops/pshop1/floor1
@@ -430,6 +520,9 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/darcap/cave/level4
 %%DATADIR%%/maps/darcap/darcap/airhouse
 %%DATADIR%%/maps/darcap/darcap/apartment
+%%DATADIR%%/maps/darcap/darcap/bob.msg
+%%DATADIR%%/maps/darcap/darcap/cameron.msg
+%%DATADIR%%/maps/darcap/darcap/cameron.quests
 %%DATADIR%%/maps/darcap/darcap/church
 %%DATADIR%%/maps/darcap/darcap/circus/bigtop
 %%DATADIR%%/maps/darcap/darcap/circus/chess
@@ -456,36 +549,82 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/darcap/darcap/circus/wheel
 %%DATADIR%%/maps/darcap/darcap/circus/wurfbude
 %%DATADIR%%/maps/darcap/darcap/earthhouse
+%%DATADIR%%/maps/darcap/darcap/elemental.quests
 %%DATADIR%%/maps/darcap/darcap/firehouse
 %%DATADIR%%/maps/darcap/darcap/fishing
+%%DATADIR%%/maps/darcap/darcap/grape_farm
 %%DATADIR%%/maps/darcap/darcap/gshop
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/basement
 %%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/bigchest
 %%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/ground
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/guild_alchemy
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/guild_bbq
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/guild_hq
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/guild_jeweler
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/guild_tan
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/guild_thaum
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/guild_toolshed
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/guildman_lounge
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/guildmaster_lounge
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/hallofjoining
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/journeyman_lounge
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/mainfloor
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/master_lounge
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/novice_lounge
+%%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/secondfloor
 %%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/storage_room
 %%DATADIR%%/maps/darcap/darcap/guilds/poisoned_dagger/upper
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/basement
 %%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/bigchest
 %%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/ground
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/guild_alchemy
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/guild_bbq
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/guild_hq
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/guild_jeweler
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/guild_tan
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/guild_thaum
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/guild_toolshed
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/guildman_lounge
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/guildmaster_lounge
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/hallofjoining
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/journeyman_lounge
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/mainfloor
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/master_lounge
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/novice_lounge
+%%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/secondfloor
 %%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/storage_room
 %%DATADIR%%/maps/darcap/darcap/guilds/smoking_cauldron/upper
 %%DATADIR%%/maps/darcap/darcap/house_tunnels
 %%DATADIR%%/maps/darcap/darcap/inn
 %%DATADIR%%/maps/darcap/darcap/library_ground
 %%DATADIR%%/maps/darcap/darcap/library_upper
+%%DATADIR%%/maps/darcap/darcap/manor.blue
+%%DATADIR%%/maps/darcap/darcap/manor.brown
+%%DATADIR%%/maps/darcap/darcap/manor.ground
+%%DATADIR%%/maps/darcap/darcap/manor.treasure
+%%DATADIR%%/maps/darcap/darcap/manor.white
 %%DATADIR%%/maps/darcap/darcap/maze
+%%DATADIR%%/maps/darcap/darcap/molthir.msg
 %%DATADIR%%/maps/darcap/darcap/park
+%%DATADIR%%/maps/darcap/darcap/petshop
 %%DATADIR%%/maps/darcap/darcap/pirates.1
 %%DATADIR%%/maps/darcap/darcap/potionshop
 %%DATADIR%%/maps/darcap/darcap/quest
 %%DATADIR%%/maps/darcap/darcap/random_house
+%%DATADIR%%/maps/darcap/darcap/scartis
+%%DATADIR%%/maps/darcap/darcap/scartis.msg
 %%DATADIR%%/maps/darcap/darcap/shop_a
 %%DATADIR%%/maps/darcap/darcap/shop_g
 %%DATADIR%%/maps/darcap/darcap/shop_m
 %%DATADIR%%/maps/darcap/darcap/shop_w
+%%DATADIR%%/maps/darcap/darcap/spike.msg
+%%DATADIR%%/maps/darcap/darcap/talok.msg
 %%DATADIR%%/maps/darcap/darcap/tavern
 %%DATADIR%%/maps/darcap/darcap/temple
 %%DATADIR%%/maps/darcap/darcap/thilgar
 %%DATADIR%%/maps/darcap/darcap/thilgar_top
 %%DATADIR%%/maps/darcap/darcap/waterhouse
+%%DATADIR%%/maps/darcap/darcap.quests
 %%DATADIR%%/maps/darcap/house1
 %%DATADIR%%/maps/darcap/lynn/castle1.0
 %%DATADIR%%/maps/darcap/lynn/castle1.1
@@ -575,8 +714,6 @@ 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
@@ -585,6 +722,9 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/dungeons/hut/ancient_hut
 %%DATADIR%%/maps/dungeons/hut/kjerring
 %%DATADIR%%/maps/dungeons/hut/watertunnel
+%%DATADIR%%/maps/dungeons/liomal_ground
+%%DATADIR%%/maps/dungeons/liomal_treasure
+%%DATADIR%%/maps/dungeons/liomal_upper
 %%DATADIR%%/maps/dungeons/monkey_temple/m_temple1
 %%DATADIR%%/maps/dungeons/monkey_temple/m_temple2
 %%DATADIR%%/maps/dungeons/ruins
@@ -599,8 +739,6 @@ 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/pickmaps/NPC
 %%DATADIR%%/maps/editor/pickmaps/armour
@@ -634,6 +772,23 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/euthville/devil.church3
 %%DATADIR%%/maps/euthville/devil.church4
 %%DATADIR%%/maps/euthville/devil.church5
+%%DATADIR%%/maps/euthville/green_goblin/basement
+%%DATADIR%%/maps/euthville/green_goblin/guild_alchemy
+%%DATADIR%%/maps/euthville/green_goblin/guild_bbq
+%%DATADIR%%/maps/euthville/green_goblin/guild_hq
+%%DATADIR%%/maps/euthville/green_goblin/guild_jeweler
+%%DATADIR%%/maps/euthville/green_goblin/guild_tan
+%%DATADIR%%/maps/euthville/green_goblin/guild_thaum
+%%DATADIR%%/maps/euthville/green_goblin/guild_toolshed
+%%DATADIR%%/maps/euthville/green_goblin/guildman_lounge
+%%DATADIR%%/maps/euthville/green_goblin/guildmaster_lounge
+%%DATADIR%%/maps/euthville/green_goblin/hallofjoining
+%%DATADIR%%/maps/euthville/green_goblin/journeyman_lounge
+%%DATADIR%%/maps/euthville/green_goblin/mainfloor
+%%DATADIR%%/maps/euthville/green_goblin/master_lounge
+%%DATADIR%%/maps/euthville/green_goblin/novice_lounge
+%%DATADIR%%/maps/euthville/green_goblin/secondfloor
+%%DATADIR%%/maps/euthville/green_goblin/storage_room
 %%DATADIR%%/maps/euthville/hallofbones
 %%DATADIR%%/maps/euthville/magic.shop
 %%DATADIR%%/maps/euthville/map.fr.0
@@ -686,6 +841,23 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/lake_country/Butakis/luck1
 %%DATADIR%%/maps/lake_country/Butakis/luck2
 %%DATADIR%%/maps/lake_country/Butakis/luck3
+%%DATADIR%%/maps/lake_country/Butakis/mockers/basement
+%%DATADIR%%/maps/lake_country/Butakis/mockers/guild_alchemy
+%%DATADIR%%/maps/lake_country/Butakis/mockers/guild_bbq
+%%DATADIR%%/maps/lake_country/Butakis/mockers/guild_hq
+%%DATADIR%%/maps/lake_country/Butakis/mockers/guild_jeweler
+%%DATADIR%%/maps/lake_country/Butakis/mockers/guild_tan
+%%DATADIR%%/maps/lake_country/Butakis/mockers/guild_thaum
+%%DATADIR%%/maps/lake_country/Butakis/mockers/guild_toolshed
+%%DATADIR%%/maps/lake_country/Butakis/mockers/guildman_lounge
+%%DATADIR%%/maps/lake_country/Butakis/mockers/guildmaster_lounge
+%%DATADIR%%/maps/lake_country/Butakis/mockers/hallofjoining
+%%DATADIR%%/maps/lake_country/Butakis/mockers/journeyman_lounge
+%%DATADIR%%/maps/lake_country/Butakis/mockers/mainfloor
+%%DATADIR%%/maps/lake_country/Butakis/mockers/master_lounge
+%%DATADIR%%/maps/lake_country/Butakis/mockers/novice_lounge
+%%DATADIR%%/maps/lake_country/Butakis/mockers/secondfloor
+%%DATADIR%%/maps/lake_country/Butakis/mockers/storage_room
 %%DATADIR%%/maps/lake_country/Butakis/p_ghouse_s
 %%DATADIR%%/maps/lake_country/Butakis/p_ghouse_w
 %%DATADIR%%/maps/lake_country/Butakis/prison-1
@@ -861,6 +1033,7 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/navar_city/apartments/apartment_attic
 %%DATADIR%%/maps/navar_city/apartments/apartment_basement
 %%DATADIR%%/maps/navar_city/apartments/apartment_upstairs
+%%DATADIR%%/maps/navar_city/bow_shop
 %%DATADIR%%/maps/navar_city/casino_infernal/casino_infernal1
 %%DATADIR%%/maps/navar_city/casino_infernal/casino_infernal2
 %%DATADIR%%/maps/navar_city/city1church1
@@ -872,8 +1045,24 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/navar_city/city1prison
 %%DATADIR%%/maps/navar_city/collosium
 %%DATADIR%%/maps/navar_city/dragon_hangar/hangar
+%%DATADIR%%/maps/navar_city/dreaming_sage/basement
 %%DATADIR%%/maps/navar_city/dreaming_sage/bigchest
 %%DATADIR%%/maps/navar_city/dreaming_sage/ground
+%%DATADIR%%/maps/navar_city/dreaming_sage/guild_alchemy
+%%DATADIR%%/maps/navar_city/dreaming_sage/guild_bbq
+%%DATADIR%%/maps/navar_city/dreaming_sage/guild_hq
+%%DATADIR%%/maps/navar_city/dreaming_sage/guild_jeweler
+%%DATADIR%%/maps/navar_city/dreaming_sage/guild_tan
+%%DATADIR%%/maps/navar_city/dreaming_sage/guild_thaum
+%%DATADIR%%/maps/navar_city/dreaming_sage/guild_toolshed
+%%DATADIR%%/maps/navar_city/dreaming_sage/guildman_lounge
+%%DATADIR%%/maps/navar_city/dreaming_sage/guildmaster_lounge
+%%DATADIR%%/maps/navar_city/dreaming_sage/hallofjoining
+%%DATADIR%%/maps/navar_city/dreaming_sage/journeyman_lounge
+%%DATADIR%%/maps/navar_city/dreaming_sage/mainfloor
+%%DATADIR%%/maps/navar_city/dreaming_sage/master_lounge
+%%DATADIR%%/maps/navar_city/dreaming_sage/novice_lounge
+%%DATADIR%%/maps/navar_city/dreaming_sage/secondfloor
 %%DATADIR%%/maps/navar_city/dreaming_sage/storage_room
 %%DATADIR%%/maps/navar_city/dreaming_sage/upper
 %%DATADIR%%/maps/navar_city/illusion/illexit
@@ -1193,12 +1382,44 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/pup_land/cave_weapon/cave3
 %%DATADIR%%/maps/pup_land/cave_weapon/cave4
 %%DATADIR%%/maps/pup_land/cave_weapon/cave5
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/basement
 %%DATADIR%%/maps/pup_land/guilds/laughing_skull/bigchest
 %%DATADIR%%/maps/pup_land/guilds/laughing_skull/ground
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/guild_alchemy
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/guild_bbq
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/guild_hq
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/guild_jeweler
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/guild_tan
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/guild_thaum
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/guild_toolshed
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/guildman_lounge
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/guildmaster_lounge
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/hallofjoining
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/journeyman_lounge
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/mainfloor
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/master_lounge
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/novice_lounge
+%%DATADIR%%/maps/pup_land/guilds/laughing_skull/secondfloor
 %%DATADIR%%/maps/pup_land/guilds/laughing_skull/storage_room
 %%DATADIR%%/maps/pup_land/guilds/laughing_skull/upper
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/basement
 %%DATADIR%%/maps/pup_land/guilds/purple_butterfly/bigchest
 %%DATADIR%%/maps/pup_land/guilds/purple_butterfly/ground
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/guild_alchemy
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/guild_bbq
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/guild_hq
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/guild_jeweler
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/guild_tan
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/guild_thaum
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/guild_toolshed
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/guildman_lounge
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/guildmaster_lounge
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/hallofjoining
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/journeyman_lounge
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/mainfloor
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/master_lounge
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/novice_lounge
+%%DATADIR%%/maps/pup_land/guilds/purple_butterfly/secondfloor
 %%DATADIR%%/maps/pup_land/guilds/purple_butterfly/storage_room
 %%DATADIR%%/maps/pup_land/guilds/purple_butterfly/upper
 %%DATADIR%%/maps/pup_land/hall2
@@ -1484,6 +1705,7 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/python/CFDataFile.py
 %%DATADIR%%/maps/python/CFDialog.py
 %%DATADIR%%/maps/python/CFGamble.py
+%%DATADIR%%/maps/python/CFGuildClearance.py
 %%DATADIR%%/maps/python/CFGuilds.py
 %%DATADIR%%/maps/python/CFItemBroker.py
 %%DATADIR%%/maps/python/CFLog.py
@@ -1495,10 +1717,13 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/python/IPO/README
 %%DATADIR%%/maps/python/IPO/banksay.py
 %%DATADIR%%/maps/python/IPO/board.py
+%%DATADIR%%/maps/python/IPO/checks.py
 %%DATADIR%%/maps/python/IPO/receive.py
 %%DATADIR%%/maps/python/IPO/say.py
 %%DATADIR%%/maps/python/IPO/seen.py
 %%DATADIR%%/maps/python/IPO/send.py
+%%DATADIR%%/maps/python/Move_Fog.py
+%%DATADIR%%/maps/python/Moving_Fog.py
 %%DATADIR%%/maps/python/README
 %%DATADIR%%/maps/python/casino/diamondslots.py
 %%DATADIR%%/maps/python/casino/goldslots.py
@@ -1506,8 +1731,31 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/python/casino/platinumslots.py
 %%DATADIR%%/maps/python/casino/silverslots.py
 %%DATADIR%%/maps/python/commands/give.py
+%%DATADIR%%/maps/python/dialog/commongive.py
+%%DATADIR%%/maps/python/dialog/dialog_check.py
+%%DATADIR%%/maps/python/dialog/npc_dialog.py
+%%DATADIR%%/maps/python/dialog/post/animate.py
+%%DATADIR%%/maps/python/dialog/post/connection.py
+%%DATADIR%%/maps/python/dialog/post/givecontents.py
+%%DATADIR%%/maps/python/dialog/post/giveitem.py
+%%DATADIR%%/maps/python/dialog/post/marktime.py
+%%DATADIR%%/maps/python/dialog/post/quest.py
+%%DATADIR%%/maps/python/dialog/post/setnpctoken.py
+%%DATADIR%%/maps/python/dialog/post/settoken.py
+%%DATADIR%%/maps/python/dialog/post/takeitem.py
+%%DATADIR%%/maps/python/dialog/pre/README
+%%DATADIR%%/maps/python/dialog/pre/age.py
+%%DATADIR%%/maps/python/dialog/pre/archininventory.py
+%%DATADIR%%/maps/python/dialog/pre/item.py
+%%DATADIR%%/maps/python/dialog/pre/knowledgeknown.py
+%%DATADIR%%/maps/python/dialog/pre/level.py
+%%DATADIR%%/maps/python/dialog/pre/npctoken.py
+%%DATADIR%%/maps/python/dialog/pre/quest.py
+%%DATADIR%%/maps/python/dialog/pre/questdone.py
+%%DATADIR%%/maps/python/dialog/pre/token.py
 %%DATADIR%%/maps/python/events/README
 %%DATADIR%%/maps/python/events/born/log_born.py
+%%DATADIR%%/maps/python/events/clock/bell.py
 %%DATADIR%%/maps/python/events/init/give_command.py
 %%DATADIR%%/maps/python/events/init/guild_init.py
 %%DATADIR%%/maps/python/events/kick/log_kick.py
@@ -1520,13 +1768,9 @@ lib/crossfire/random_map
 %%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/GUILD_TEMPLATE.txt
-%%DATADIR%%/maps/python/guilds/PoisonedDagger.txt
-%%DATADIR%%/maps/python/guilds/PurpleButterfly.txt
 %%DATADIR%%/maps/python/guilds/README.txt
-%%DATADIR%%/maps/python/guilds/SmokingCauldron.txt
 %%DATADIR%%/maps/python/guilds/arrest.py
-%%DATADIR%%/maps/python/guilds/clearance.py
+%%DATADIR%%/maps/python/guilds/bigchest.py
 %%DATADIR%%/maps/python/guilds/guild_dues.py
 %%DATADIR%%/maps/python/guilds/guild_entry.py
 %%DATADIR%%/maps/python/guilds/guild_questpoints_apply.py
@@ -1534,27 +1778,29 @@ 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/guilds/guildpay.py
-%%DATADIR%%/maps/python/guilds/guildstorage.py
-%%DATADIR%%/maps/python/guilds/storage_entry.py
-%%DATADIR%%/maps/python/guilds/trigger.py
 %%DATADIR%%/maps/python/items/banquet.py
 %%DATADIR%%/maps/python/items/campfire_say.py
 %%DATADIR%%/maps/python/items/campfire_timer.py
+%%DATADIR%%/maps/python/items/death_punisher.py
 %%DATADIR%%/maps/python/items/experience_rewarder.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/roll-o-matic.py
+%%DATADIR%%/maps/python/items/sell_punisher.py
 %%DATADIR%%/maps/python/items/smoking_pipe.py
 %%DATADIR%%/maps/python/items/sunnista.py
 %%DATADIR%%/maps/python/items/weapon_occidental_mages.py
+%%DATADIR%%/maps/python/maps/darcap/manor.py
 %%DATADIR%%/maps/python/maps/navar-midane_apply.py
 %%DATADIR%%/maps/python/maps/navar-midane_attack.py
 %%DATADIR%%/maps/python/maps/navar-midane_pickup.py
 %%DATADIR%%/maps/python/maps/navar-midane_time.py
 %%DATADIR%%/maps/python/maps/navar_city/university-dorlf.py
 %%DATADIR%%/maps/python/maps/scorn/HouseofHealing.py
+%%DATADIR%%/maps/python/maps/scorn/castle_read.py
+%%DATADIR%%/maps/python/maps/scorn/castle_write.py
+%%DATADIR%%/maps/python/maps/scorn/doors_galore.py
 %%DATADIR%%/maps/python/maps/scorn/towers/mad_mage/brewery_letter
 %%DATADIR%%/maps/python/maps/scorn/towers/mad_mage/mad_mage_user.py
 %%DATADIR%%/maps/python/maps/scorn/towers/mad_mage/milking_blueprints
@@ -1569,7 +1815,6 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/python/misc/death_message.py
 %%DATADIR%%/maps/python/misc/doNothing.py
 %%DATADIR%%/maps/python/misc/greet_message.py
-%%DATADIR%%/maps/python/misc/npc_dialog.py
 %%DATADIR%%/maps/python/misc/swallow_whole.py
 %%DATADIR%%/maps/python/monsters/combat_chicken.py
 %%DATADIR%%/maps/python/monsters/farnass.py
@@ -1580,6 +1825,11 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/python/pshop/entry.py
 %%DATADIR%%/maps/python/pshop/pshop.py
 %%DATADIR%%/maps/python/pshop/rent.py
+%%DATADIR%%/maps/python/quests/QuestAdvance.py
+%%DATADIR%%/maps/python/quests/QuestApplyIf.py
+%%DATADIR%%/maps/python/quests/QuestConditionalDrop.py
+%%DATADIR%%/maps/python/quests/QuestEssentialUntil.py
+%%DATADIR%%/maps/python/quests/QuestTriggerConnect.py
 %%DATADIR%%/maps/python/start/dragon_attune.py
 %%DATADIR%%/maps/python/tod/filter.py
 %%DATADIR%%/maps/python/tod/push.py
@@ -1720,6 +1970,7 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/quests/peterm/quests/mushroom_quest
 %%DATADIR%%/maps/quests/peterm/quests/ogre_chief
 %%DATADIR%%/maps/quests/peterm/quests/titan_quest
+%%DATADIR%%/maps/quests/peterm/quests/titanguard.msg
 %%DATADIR%%/maps/quests/peterm/quests/wyvern_quest
 %%DATADIR%%/maps/quests/peterm/temple/AnteChamber
 %%DATADIR%%/maps/quests/peterm/temple/GemTunnel
@@ -1779,8 +2030,24 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/santo_dominion/espen/espen1
 %%DATADIR%%/maps/santo_dominion/espen/espen2
 %%DATADIR%%/maps/santo_dominion/espen/palace
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/basement
 %%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/bigchest
 %%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/ground
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/guild_alchemy
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/guild_bbq
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/guild_hq
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/guild_jeweler
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/guild_tan
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/guild_thaum
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/guild_toolshed
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/guildman_lounge
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/guildmaster_lounge
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/hallofjoining
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/journeyman_lounge
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/mainfloor
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/master_lounge
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/novice_lounge
+%%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/secondfloor
 %%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/storage_room
 %%DATADIR%%/maps/santo_dominion/guilds/drunken_barbarian/upper
 %%DATADIR%%/maps/santo_dominion/house_of_hell
@@ -1839,24 +2106,52 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/santo_dominion/tobias.top
 %%DATADIR%%/maps/santo_dominion/tollpost
 %%DATADIR%%/maps/scorn/README
+%%DATADIR%%/maps/scorn/anthony/milton.msg
 %%DATADIR%%/maps/scorn/anthony/passoffice
 %%DATADIR%%/maps/scorn/anthony/portgate
+%%DATADIR%%/maps/scorn/anthony/portguard.msg
 %%DATADIR%%/maps/scorn/apartment/Apartments1
 %%DATADIR%%/maps/scorn/apartment/Apartments2
 %%DATADIR%%/maps/scorn/apartment/Apartments3
 %%DATADIR%%/maps/scorn/apartment/Apartments4
 %%DATADIR%%/maps/scorn/apartment/Apartments5
 %%DATADIR%%/maps/scorn/apartment/apartments
-%%DATADIR%%/maps/scorn/cannery/ware1
-%%DATADIR%%/maps/scorn/crow/train/train
+%%DATADIR%%/maps/scorn/aristocracy.quests
+%%DATADIR%%/maps/scorn/citygate.quests
 %%DATADIR%%/maps/scorn/dtabb/cave
 %%DATADIR%%/maps/scorn/dtabb/cave2
 %%DATADIR%%/maps/scorn/dtabb/cave3
 %%DATADIR%%/maps/scorn/guilds/guildhousesinc
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/GuildList
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/README.txt
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/basement
 %%DATADIR%%/maps/scorn/guilds/mailed_fist/bigchest
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/bigchest~
 %%DATADIR%%/maps/scorn/guilds/mailed_fist/ground
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/guild_alchemy
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/guild_bbq
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/guild_hq
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/guild_jeweler
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/guild_tan
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/guild_thaum
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/guild_toolshed
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/guildman_lounge
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/guildmaster_lounge
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/hallofjoining
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/journeyman_lounge
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/mainfloor
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/mainfloor~
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/master_lounge
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/masters_lounge
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/novice_lounge
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/secondfloor
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/storage_hall
+%%DATADIR%%/maps/scorn/guilds/mailed_fist/storage_hall.0
 %%DATADIR%%/maps/scorn/guilds/mailed_fist/storage_room
 %%DATADIR%%/maps/scorn/guilds/mailed_fist/upper
+%%DATADIR%%/maps/scorn/houses/alfalfa_basement
+%%DATADIR%%/maps/scorn/houses/alfalfa_ground
+%%DATADIR%%/maps/scorn/houses/alfalfa_upstairs
 %%DATADIR%%/maps/scorn/houses/angrygiant
 %%DATADIR%%/maps/scorn/houses/barracks
 %%DATADIR%%/maps/scorn/houses/bowyer
@@ -1866,10 +2161,13 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/scorn/houses/chess_club
 %%DATADIR%%/maps/scorn/houses/cornerbrook
 %%DATADIR%%/maps/scorn/houses/cornerbrook_under
+%%DATADIR%%/maps/scorn/houses/doors_galore
 %%DATADIR%%/maps/scorn/houses/easy_house.1.a
 %%DATADIR%%/maps/scorn/houses/easy_house.1.b
 %%DATADIR%%/maps/scorn/houses/easy_house.1.c
+%%DATADIR%%/maps/scorn/houses/farm.quests
 %%DATADIR%%/maps/scorn/houses/farmhouse
+%%DATADIR%%/maps/scorn/houses/gramps_malone.msg
 %%DATADIR%%/maps/scorn/houses/house.haunted
 %%DATADIR%%/maps/scorn/houses/house.haunted2
 %%DATADIR%%/maps/scorn/houses/house1
@@ -1878,12 +2176,15 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/scorn/houses/house3.2nd
 %%DATADIR%%/maps/scorn/houses/house3.bas1
 %%DATADIR%%/maps/scorn/houses/house3.bas2
+%%DATADIR%%/maps/scorn/houses/jc.msg
 %%DATADIR%%/maps/scorn/houses/jeweler
 %%DATADIR%%/maps/scorn/houses/jones
 %%DATADIR%%/maps/scorn/houses/kitchen
+%%DATADIR%%/maps/scorn/houses/malone.quests
 %%DATADIR%%/maps/scorn/houses/map.fr.ruin
 %%DATADIR%%/maps/scorn/houses/maze1
 %%DATADIR%%/maps/scorn/houses/messhall
+%%DATADIR%%/maps/scorn/houses/molly_malone.msg
 %%DATADIR%%/maps/scorn/houses/newhouse1
 %%DATADIR%%/maps/scorn/houses/resir
 %%DATADIR%%/maps/scorn/houses/riverside_manor
@@ -1892,6 +2193,8 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/scorn/houses/scorn_trappers
 %%DATADIR%%/maps/scorn/houses/smithery
 %%DATADIR%%/maps/scorn/houses/tannery
+%%DATADIR%%/maps/scorn/houses/terry.msg
+%%DATADIR%%/maps/scorn/houses/terrys_wife.msg
 %%DATADIR%%/maps/scorn/houses/tyl
 %%DATADIR%%/maps/scorn/houses/tyl_attic
 %%DATADIR%%/maps/scorn/houses/wizardw
@@ -1903,6 +2206,7 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/scorn/kar/creepy.house2
 %%DATADIR%%/maps/scorn/kar/drink
 %%DATADIR%%/maps/scorn/kar/gork.msg
+%%DATADIR%%/maps/scorn/kar/gork.quests
 %%DATADIR%%/maps/scorn/kar/gorks1
 %%DATADIR%%/maps/scorn/kar/gorks2
 %%DATADIR%%/maps/scorn/kar/gorks3
@@ -1922,6 +2226,8 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/scorn/misc/HospitalityRoom
 %%DATADIR%%/maps/scorn/misc/HouseofHealing
 %%DATADIR%%/maps/scorn/misc/PowerHouse
+%%DATADIR%%/maps/scorn/misc/alfalfa.msg
+%%DATADIR%%/maps/scorn/misc/animal_quarantine
 %%DATADIR%%/maps/scorn/misc/battle_arena/arena
 %%DATADIR%%/maps/scorn/misc/battle_arena/arena_ud
 %%DATADIR%%/maps/scorn/misc/battle_arena/entrance
@@ -1935,11 +2241,15 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/scorn/misc/church
 %%DATADIR%%/maps/scorn/misc/cider_house
 %%DATADIR%%/maps/scorn/misc/cider_house_top
+%%DATADIR%%/maps/scorn/misc/cistern
 %%DATADIR%%/maps/scorn/misc/cityhall
-%%DATADIR%%/maps/scorn/misc/devourlower
 %%DATADIR%%/maps/scorn/misc/dragon_guild
 %%DATADIR%%/maps/scorn/misc/drywell
+%%DATADIR%%/maps/scorn/misc/gateguardcommon.msg
+%%DATADIR%%/maps/scorn/misc/gateguardinside.msg
+%%DATADIR%%/maps/scorn/misc/gateguardoutside.msg
 %%DATADIR%%/maps/scorn/misc/gatehouse
+%%DATADIR%%/maps/scorn/misc/goggleguard.msg
 %%DATADIR%%/maps/scorn/misc/jail
 %%DATADIR%%/maps/scorn/misc/jail_upper
 %%DATADIR%%/maps/scorn/misc/kboldtemp1
@@ -1947,16 +2257,28 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/scorn/misc/kboldtemp1b2
 %%DATADIR%%/maps/scorn/misc/kboldtemp1b3
 %%DATADIR%%/maps/scorn/misc/kboldtemp1b4
+%%DATADIR%%/maps/scorn/misc/king.msg
+%%DATADIR%%/maps/scorn/misc/king_archduke.msg
+%%DATADIR%%/maps/scorn/misc/king_count.msg
+%%DATADIR%%/maps/scorn/misc/king_duke.msg
 %%DATADIR%%/maps/scorn/misc/library
+%%DATADIR%%/maps/scorn/misc/magistrate.msg
+%%DATADIR%%/maps/scorn/misc/magistrate_baron.msg
+%%DATADIR%%/maps/scorn/misc/magistrate_baronet.msg
+%%DATADIR%%/maps/scorn/misc/magistrate_civilian.msg
+%%DATADIR%%/maps/scorn/misc/magistrate_count.msg
+%%DATADIR%%/maps/scorn/misc/magistrate_duke.msg
+%%DATADIR%%/maps/scorn/misc/magistrate_earl.msg
+%%DATADIR%%/maps/scorn/misc/magistrate_knight.msg
+%%DATADIR%%/maps/scorn/misc/magistrate_marquis.msg
 %%DATADIR%%/maps/scorn/misc/map.esben.2
 %%DATADIR%%/maps/scorn/misc/mercenaries
 %%DATADIR%%/maps/scorn/misc/port_arena
 %%DATADIR%%/maps/scorn/misc/prison
 %%DATADIR%%/maps/scorn/misc/prison.1
 %%DATADIR%%/maps/scorn/misc/puddings.place
-%%DATADIR%%/maps/scorn/misc/templedevour
-%%DATADIR%%/maps/scorn/misc/templelyth
 %%DATADIR%%/maps/scorn/misc/testing_area
+%%DATADIR%%/maps/scorn/misc/training_center
 %%DATADIR%%/maps/scorn/misc/wizhide
 %%DATADIR%%/maps/scorn/misc/zoo
 %%DATADIR%%/maps/scorn/misc/zoo2
@@ -1977,6 +2299,7 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/scorn/oldcity/oldcity8
 %%DATADIR%%/maps/scorn/oldcity/oldcity9
 %%DATADIR%%/maps/scorn/peterm/undead_quest
+%%DATADIR%%/maps/scorn/scorn.quests
 %%DATADIR%%/maps/scorn/shops/BasicSpells
 %%DATADIR%%/maps/scorn/shops/IPO_scorn
 %%DATADIR%%/maps/scorn/shops/alclass
@@ -1985,32 +2308,50 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/scorn/shops/bowshop
 %%DATADIR%%/maps/scorn/shops/buildshop
 %%DATADIR%%/maps/scorn/shops/coffeeshop
+%%DATADIR%%/maps/scorn/shops/eswald.msg
 %%DATADIR%%/maps/scorn/shops/foodshop
 %%DATADIR%%/maps/scorn/shops/gemshop
 %%DATADIR%%/maps/scorn/shops/generalshop
 %%DATADIR%%/maps/scorn/shops/light_shop
 %%DATADIR%%/maps/scorn/shops/magicshop
+%%DATADIR%%/maps/scorn/shops/oled.msg
 %%DATADIR%%/maps/scorn/shops/oleds_cafe
 %%DATADIR%%/maps/scorn/shops/potionshop
+%%DATADIR%%/maps/scorn/shops/privateshop
+%%DATADIR%%/maps/scorn/shops/privateshop_43_36
+%%DATADIR%%/maps/scorn/shops/privateshop_43_37
+%%DATADIR%%/maps/scorn/shops/privateshop_48_34
+%%DATADIR%%/maps/scorn/shops/privateshop_48_35
 %%DATADIR%%/maps/scorn/shops/scorn.sale1
 %%DATADIR%%/maps/scorn/shops/scorn.sale2
+%%DATADIR%%/maps/scorn/shops/smith.msg
+%%DATADIR%%/maps/scorn/shops/smith_finished.msg
 %%DATADIR%%/maps/scorn/shops/weaponshop
 %%DATADIR%%/maps/scorn/taverns/apartments
 %%DATADIR%%/maps/scorn/taverns/barking_mule
+%%DATADIR%%/maps/scorn/taverns/dragon_emissary.msg
+%%DATADIR%%/maps/scorn/taverns/fran.msg
 %%DATADIR%%/maps/scorn/taverns/goths
 %%DATADIR%%/maps/scorn/taverns/goths0
 %%DATADIR%%/maps/scorn/taverns/goths2
 %%DATADIR%%/maps/scorn/taverns/hintson.msg
 %%DATADIR%%/maps/scorn/taverns/inn
 %%DATADIR%%/maps/scorn/taverns/inn2
+%%DATADIR%%/maps/scorn/taverns/mark.msg
+%%DATADIR%%/maps/scorn/temples/devourers
+%%DATADIR%%/maps/scorn/temples/devourers_lower
 %%DATADIR%%/maps/scorn/temples/gaea
 %%DATADIR%%/maps/scorn/temples/gnarg
 %%DATADIR%%/maps/scorn/temples/gorokh
+%%DATADIR%%/maps/scorn/temples/gorokh_final
+%%DATADIR%%/maps/scorn/temples/gorokh_treasure
 %%DATADIR%%/maps/scorn/temples/ixalovh
+%%DATADIR%%/maps/scorn/temples/lythander
 %%DATADIR%%/maps/scorn/temples/mostrai
 %%DATADIR%%/maps/scorn/temples/mostrai2
 %%DATADIR%%/maps/scorn/temples/ruggilli1
 %%DATADIR%%/maps/scorn/temples/ruggilli2
+%%DATADIR%%/maps/scorn/temples/servantofgaea.msg
 %%DATADIR%%/maps/scorn/temples/sorig
 %%DATADIR%%/maps/scorn/temples/sorig2
 %%DATADIR%%/maps/scorn/temples/valkyrie
@@ -2018,11 +2359,20 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/scorn/temples/valriel
 %%DATADIR%%/maps/scorn/temples/valriel2
 %%DATADIR%%/maps/scorn/temples/valriel3
+%%DATADIR%%/maps/scorn/temples/valriel_final
+%%DATADIR%%/maps/scorn/temples/valriel_treasure
 %%DATADIR%%/maps/scorn/towers/brewery.1
 %%DATADIR%%/maps/scorn/towers/brewery.2
 %%DATADIR%%/maps/scorn/towers/brewery.3
 %%DATADIR%%/maps/scorn/towers/brewery.4
-%%DATADIR%%/maps/scorn/towers/tower.mad
+%%DATADIR%%/maps/scorn/towers/igor0.msg
+%%DATADIR%%/maps/scorn/towers/igor1.msg
+%%DATADIR%%/maps/scorn/towers/igor2.msg
+%%DATADIR%%/maps/scorn/towers/lighthouse.0
+%%DATADIR%%/maps/scorn/towers/lighthouse.1
+%%DATADIR%%/maps/scorn/towers/lighthouse.2
+%%DATADIR%%/maps/scorn/towers/lighthouse.3
+%%DATADIR%%/maps/scorn/towers/tower.mad0
 %%DATADIR%%/maps/scorn/towers/tower.mad1
 %%DATADIR%%/maps/scorn/towers/tower.mad2
 %%DATADIR%%/maps/scorn/towers/tower.mad3
@@ -2054,6 +2404,7 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/start/Nexus
 %%DATADIR%%/maps/start/newbieshouse
 %%DATADIR%%/maps/start/sigmund.msg
+%%DATADIR%%/maps/start/start.quests
 %%DATADIR%%/maps/styles/decorstyles/alchemy
 %%DATADIR%%/maps/styles/decorstyles/craters
 %%DATADIR%%/maps/styles/decorstyles/creepy
@@ -2428,7 +2779,6 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/styles/wallstyles/water
 %%DATADIR%%/maps/styles/wallstyles/wharf
 %%DATADIR%%/maps/styles/wallstyles/wooden
-%%DATADIR%%/maps/svn-commit.tmp~
 %%DATADIR%%/maps/teamarena/teamwar
 %%DATADIR%%/maps/teamarena/twregister
 %%DATADIR%%/maps/templates/README
@@ -2437,9 +2787,12 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/templates/bungalo/bungalo3.tpl
 %%DATADIR%%/maps/templates/bungalo/bungalo_b.tpl
 %%DATADIR%%/maps/templates/guild/GuildList
+%%DATADIR%%/maps/templates/guild/GuildLocations
 %%DATADIR%%/maps/templates/guild/README.txt
 %%DATADIR%%/maps/templates/guild/basement
-%%DATADIR%%/maps/templates/guild/bigchest
+%%DATADIR%%/maps/templates/guild/convert.py
+%%DATADIR%%/maps/templates/guild/convertall.py
+%%DATADIR%%/maps/templates/guild/filelist.py
 %%DATADIR%%/maps/templates/guild/guild_alchemy
 %%DATADIR%%/maps/templates/guild/guild_bbq
 %%DATADIR%%/maps/templates/guild/guild_hq
@@ -2480,13 +2833,17 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/test/cfanim.animation
 %%DATADIR%%/maps/test/cfanim.button
 %%DATADIR%%/maps/test/cfanim.conjurer
+%%DATADIR%%/maps/test/cfanim.ghosted.animation
 %%DATADIR%%/maps/test/cfanim.py
 %%DATADIR%%/maps/test/connected_bug
 %%DATADIR%%/maps/test/cyclops
 %%DATADIR%%/maps/test/diagonal
 %%DATADIR%%/maps/test/dialog
 %%DATADIR%%/maps/test/faceofdeath
+%%DATADIR%%/maps/test/find_by_arch_name
+%%DATADIR%%/maps/test/find_by_arch_name.py
 %%DATADIR%%/maps/test/gen_test
+%%DATADIR%%/maps/test/granpa_dialog.msg
 %%DATADIR%%/maps/test/insert_bug
 %%DATADIR%%/maps/test/lighting
 %%DATADIR%%/maps/test/multisquare
@@ -2545,6 +2902,24 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/test/python_timer.py
 %%DATADIR%%/maps/test/quest
 %%DATADIR%%/maps/test/quest.py
+%%DATADIR%%/maps/test/quest_handling/apples.msg
+%%DATADIR%%/maps/test/quest_handling/bothquests.msg
+%%DATADIR%%/maps/test/quest_handling/cantkillme.msg
+%%DATADIR%%/maps/test/quest_handling/connectiontest.msg
+%%DATADIR%%/maps/test/quest_handling/friendly.msg
+%%DATADIR%%/maps/test/quest_handling/girl2.msg
+%%DATADIR%%/maps/test/quest_handling/girl3.msg
+%%DATADIR%%/maps/test/quest_handling/girl4.msg
+%%DATADIR%%/maps/test/quest_handling/girl5.msg
+%%DATADIR%%/maps/test/quest_handling/girl6.msg
+%%DATADIR%%/maps/test/quest_handling/girl7.msg
+%%DATADIR%%/maps/test/quest_handling/girlmain.msg
+%%DATADIR%%/maps/test/quest_handling/marker.msg
+%%DATADIR%%/maps/test/quest_handling/ninja.animation
+%%DATADIR%%/maps/test/quest_handling/ninja.msg
+%%DATADIR%%/maps/test/quest_handling/quest_map
+%%DATADIR%%/maps/test/quest_handling/testquest.msg
+%%DATADIR%%/maps/test/quest_handling/timetest.msg
 %%DATADIR%%/maps/test/randomtreasure
 %%DATADIR%%/maps/test/reaper
 %%DATADIR%%/maps/test/remote_altar
@@ -2553,6 +2928,7 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/test/talked_to
 %%DATADIR%%/maps/test/teleporter_test
 %%DATADIR%%/maps/test/templatetest
+%%DATADIR%%/maps/test/test.quests
 %%DATADIR%%/maps/test/throw
 %%DATADIR%%/maps/test/thrown_pickup
 %%DATADIR%%/maps/test/tile1
@@ -2747,8 +3123,24 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/wolfsburg/eeur/tower1.3
 %%DATADIR%%/maps/wolfsburg/eeur/tower1.4
 %%DATADIR%%/maps/wolfsburg/etern_rew
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/basement
 %%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/bigchest
 %%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/ground
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/guild_alchemy
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/guild_bbq
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/guild_hq
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/guild_jeweler
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/guild_tan
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/guild_thaum
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/guild_toolshed
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/guildman_lounge
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/guildmaster_lounge
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/hallofjoining
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/journeyman_lounge
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/mainfloor
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/master_lounge
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/novice_lounge
+%%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/secondfloor
 %%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/storage_room
 %%DATADIR%%/maps/wolfsburg/guilds/damned_heretics/upper
 %%DATADIR%%/maps/wolfsburg/inns
@@ -2789,6 +3181,7 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/wolfsburg/volcano/vvhuts
 %%DATADIR%%/maps/wolfsburg/volcano/vvmansion
 %%DATADIR%%/maps/wolfsburg/ware1
+%%DATADIR%%/maps/wolfsburg/wolfsburg.quests
 %%DATADIR%%/maps/world/world_100_100
 %%DATADIR%%/maps/world/world_100_101
 %%DATADIR%%/maps/world/world_100_102
@@ -3689,6 +4082,7 @@ lib/crossfire/random_map
 %%DATADIR%%/maps/world/world_129_127
 %%DATADIR%%/maps/world/world_129_128
 %%DATADIR%%/maps/world/world_129_129
+%%DATADIR%%/maps/world.quests
 %%DATADIR%%/materials
 %%DATADIR%%/messages
 %%DATADIR%%/races
@@ -3724,6 +4118,8 @@ lib/crossfire/random_map
 %%DATADIR%%/wizhelp/plugout
 %%DATADIR%%/wizhelp/possess
 %%DATADIR%%/wizhelp/printlos
+%%DATADIR%%/wizhelp/purge_quest_state
+%%DATADIR%%/wizhelp/purge_quests
 %%DATADIR%%/wizhelp/remove
 %%DATADIR%%/wizhelp/reset
 %%DATADIR%%/wizhelp/server_speed
@@ -3783,6 +4179,7 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/unlinked/Greyshield
 @dirrm %%DATADIR%%/maps/unlinked
 @dirrm %%DATADIR%%/maps/under_world
+@dirrm %%DATADIR%%/maps/test/quest_handling
 @dirrm %%DATADIR%%/maps/test/newmaps/madness_maze/scripts
 @dirrm %%DATADIR%%/maps/test/newmaps/madness_maze
 @dirrm %%DATADIR%%/maps/test/newmaps
@@ -3848,9 +4245,6 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/scorn/guilds/mailed_fist
 @dirrm %%DATADIR%%/maps/scorn/guilds
 @dirrm %%DATADIR%%/maps/scorn/dtabb
-@dirrm %%DATADIR%%/maps/scorn/crow/train
-@dirrm %%DATADIR%%/maps/scorn/crow
-@dirrm %%DATADIR%%/maps/scorn/cannery
 @dirrm %%DATADIR%%/maps/scorn/apartment
 @dirrm %%DATADIR%%/maps/scorn/anthony
 @dirrm %%DATADIR%%/maps/scorn
@@ -3896,6 +4290,7 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/quests
 @dirrm %%DATADIR%%/maps/python/tod
 @dirrm %%DATADIR%%/maps/python/start
+@dirrm %%DATADIR%%/maps/python/quests
 @dirrm %%DATADIR%%/maps/python/pshop
 @dirrm %%DATADIR%%/maps/python/monsters
 @dirrm %%DATADIR%%/maps/python/misc
@@ -3904,6 +4299,7 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/python/maps/scorn/towers
 @dirrm %%DATADIR%%/maps/python/maps/scorn
 @dirrm %%DATADIR%%/maps/python/maps/navar_city
+@dirrm %%DATADIR%%/maps/python/maps/darcap
 @dirrm %%DATADIR%%/maps/python/maps
 @dirrm %%DATADIR%%/maps/python/items
 @dirrm %%DATADIR%%/maps/python/guilds
@@ -3913,8 +4309,12 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/python/events/login
 @dirrm %%DATADIR%%/maps/python/events/kick
 @dirrm %%DATADIR%%/maps/python/events/init
+@dirrm %%DATADIR%%/maps/python/events/clock
 @dirrm %%DATADIR%%/maps/python/events/born
 @dirrm %%DATADIR%%/maps/python/events
+@dirrm %%DATADIR%%/maps/python/dialog/pre
+@dirrm %%DATADIR%%/maps/python/dialog/post
+@dirrm %%DATADIR%%/maps/python/dialog
 @dirrm %%DATADIR%%/maps/python/commands
 @dirrm %%DATADIR%%/maps/python/casino
 @dirrm %%DATADIR%%/maps/python/IPO
@@ -4008,21 +4408,21 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/lake_country/Sunset_Lake
 @dirrm %%DATADIR%%/maps/lake_country/RETower
 @dirrm %%DATADIR%%/maps/lake_country/Mwizard
+@dirrm %%DATADIR%%/maps/lake_country/Butakis/mockers
 @dirrm %%DATADIR%%/maps/lake_country/Butakis/houses
 @dirrm %%DATADIR%%/maps/lake_country/Butakis
 @dirrm %%DATADIR%%/maps/lake_country
 @dirrm %%DATADIR%%/maps/inn_and_outpost
+@dirrm %%DATADIR%%/maps/euthville/green_goblin
 @dirrm %%DATADIR%%/maps/euthville
 @dirrm %%DATADIR%%/maps/editor/walls
 @dirrm %%DATADIR%%/maps/editor/scripts
 @dirrm %%DATADIR%%/maps/editor/pickmaps
 @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
@@ -4073,6 +4473,7 @@ var/crossfire/temp.maps
 @dirrm %%DATADIR%%/maps/brest/pshops/pshop10
 @dirrm %%DATADIR%%/maps/brest/pshops/pshop1
 @dirrm %%DATADIR%%/maps/brest/pshops
+@dirrm %%DATADIR%%/maps/brest/privateshops
 @dirrm %%DATADIR%%/maps/brest/brittany
 @dirrm %%DATADIR%%/maps/brest/black_shield
 @dirrm %%DATADIR%%/maps/brest/asyvan