3 files changed, 443 insertions, 387 deletions

diff --git a/games/scourge/Makefile b/games/scourge/Makefile
index c207ecc041f7..dd801db65e60 100644
--- a/games/scourge/Makefile
+++ b/games/scourge/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scourge
-PORTVERSION=	0.11
+PORTVERSION=	0.13
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scourge
@@ -22,24 +22,24 @@ USE_SDL=	sdl mixer net
 USE_GMAKE=	yes
 USE_GCC=	3.3+
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_LIBS}
 LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-WRKSRC=		${WRKDIR}/${PORTNAME}
 
 CONFIGURE_ARGS=	--with-data-dir=${DATADIR}
 
-OPTIONS=	DEBUG	"Produce an executable with debugging symbols"	off \
+OPTIONS=	DEBUG	"Produce an executable with debugging symbols"	off
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-post-install:
-.if !defined(NOPORTDOCS)
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin/
 	@${MKDIR} ${DATADIR}
-	@${CP} -R ${WRKSRC}/data/* ${DATADIR}
-	@${FIND} ${DATADIR}/* -type f -print0 | \
-		${XARGS} -0 ${CHMOD} ${SHAREMODE}
-.endif
+	@cd ${WRKSRC}/data && \
+		${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \
+			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
+
 .include <bsd.port.mk>
diff --git a/games/scourge/distinfo b/games/scourge/distinfo
index f91e643655b9..f80e436e24f4 100644
--- a/games/scourge/distinfo
+++ b/games/scourge/distinfo
@@ -1,3 +1,3 @@
-MD5 (scourge-0.11.tar.gz) = d214ceeceb3ed8bdf72360dccc0a870f
-SHA256 (scourge-0.11.tar.gz) = 05dacaaaf253e6286304589f47ec858610d62371141b2bfedd894b5887d2ccc4
-SIZE (scourge-0.11.tar.gz) = 37358953
+MD5 (scourge-0.13.tar.gz) = 6df6b493186f22eb6f315e8893c355b7
+SHA256 (scourge-0.13.tar.gz) = b0d69b2d606712d00b2c34f7920beff73123b6635937230e0e10697d79edab92
+SIZE (scourge-0.13.tar.gz) = 46504845
diff --git a/games/scourge/pkg-plist b/games/scourge/pkg-plist
index 7083052a6624..b2975c5185a4 100644
--- a/games/scourge/pkg-plist
+++ b/games/scourge/pkg-plist
@@ -1,120 +1,200 @@
 bin/scourge
-%%DATADIR%%/sound/sword/s1.wav
-%%DATADIR%%/sound/sword/s2.wav
-%%DATADIR%%/sound/weapon-swish/bows/swb2.wav
-%%DATADIR%%/sound/weapon-swish/bows/swb3.wav
-%%DATADIR%%/sound/weapon-swish/handheld/sw1.wav
-%%DATADIR%%/sound/weapon-swish/handheld/sw2.wav
-%%DATADIR%%/sound/weapon-swish/handheld/sw3.wav
-%%DATADIR%%/sound/ui/press.wav
-%%DATADIR%%/sound/ui/roll.wav
-%%DATADIR%%/sound/potion/pd1.wav
-%%DATADIR%%/sound/imp/attack.wav
-%%DATADIR%%/sound/imp/attack2.wav
-%%DATADIR%%/sound/imp/hit1.wav
-%%DATADIR%%/sound/imp/hit2.wav
-%%DATADIR%%/sound/equip/buttons.wav
-%%DATADIR%%/sound/equip/cant_equip.wav
-%%DATADIR%%/sound/equip/equip1.wav
-%%DATADIR%%/sound/magic/blinded.wav
-%%DATADIR%%/sound/magic/healing.wav
-%%DATADIR%%/sound/magic/poison.wav
-%%DATADIR%%/sound/magic/teleport.wav
-%%DATADIR%%/sound/knight/select3.wav
-%%DATADIR%%/sound/knight/command2.wav
-%%DATADIR%%/sound/knight/command3.wav
-%%DATADIR%%/sound/knight/command4.wav
-%%DATADIR%%/sound/knight/hit1.wav
-%%DATADIR%%/sound/knight/hit2.wav
-%%DATADIR%%/sound/knight/select.wav
-%%DATADIR%%/sound/knight/select2.wav
-%%DATADIR%%/sound/knight/command.wav
-%%DATADIR%%/sound/menu.ogg
-%%DATADIR%%/sound/license.txt
-%%DATADIR%%/sound/dungeon.ogg
-%%DATADIR%%/maps/hq1.map
+%%DATADIR%%/COPYRIGHT.TXT
+%%DATADIR%%/Cas_antn.ttf
+%%DATADIR%%/Vera.ttf
+%%DATADIR%%/VeraMono.ttf
+%%DATADIR%%/area.bmp
+%%DATADIR%%/attack.bmp
+%%DATADIR%%/bar.bmp
+%%DATADIR%%/bookshelf.bmp
+%%DATADIR%%/border.bmp
+%%DATADIR%%/border2.bmp
+%%DATADIR%%/brick.bmp
+%%DATADIR%%/brick02.jpg
+%%DATADIR%%/brickfloor.bmp
+%%DATADIR%%/brickfloorv1.bmp
+%%DATADIR%%/brickv1.bmp
+%%DATADIR%%/button.bmp
+%%DATADIR%%/buttonsel.bmp
+%%DATADIR%%/candle.bmp
+%%DATADIR%%/cave/default/lava.bmp
+%%DATADIR%%/cave/default/lava2.bmp
+%%DATADIR%%/cave/default/lava3.bmp
+%%DATADIR%%/cave/default/lava4.bmp
+%%DATADIR%%/cave/default/nie039.bmp
+%%DATADIR%%/cave/default/nie041.bmp
+%%DATADIR%%/cave/default/nie051.bmp
+%%DATADIR%%/cave/default/nie060.bmp
+%%DATADIR%%/cave/default/sue094.bmp
+%%DATADIR%%/cave/default/sup007.bmp
+%%DATADIR%%/cave/default/sup016.bmp
+%%DATADIR%%/cave/default/sup044.bmp
+%%DATADIR%%/cave/default/sup063.bmp
+%%DATADIR%%/cave/default/sup074.bmp
+%%DATADIR%%/cave/default/sup075.bmp
+%%DATADIR%%/cave/default/sup076.bmp
+%%DATADIR%%/cave/default/sup082.bmp
+%%DATADIR%%/cave/default/sup106.bmp
+%%DATADIR%%/cave/default/water.bmp
+%%DATADIR%%/cave/default/water2.bmp
+%%DATADIR%%/cave/stencil-all.bmp
+%%DATADIR%%/cave/stencil-side.bmp
+%%DATADIR%%/cave/stencil-sides.bmp
+%%DATADIR%%/cave/stencil-turn.bmp
+%%DATADIR%%/cave/stencil-u.bmp
+%%DATADIR%%/cloud.bmp
+%%DATADIR%%/copper.bmp
+%%DATADIR%%/corner.bmp
+%%DATADIR%%/crosshair.bmp
+%%DATADIR%%/cursor.bmp
+%%DATADIR%%/chain.bmp
+%%DATADIR%%/chestfront.bmp
+%%DATADIR%%/chestside.bmp
+%%DATADIR%%/chesttop.bmp
+%%DATADIR%%/darkui.bmp
+%%DATADIR%%/darkuibutton.bmp
+%%DATADIR%%/darkuieast.bmp
+%%DATADIR%%/darkuieastsel.bmp
+%%DATADIR%%/darkuinorth.bmp
+%%DATADIR%%/darkuinorthsel.bmp
+%%DATADIR%%/darkuisel.bmp
+%%DATADIR%%/darkuisouth.bmp
+%%DATADIR%%/darkuisouthsel.bmp
+%%DATADIR%%/darkuitop.bmp
+%%DATADIR%%/darkuiwest.bmp
+%%DATADIR%%/darkuiwestsel.bmp
+%%DATADIR%%/door2NS.bmp
+%%DATADIR%%/doorEW.bmp
+%%DATADIR%%/doorNS.bmp
+%%DATADIR%%/dragon.bmp
+%%DATADIR%%/flame.bmp
+%%DATADIR%%/floor.bmp
+%%DATADIR%%/floor2.bmp
+%%DATADIR%%/floor2v1.bmp
+%%DATADIR%%/floor2v2.bmp
+%%DATADIR%%/floor3.bmp
+%%DATADIR%%/floor4.bmp
+%%DATADIR%%/floor4v1.bmp
+%%DATADIR%%/floor5.bmp
+%%DATADIR%%/floor5.psd
+%%DATADIR%%/floor5v1.bmp
+%%DATADIR%%/floor6.bmp
+%%DATADIR%%/floor6v1.bmp
+%%DATADIR%%/floor7.bmp
+%%DATADIR%%/floor7v1.bmp
+%%DATADIR%%/floorv1.bmp
+%%DATADIR%%/fonts/curlfont.txf
+%%DATADIR%%/fonts/default.txf
+%%DATADIR%%/fonts/haeberli.txf
+%%DATADIR%%/fonts/rockfont.txf
+%%DATADIR%%/fonts/sorority.txf
+%%DATADIR%%/forbidden.bmp
+%%DATADIR%%/formation1.bmp
+%%DATADIR%%/formation2.bmp
+%%DATADIR%%/formation3.bmp
+%%DATADIR%%/formation4.bmp
+%%DATADIR%%/formation5.bmp
+%%DATADIR%%/formation6.bmp
+%%DATADIR%%/front.bmp
+%%DATADIR%%/fronttop.bmp
+%%DATADIR%%/frontv1.bmp
+%%DATADIR%%/frontv2.bmp
+%%DATADIR%%/gargoyle.bmp
+%%DATADIR%%/gui-wood.bmp
+%%DATADIR%%/gui.bmp
+%%DATADIR%%/gui2.bmp
+%%DATADIR%%/gui_small.bmp
+%%DATADIR%%/highlight.bmp
+%%DATADIR%%/icons/i0.bmp
+%%DATADIR%%/icons/i1.bmp
+%%DATADIR%%/icons/i10.bmp
+%%DATADIR%%/icons/i11.bmp
+%%DATADIR%%/icons/i12.bmp
+%%DATADIR%%/icons/i13.bmp
+%%DATADIR%%/icons/i14.bmp
+%%DATADIR%%/icons/i2.bmp
+%%DATADIR%%/icons/i3.bmp
+%%DATADIR%%/icons/i4.bmp
+%%DATADIR%%/icons/i5.bmp
+%%DATADIR%%/icons/i6.bmp
+%%DATADIR%%/icons/i7.bmp
+%%DATADIR%%/icons/i8.bmp
+%%DATADIR%%/icons/i9.bmp
+%%DATADIR%%/iron.bmp
+%%DATADIR%%/light.bmp
+%%DATADIR%%/litewood.bmp
+%%DATADIR%%/logo.bmp
+%%DATADIR%%/logo2.bmp
+%%DATADIR%%/map.bmp
+%%DATADIR%%/mapgrid/map0-0.bmp
+%%DATADIR%%/mapgrid/map0-1.bmp
+%%DATADIR%%/mapgrid/map0-2.bmp
+%%DATADIR%%/mapgrid/map0-3.bmp
+%%DATADIR%%/mapgrid/map0-4.bmp
+%%DATADIR%%/mapgrid/map1-0.bmp
+%%DATADIR%%/mapgrid/map1-1.bmp
+%%DATADIR%%/mapgrid/map1-2.bmp
+%%DATADIR%%/mapgrid/map1-3.bmp
+%%DATADIR%%/mapgrid/map1-4.bmp
+%%DATADIR%%/mapgrid/map2-0.bmp
+%%DATADIR%%/mapgrid/map2-1.bmp
+%%DATADIR%%/mapgrid/map2-2.bmp
+%%DATADIR%%/mapgrid/map2-3.bmp
+%%DATADIR%%/mapgrid/map2-4.bmp
+%%DATADIR%%/mapgrid/map3-0.bmp
+%%DATADIR%%/mapgrid/map3-1.bmp
+%%DATADIR%%/mapgrid/map3-2.bmp
+%%DATADIR%%/mapgrid/map3-3.bmp
+%%DATADIR%%/mapgrid/map3-4.bmp
+%%DATADIR%%/mapgrid/map4-0.bmp
+%%DATADIR%%/mapgrid/map4-1.bmp
+%%DATADIR%%/mapgrid/map4-2.bmp
+%%DATADIR%%/mapgrid/map4-3.bmp
+%%DATADIR%%/mapgrid/map4-4.bmp
+%%DATADIR%%/mapgrid/map5-0.bmp
+%%DATADIR%%/mapgrid/map5-1.bmp
+%%DATADIR%%/mapgrid/map5-2.bmp
+%%DATADIR%%/mapgrid/map5-3.bmp
+%%DATADIR%%/mapgrid/map5-4.bmp
 %%DATADIR%%/maps/hq.map
+%%DATADIR%%/maps/hq.nut
 %%DATADIR%%/maps/hq.txt
-%%DATADIR%%/maps/readme.txt
+%%DATADIR%%/maps/hq1.map
 %%DATADIR%%/maps/hq1.txt
+%%DATADIR%%/maps/library.map
+%%DATADIR%%/maps/library.txt
+%%DATADIR%%/maps/library1.map
+%%DATADIR%%/maps/library1.txt
+%%DATADIR%%/maps/library2.map
+%%DATADIR%%/maps/library3.map
+%%DATADIR%%/maps/library3.txt
+%%DATADIR%%/maps/readme.txt
 %%DATADIR%%/maps/thuzgol.map
 %%DATADIR%%/maps/thuzgol.txt
-%%DATADIR%%/models/link/zora.bmp
-%%DATADIR%%/models/link/Death1.wav
-%%DATADIR%%/models/link/Death2.wav
-%%DATADIR%%/models/link/Death3.wav
-%%DATADIR%%/models/link/Death4.wav
-%%DATADIR%%/models/link/Drown1.wav
-%%DATADIR%%/models/link/Fall1.wav
-%%DATADIR%%/models/link/Fall2.wav
-%%DATADIR%%/models/link/Gurp1.wav
-%%DATADIR%%/models/link/Gurp2.wav
-%%DATADIR%%/models/link/Jump1.wav
-%%DATADIR%%/models/link/Pain100_1.wav
-%%DATADIR%%/models/link/Pain100_2.wav
-%%DATADIR%%/models/link/Pain25_1.wav
-%%DATADIR%%/models/link/Pain25_2.wav
-%%DATADIR%%/models/link/Pain50_1.wav
-%%DATADIR%%/models/link/Pain50_2.wav
-%%DATADIR%%/models/link/Pain75_1.wav
-%%DATADIR%%/models/link/Pain75_2.wav
-%%DATADIR%%/models/link/ctf_b.bmp
-%%DATADIR%%/models/link/ctf_g.bmp
-%%DATADIR%%/models/link/ctf_r.bmp
-%%DATADIR%%/models/link/darklink.bmp
-%%DATADIR%%/models/link/goron.bmp
-%%DATADIR%%/models/link/link.bmp
-%%DATADIR%%/models/link/main.htm
-%%DATADIR%%/models/link/readme.htm
-%%DATADIR%%/models/link/soft_darklink.bmp
-%%DATADIR%%/models/link/soft_goron.bmp
-%%DATADIR%%/models/link/soft_link.bmp
-%%DATADIR%%/models/link/soft_zora.bmp
-%%DATADIR%%/models/link/tris.md2
-%%DATADIR%%/models/link/Bump1.wav
-%%DATADIR%%/models/frog/tris.md2
-%%DATADIR%%/models/frog/MultiColour.bmp
-%%DATADIR%%/models/frog/PoisonFrog.bmp
-%%DATADIR%%/models/frog/Read_No_More.txt
-%%DATADIR%%/models/frog/Sound Readme.txt
-%%DATADIR%%/models/frog/TreeFrog.bmp
-%%DATADIR%%/models/frog/gurp1.wav
-%%DATADIR%%/models/frog/gurp2.wav
-%%DATADIR%%/models/frog/jump1.wav
-%%DATADIR%%/models/frog/land1.wav
-%%DATADIR%%/models/frog/pain100_1.wav
-%%DATADIR%%/models/frog/pain100_2.wav
-%%DATADIR%%/models/frog/pain25_1.wav
-%%DATADIR%%/models/frog/pain25_2.wav
-%%DATADIR%%/models/frog/pain50_1.wav
-%%DATADIR%%/models/frog/pain50_2.wav
-%%DATADIR%%/models/frog/pain75_1.wav
-%%DATADIR%%/models/frog/pain75_2.wav
-%%DATADIR%%/models/frog/BigRed.bmp
-%%DATADIR%%/models/npc/alita/alita2.bmp
-%%DATADIR%%/models/npc/alita/Alita_addon.txt
-%%DATADIR%%/models/npc/alita/alita.bmp
-%%DATADIR%%/models/npc/alita/Alita.txt
-%%DATADIR%%/models/npc/alita/alita3.bmp
-%%DATADIR%%/models/npc/alita/alita4.bmp
-%%DATADIR%%/models/npc/alita/tris.md2
-%%DATADIR%%/models/npc/jd/devred.bmp
-%%DATADIR%%/models/npc/jd/LOOKATME.txt
-%%DATADIR%%/models/npc/jd/devil.bmp
-%%DATADIR%%/models/npc/jd/Angel.bmp
-%%DATADIR%%/models/npc/jd/picolo.bmp
-%%DATADIR%%/models/npc/jd/picolo.txt
-%%DATADIR%%/models/npc/jd/tris.md2
-%%DATADIR%%/models/npc/sfod8/Rieger.bmp
-%%DATADIR%%/models/npc/sfod8/SFOD8.txt
-%%DATADIR%%/models/npc/sfod8/Tengu.bmp
-%%DATADIR%%/models/npc/sfod8/abarlith.bmp
-%%DATADIR%%/models/npc/sfod8/skin01cs.bmp
-%%DATADIR%%/models/npc/sfod8/tris.md2
+%%DATADIR%%/maps/tower.map
+%%DATADIR%%/maps/tower.txt
+%%DATADIR%%/maps/tower1.map
+%%DATADIR%%/maps/tower1.txt
+%%DATADIR%%/marble.bmp
+%%DATADIR%%/metal.bmp
+%%DATADIR%%/minimap.bmp
+%%DATADIR%%/minimask.bmp
+%%DATADIR%%/models/Bug/bug.bmp
+%%DATADIR%%/models/Bug/ctf_b.bmp
+%%DATADIR%%/models/Bug/ctf_r.bmp
+%%DATADIR%%/models/Bug/gurp1.wav
+%%DATADIR%%/models/Bug/gurp2.wav
+%%DATADIR%%/models/Bug/jump1.wav
+%%DATADIR%%/models/Bug/pain100_1.wav
+%%DATADIR%%/models/Bug/pain100_2.wav
+%%DATADIR%%/models/Bug/pain25_1.wav
+%%DATADIR%%/models/Bug/pain25_2.wav
+%%DATADIR%%/models/Bug/readme.txt
+%%DATADIR%%/models/Bug/tris.md2
 %%DATADIR%%/models/character/blade/blade.bmp
 %%DATADIR%%/models/character/blade/blade.txt
 %%DATADIR%%/models/character/blade/tris.md2
-%%DATADIR%%/models/character/darkness/tris.md2
+%%DATADIR%%/models/character/darkness/Darkness.bmp
 %%DATADIR%%/models/character/darkness/Lisez moi.txt
 %%DATADIR%%/models/character/darkness/Morf.bmp
 %%DATADIR%%/models/character/darkness/Read me.txt
@@ -122,7 +202,7 @@ bin/scourge
 %%DATADIR%%/models/character/darkness/ctf_g.bmp
 %%DATADIR%%/models/character/darkness/ctf_r.bmp
 %%DATADIR%%/models/character/darkness/estacado.bmp
-%%DATADIR%%/models/character/darkness/Darkness.bmp
+%%DATADIR%%/models/character/darkness/tris.md2
 %%DATADIR%%/models/character/pknight/ctf_b.bmp
 %%DATADIR%%/models/character/pknight/ctf_r.bmp
 %%DATADIR%%/models/character/pknight/evil.bmp
@@ -145,7 +225,7 @@ bin/scourge
 %%DATADIR%%/models/character/yohko/ctf_b.bmp
 %%DATADIR%%/models/character/yohko/ctf_r.bmp
 %%DATADIR%%/models/character/yohko/tris.md2
-%%DATADIR%%/models/demoness/tris.md2
+%%DATADIR%%/models/demoness/demoness.txt
 %%DATADIR%%/models/demoness/ghost.bmp
 %%DATADIR%%/models/demoness/gurp1.wav
 %%DATADIR%%/models/demoness/gurp2.wav
@@ -161,9 +241,28 @@ bin/scourge
 %%DATADIR%%/models/demoness/pain75_1.wav
 %%DATADIR%%/models/demoness/pain75_2.wav
 %%DATADIR%%/models/demoness/succubus.bmp
-%%DATADIR%%/models/demoness/demoness.txt
-%%DATADIR%%/models/hellogirl/tris.md2
+%%DATADIR%%/models/demoness/tris.md2
+%%DATADIR%%/models/frog/BigRed.bmp
+%%DATADIR%%/models/frog/MultiColour.bmp
+%%DATADIR%%/models/frog/PoisonFrog.bmp
+%%DATADIR%%/models/frog/Read_No_More.txt
+%%DATADIR%%/models/frog/Sound Readme.txt
+%%DATADIR%%/models/frog/TreeFrog.bmp
+%%DATADIR%%/models/frog/gurp1.wav
+%%DATADIR%%/models/frog/gurp2.wav
+%%DATADIR%%/models/frog/jump1.wav
+%%DATADIR%%/models/frog/land1.wav
+%%DATADIR%%/models/frog/pain100_1.wav
+%%DATADIR%%/models/frog/pain100_2.wav
+%%DATADIR%%/models/frog/pain25_1.wav
+%%DATADIR%%/models/frog/pain25_2.wav
+%%DATADIR%%/models/frog/pain50_1.wav
+%%DATADIR%%/models/frog/pain50_2.wav
+%%DATADIR%%/models/frog/pain75_1.wav
+%%DATADIR%%/models/frog/pain75_2.wav
+%%DATADIR%%/models/frog/tris.md2
 %%DATADIR%%/models/hellogirl/002.bmp
+%%DATADIR%%/models/hellogirl/BASE1.bmp
 %%DATADIR%%/models/hellogirl/CTF_B.bmp
 %%DATADIR%%/models/hellogirl/CTF_R.bmp
 %%DATADIR%%/models/hellogirl/HELLO.bmp
@@ -188,33 +287,129 @@ bin/scourge
 %%DATADIR%%/models/hellogirl/pain50_2.wav
 %%DATADIR%%/models/hellogirl/pain75_1.wav
 %%DATADIR%%/models/hellogirl/pain75_2.wav
-%%DATADIR%%/models/hellogirl/BASE1.bmp
+%%DATADIR%%/models/hellogirl/tris.md2
 %%DATADIR%%/models/hueteotl/Ctf_b.bmp
 %%DATADIR%%/models/hueteotl/Ctf_r.bmp
 %%DATADIR%%/models/hueteotl/Hueteotl.bmp
 %%DATADIR%%/models/hueteotl/Hueteotl.txt
 %%DATADIR%%/models/hueteotl/tris.md2
-%%DATADIR%%/models/Bug/tris.md2
-%%DATADIR%%/models/Bug/bug.bmp
-%%DATADIR%%/models/Bug/ctf_r.bmp
-%%DATADIR%%/models/Bug/gurp1.wav
-%%DATADIR%%/models/Bug/gurp2.wav
-%%DATADIR%%/models/Bug/jump1.wav
-%%DATADIR%%/models/Bug/pain100_1.wav
-%%DATADIR%%/models/Bug/pain100_2.wav
-%%DATADIR%%/models/Bug/pain25_1.wav
-%%DATADIR%%/models/Bug/pain25_2.wav
-%%DATADIR%%/models/Bug/readme.txt
-%%DATADIR%%/models/Bug/ctf_b.bmp
-%%DATADIR%%/models/nightcrawler/tris.md2
+%%DATADIR%%/models/link/Bump1.wav
+%%DATADIR%%/models/link/Death1.wav
+%%DATADIR%%/models/link/Death2.wav
+%%DATADIR%%/models/link/Death3.wav
+%%DATADIR%%/models/link/Death4.wav
+%%DATADIR%%/models/link/Drown1.wav
+%%DATADIR%%/models/link/Fall1.wav
+%%DATADIR%%/models/link/Fall2.wav
+%%DATADIR%%/models/link/Gurp1.wav
+%%DATADIR%%/models/link/Gurp2.wav
+%%DATADIR%%/models/link/Jump1.wav
+%%DATADIR%%/models/link/Pain100_1.wav
+%%DATADIR%%/models/link/Pain100_2.wav
+%%DATADIR%%/models/link/Pain25_1.wav
+%%DATADIR%%/models/link/Pain25_2.wav
+%%DATADIR%%/models/link/Pain50_1.wav
+%%DATADIR%%/models/link/Pain50_2.wav
+%%DATADIR%%/models/link/Pain75_1.wav
+%%DATADIR%%/models/link/Pain75_2.wav
+%%DATADIR%%/models/link/ctf_b.bmp
+%%DATADIR%%/models/link/ctf_g.bmp
+%%DATADIR%%/models/link/ctf_r.bmp
+%%DATADIR%%/models/link/darklink.bmp
+%%DATADIR%%/models/link/goron.bmp
+%%DATADIR%%/models/link/link.bmp
+%%DATADIR%%/models/link/main.htm
+%%DATADIR%%/models/link/readme.htm
+%%DATADIR%%/models/link/soft_darklink.bmp
+%%DATADIR%%/models/link/soft_goron.bmp
+%%DATADIR%%/models/link/soft_link.bmp
+%%DATADIR%%/models/link/soft_zora.bmp
+%%DATADIR%%/models/link/tris.md2
+%%DATADIR%%/models/link/zora.bmp
+%%DATADIR%%/models/m1.bmp
+%%DATADIR%%/models/m1.md2
+%%DATADIR%%/models/m10.bmp
+%%DATADIR%%/models/m10.md2
+%%DATADIR%%/models/m101.bmp
+%%DATADIR%%/models/m102.bmp
+%%DATADIR%%/models/m11.bmp
+%%DATADIR%%/models/m11.md2
+%%DATADIR%%/models/m111.bmp
+%%DATADIR%%/models/m112.bmp
+%%DATADIR%%/models/m113.bmp
+%%DATADIR%%/models/m12.bmp
+%%DATADIR%%/models/m12.md2
+%%DATADIR%%/models/m121.bmp
+%%DATADIR%%/models/m122.bmp
+%%DATADIR%%/models/m123.bmp
+%%DATADIR%%/models/m13.bmp
+%%DATADIR%%/models/m13.md2
+%%DATADIR%%/models/m131.bmp
+%%DATADIR%%/models/m132.bmp
+%%DATADIR%%/models/m133.bmp
+%%DATADIR%%/models/m134.bmp
+%%DATADIR%%/models/m2.bmp
+%%DATADIR%%/models/m2.md2
+%%DATADIR%%/models/m3.bmp
+%%DATADIR%%/models/m3.md2
+%%DATADIR%%/models/m4.bmp
+%%DATADIR%%/models/m4.md2
+%%DATADIR%%/models/m5.bmp
+%%DATADIR%%/models/m5.md2
+%%DATADIR%%/models/m51.bmp
+%%DATADIR%%/models/m511.bmp
+%%DATADIR%%/models/m512.bmp
+%%DATADIR%%/models/m513.bmp
+%%DATADIR%%/models/m52.bmp
+%%DATADIR%%/models/m53.bmp
+%%DATADIR%%/models/m54.bmp
+%%DATADIR%%/models/m55.bmp
+%%DATADIR%%/models/m56.bmp
+%%DATADIR%%/models/m57.bmp
+%%DATADIR%%/models/m58.bmp
+%%DATADIR%%/models/m59.bmp
+%%DATADIR%%/models/m6.bmp
+%%DATADIR%%/models/m6.md2
+%%DATADIR%%/models/m61.bmp
+%%DATADIR%%/models/m62.bmp
+%%DATADIR%%/models/m7.bmp
+%%DATADIR%%/models/m7.md2
+%%DATADIR%%/models/m71.bmp
+%%DATADIR%%/models/m8.bmp
+%%DATADIR%%/models/m8.md2
+%%DATADIR%%/models/m9.bmp
+%%DATADIR%%/models/m9.md2
+%%DATADIR%%/models/m91.bmp
+%%DATADIR%%/models/m92.bmp
+%%DATADIR%%/models/nightcrawler/Ctf_b.bmp
 %%DATADIR%%/models/nightcrawler/Ctf_g.bmp
 %%DATADIR%%/models/nightcrawler/Ctf_r.bmp
 %%DATADIR%%/models/nightcrawler/Lisez moi.txt
 %%DATADIR%%/models/nightcrawler/NightC.jpg
 %%DATADIR%%/models/nightcrawler/NightCrawler.bmp
 %%DATADIR%%/models/nightcrawler/Read me.txt
-%%DATADIR%%/models/nightcrawler/Ctf_b.bmp
-%%DATADIR%%/models/ogro/tris.md2
+%%DATADIR%%/models/nightcrawler/tris.md2
+%%DATADIR%%/models/npc/alita/Alita.txt
+%%DATADIR%%/models/npc/alita/Alita_addon.txt
+%%DATADIR%%/models/npc/alita/alita.bmp
+%%DATADIR%%/models/npc/alita/alita2.bmp
+%%DATADIR%%/models/npc/alita/alita3.bmp
+%%DATADIR%%/models/npc/alita/alita4.bmp
+%%DATADIR%%/models/npc/alita/tris.md2
+%%DATADIR%%/models/npc/jd/Angel.bmp
+%%DATADIR%%/models/npc/jd/LOOKATME.txt
+%%DATADIR%%/models/npc/jd/devil.bmp
+%%DATADIR%%/models/npc/jd/devred.bmp
+%%DATADIR%%/models/npc/jd/picolo.bmp
+%%DATADIR%%/models/npc/jd/picolo.txt
+%%DATADIR%%/models/npc/jd/tris.md2
+%%DATADIR%%/models/npc/sfod8/Rieger.bmp
+%%DATADIR%%/models/npc/sfod8/SFOD8.txt
+%%DATADIR%%/models/npc/sfod8/Tengu.bmp
+%%DATADIR%%/models/npc/sfod8/abarlith.bmp
+%%DATADIR%%/models/npc/sfod8/skin01cs.bmp
+%%DATADIR%%/models/npc/sfod8/tris.md2
+%%DATADIR%%/models/ogro/Ogro.txt
 %%DATADIR%%/models/ogro/arboshak.bmp
 %%DATADIR%%/models/ogro/bump1.wav
 %%DATADIR%%/models/ogro/cloth.bmp
@@ -250,8 +445,8 @@ bin/scourge
 %%DATADIR%%/models/ogro/pain75_2.wav
 %%DATADIR%%/models/ogro/sharokh.bmp
 %%DATADIR%%/models/ogro/slaanesh.bmp
-%%DATADIR%%/models/ogro/Ogro.txt
-%%DATADIR%%/models/orc/twilight.bmp
+%%DATADIR%%/models/ogro/tris.md2
+%%DATADIR%%/models/orc/Blackrock.bmp
 %%DATADIR%%/models/orc/Dragonmaw.bmp
 %%DATADIR%%/models/orc/Stormreaver.bmp
 %%DATADIR%%/models/orc/aaa.bmp
@@ -281,29 +476,29 @@ bin/scourge
 %%DATADIR%%/models/orc/pain75_1.wav
 %%DATADIR%%/models/orc/pain75_2.wav
 %%DATADIR%%/models/orc/tris.md2
-%%DATADIR%%/models/orc/Blackrock.bmp
+%%DATADIR%%/models/orc/twilight.bmp
 %%DATADIR%%/models/purgator/ctf_b.bmp
 %%DATADIR%%/models/purgator/ctf_r.bmp
 %%DATADIR%%/models/purgator/purgatori.bmp
 %%DATADIR%%/models/purgator/purgatori.txt
 %%DATADIR%%/models/purgator/tris.md2
-%%DATADIR%%/models/twigletman/gg.bmp
+%%DATADIR%%/models/twigletman/ctf_blue.bmp
 %%DATADIR%%/models/twigletman/ctf_red.bmp
 %%DATADIR%%/models/twigletman/eXodus.bmp
-%%DATADIR%%/models/twigletman/ctf_blue.bmp
+%%DATADIR%%/models/twigletman/gg.bmp
 %%DATADIR%%/models/twigletman/readme.txt
 %%DATADIR%%/models/twigletman/toxic.bmp
 %%DATADIR%%/models/twigletman/tris.md2
-%%DATADIR%%/models/yvonne/tris.md2
+%%DATADIR%%/models/yvonne/Yvonne.bmp
 %%DATADIR%%/models/yvonne/Yvonne.txt
 %%DATADIR%%/models/yvonne/cammy.bmp
-%%DATADIR%%/models/yvonne/challenge.bmp
-%%DATADIR%%/models/yvonne/chunli.bmp
 %%DATADIR%%/models/yvonne/commando.bmp
 %%DATADIR%%/models/yvonne/ctf_b.bmp
 %%DATADIR%%/models/yvonne/ctf_g.bmp
 %%DATADIR%%/models/yvonne/ctf_r.bmp
 %%DATADIR%%/models/yvonne/ctf_w.bmp
+%%DATADIR%%/models/yvonne/challenge.bmp
+%%DATADIR%%/models/yvonne/chunli.bmp
 %%DATADIR%%/models/yvonne/demon.bmp
 %%DATADIR%%/models/yvonne/jeans.bmp
 %%DATADIR%%/models/yvonne/lizard.bmp
@@ -311,63 +506,9 @@ bin/scourge
 %%DATADIR%%/models/yvonne/ominous.bmp
 %%DATADIR%%/models/yvonne/stealth.bmp
 %%DATADIR%%/models/yvonne/tech.bmp
-%%DATADIR%%/models/yvonne/Yvonne.bmp
-%%DATADIR%%/models/m122.bmp
-%%DATADIR%%/models/m123.bmp
-%%DATADIR%%/models/m13.bmp
-%%DATADIR%%/models/m13.md2
-%%DATADIR%%/models/m131.bmp
-%%DATADIR%%/models/m132.bmp
-%%DATADIR%%/models/m133.bmp
-%%DATADIR%%/models/m134.bmp
-%%DATADIR%%/models/m2.bmp
-%%DATADIR%%/models/m2.md2
-%%DATADIR%%/models/m3.bmp
-%%DATADIR%%/models/m3.md2
-%%DATADIR%%/models/m4.bmp
-%%DATADIR%%/models/m4.md2
-%%DATADIR%%/models/m5.bmp
-%%DATADIR%%/models/m5.md2
-%%DATADIR%%/models/m51.bmp
-%%DATADIR%%/models/m511.bmp
-%%DATADIR%%/models/m512.bmp
-%%DATADIR%%/models/m513.bmp
-%%DATADIR%%/models/m52.bmp
-%%DATADIR%%/models/m53.bmp
-%%DATADIR%%/models/m54.bmp
-%%DATADIR%%/models/m55.bmp
-%%DATADIR%%/models/m56.bmp
-%%DATADIR%%/models/m101.bmp
-%%DATADIR%%/models/m58.bmp
-%%DATADIR%%/models/m59.bmp
-%%DATADIR%%/models/m6.bmp
-%%DATADIR%%/models/m6.md2
-%%DATADIR%%/models/m61.bmp
-%%DATADIR%%/models/m62.bmp
-%%DATADIR%%/models/m7.bmp
-%%DATADIR%%/models/m7.md2
-%%DATADIR%%/models/m71.bmp
-%%DATADIR%%/models/m8.bmp
-%%DATADIR%%/models/m8.md2
-%%DATADIR%%/models/m9.bmp
-%%DATADIR%%/models/m9.md2
-%%DATADIR%%/models/m91.bmp
-%%DATADIR%%/models/m92.bmp
-%%DATADIR%%/models/m57.bmp
-%%DATADIR%%/models/m1.bmp
-%%DATADIR%%/models/m1.md2
-%%DATADIR%%/models/m10.bmp
-%%DATADIR%%/models/m10.md2
-%%DATADIR%%/models/m102.bmp
-%%DATADIR%%/models/m11.bmp
-%%DATADIR%%/models/m11.md2
-%%DATADIR%%/models/m111.bmp
-%%DATADIR%%/models/m112.bmp
-%%DATADIR%%/models/m113.bmp
-%%DATADIR%%/models/m12.bmp
-%%DATADIR%%/models/m12.md2
-%%DATADIR%%/models/m121.bmp
-%%DATADIR%%/objects/wand.3ds
+%%DATADIR%%/models/yvonne/tris.md2
+%%DATADIR%%/move.bmp
+%%DATADIR%%/objects/amulet.3ds
 %%DATADIR%%/objects/apple.3ds
 %%DATADIR%%/objects/armor.3ds
 %%DATADIR%%/objects/armorplate.3ds
@@ -382,27 +523,29 @@ bin/scourge
 %%DATADIR%%/objects/bow.3ds
 %%DATADIR%%/objects/brazier.3ds
 %%DATADIR%%/objects/bread.3ds
-%%DATADIR%%/objects/chair.3ds
 %%DATADIR%%/objects/column.3ds
 %%DATADIR%%/objects/commode.3ds
 %%DATADIR%%/objects/corpse.3ds
 %%DATADIR%%/objects/crate.3ds
+%%DATADIR%%/objects/chair.3ds
 %%DATADIR%%/objects/desk.3ds
 %%DATADIR%%/objects/egg.3ds
 %%DATADIR%%/objects/gate-down.3ds
 %%DATADIR%%/objects/gate-up.3ds
-%%DATADIR%%/objects/map.3ds
 %%DATADIR%%/objects/gate.3ds
 %%DATADIR%%/objects/helmet.3ds
 %%DATADIR%%/objects/mace.3ds
+%%DATADIR%%/objects/map.3ds
 %%DATADIR%%/objects/meat.3ds
 %%DATADIR%%/objects/mushroom.3ds
 %%DATADIR%%/objects/offswitch.3ds
 %%DATADIR%%/objects/onswitch.3ds
 %%DATADIR%%/objects/pedestal.3ds
 %%DATADIR%%/objects/plant.3ds
+%%DATADIR%%/objects/pool.3ds
 %%DATADIR%%/objects/potion.3ds
 %%DATADIR%%/objects/scroll.3ds
+%%DATADIR%%/objects/shield.3ds
 %%DATADIR%%/objects/staff.3ds
 %%DATADIR%%/objects/stairs.3ds
 %%DATADIR%%/objects/stove.3ds
@@ -413,59 +556,74 @@ bin/scourge
 %%DATADIR%%/objects/tchest.3ds
 %%DATADIR%%/objects/torch.3ds
 %%DATADIR%%/objects/vase.3ds
-%%DATADIR%%/objects/amulet.3ds
-%%DATADIR%%/portraits/w5.bmp
+%%DATADIR%%/objects/wand.3ds
+%%DATADIR%%/paperdoll.bmp
+%%DATADIR%%/portraits/death.bmp
 %%DATADIR%%/portraits/m1.bmp
 %%DATADIR%%/portraits/m2.bmp
 %%DATADIR%%/portraits/m3.bmp
 %%DATADIR%%/portraits/m4.bmp
 %%DATADIR%%/portraits/m5.bmp
 %%DATADIR%%/portraits/melathor.bmp
+%%DATADIR%%/portraits/myco.bmp
 %%DATADIR%%/portraits/orhithales.bmp
+%%DATADIR%%/portraits/sabien.bmp
 %%DATADIR%%/portraits/uzudil.bmp
 %%DATADIR%%/portraits/w1.bmp
 %%DATADIR%%/portraits/w2.bmp
 %%DATADIR%%/portraits/w3.bmp
 %%DATADIR%%/portraits/w4.bmp
-%%DATADIR%%/portraits/death.bmp
-%%DATADIR%%/mapgrid/map5-4.bmp
-%%DATADIR%%/mapgrid/map0-1.bmp
-%%DATADIR%%/mapgrid/map0-2.bmp
-%%DATADIR%%/mapgrid/map0-3.bmp
-%%DATADIR%%/mapgrid/map0-4.bmp
-%%DATADIR%%/mapgrid/map1-0.bmp
-%%DATADIR%%/mapgrid/map1-1.bmp
-%%DATADIR%%/mapgrid/map1-2.bmp
-%%DATADIR%%/mapgrid/map1-3.bmp
-%%DATADIR%%/mapgrid/map1-4.bmp
-%%DATADIR%%/mapgrid/map2-0.bmp
-%%DATADIR%%/mapgrid/map2-1.bmp
-%%DATADIR%%/mapgrid/map2-2.bmp
-%%DATADIR%%/mapgrid/map2-3.bmp
-%%DATADIR%%/mapgrid/map2-4.bmp
-%%DATADIR%%/mapgrid/map3-0.bmp
-%%DATADIR%%/mapgrid/map3-1.bmp
-%%DATADIR%%/mapgrid/map3-2.bmp
-%%DATADIR%%/mapgrid/map3-3.bmp
-%%DATADIR%%/mapgrid/map3-4.bmp
-%%DATADIR%%/mapgrid/map4-0.bmp
-%%DATADIR%%/mapgrid/map4-1.bmp
-%%DATADIR%%/mapgrid/map4-2.bmp
-%%DATADIR%%/mapgrid/map4-3.bmp
-%%DATADIR%%/mapgrid/map4-4.bmp
-%%DATADIR%%/mapgrid/map5-0.bmp
-%%DATADIR%%/mapgrid/map5-1.bmp
-%%DATADIR%%/mapgrid/map5-2.bmp
-%%DATADIR%%/mapgrid/map5-3.bmp
-%%DATADIR%%/mapgrid/map0-0.bmp
-%%DATADIR%%/themes/egypt1/solidgrate2a.bmp
+%%DATADIR%%/portraits/w5.bmp
+%%DATADIR%%/process.bmp
+%%DATADIR%%/ranged.bmp
+%%DATADIR%%/ring2.bmp
+%%DATADIR%%/ripple.bmp
+%%DATADIR%%/scourge.bmp
+%%DATADIR%%/sound/dungeon.ogg
+%%DATADIR%%/sound/dungeon1.ogg
+%%DATADIR%%/sound/equip/buttons.wav
+%%DATADIR%%/sound/equip/cant_equip.wav
+%%DATADIR%%/sound/equip/equip1.wav
+%%DATADIR%%/sound/imp/attack.wav
+%%DATADIR%%/sound/imp/attack2.wav
+%%DATADIR%%/sound/imp/hit1.wav
+%%DATADIR%%/sound/imp/hit2.wav
+%%DATADIR%%/sound/knight/command.wav
+%%DATADIR%%/sound/knight/command2.wav
+%%DATADIR%%/sound/knight/command3.wav
+%%DATADIR%%/sound/knight/command4.wav
+%%DATADIR%%/sound/knight/hit1.wav
+%%DATADIR%%/sound/knight/hit2.wav
+%%DATADIR%%/sound/knight/select.wav
+%%DATADIR%%/sound/knight/select2.wav
+%%DATADIR%%/sound/knight/select3.wav
+%%DATADIR%%/sound/license.txt
+%%DATADIR%%/sound/magic/blinded.wav
+%%DATADIR%%/sound/magic/healing.wav
+%%DATADIR%%/sound/magic/poison.wav
+%%DATADIR%%/sound/magic/teleport.wav
+%%DATADIR%%/sound/menu.ogg
+%%DATADIR%%/sound/menu1.ogg
+%%DATADIR%%/sound/potion/pd1.wav
+%%DATADIR%%/sound/sword/s1.wav
+%%DATADIR%%/sound/sword/s2.wav
+%%DATADIR%%/sound/ui/press.wav
+%%DATADIR%%/sound/ui/roll.wav
+%%DATADIR%%/sound/weapon-swish/bows/swb2.wav
+%%DATADIR%%/sound/weapon-swish/bows/swb3.wav
+%%DATADIR%%/sound/weapon-swish/handheld/sw1.wav
+%%DATADIR%%/sound/weapon-swish/handheld/sw2.wav
+%%DATADIR%%/sound/weapon-swish/handheld/sw3.wav
+%%DATADIR%%/spells.bmp
+%%DATADIR%%/talk.bmp
+%%DATADIR%%/themes/egypt1/block01b.bmp
 %%DATADIR%%/themes/egypt1/block08a.bmp
 %%DATADIR%%/themes/egypt1/block08c.bmp
 %%DATADIR%%/themes/egypt1/block09a.bmp
 %%DATADIR%%/themes/egypt1/egyptsoc_readme.txt
 %%DATADIR%%/themes/egypt1/marker1bb.bmp
 %%DATADIR%%/themes/egypt1/marker1bg.bmp
-%%DATADIR%%/themes/egypt1/block01b.bmp
+%%DATADIR%%/themes/egypt1/solidgrate2a.bmp
 %%DATADIR%%/themes/egypt3/egyptsoc_readme.txt
 %%DATADIR%%/themes/egypt3/lig_032-04w2.bmp
 %%DATADIR%%/themes/egypt3/lig_128-05w1.bmp
@@ -473,7 +631,7 @@ bin/scourge
 %%DATADIR%%/themes/egypt5/egyptsoc_readme.txt
 %%DATADIR%%/themes/egypt5/stone01b.bmp
 %%DATADIR%%/themes/egypt5/stone02b.bmp
-%%DATADIR%%/themes/gurrea1/wall3.bmp
+%%DATADIR%%/themes/gurrea1/corner.bmp
 %%DATADIR%%/themes/gurrea1/cornertop.bmp
 %%DATADIR%%/themes/gurrea1/door.bmp
 %%DATADIR%%/themes/gurrea1/floor.bmp
@@ -486,131 +644,24 @@ bin/scourge
 %%DATADIR%%/themes/gurrea1/wall.bmp
 %%DATADIR%%/themes/gurrea1/wall1.bmp
 %%DATADIR%%/themes/gurrea1/wall2.bmp
-%%DATADIR%%/themes/gurrea1/corner.bmp
-%%DATADIR%%/themes/gurrea2/wall.bmp
+%%DATADIR%%/themes/gurrea1/wall3.bmp
+%%DATADIR%%/themes/gurrea2/corner.bmp
 %%DATADIR%%/themes/gurrea2/cornertop.bmp
 %%DATADIR%%/themes/gurrea2/door.bmp
 %%DATADIR%%/themes/gurrea2/floor.bmp
 %%DATADIR%%/themes/gurrea2/passage.bmp
 %%DATADIR%%/themes/gurrea2/readme.txt
 %%DATADIR%%/themes/gurrea2/top.bmp
-%%DATADIR%%/themes/gurrea2/corner.bmp
-%%DATADIR%%/themes/wb-dragoon/whiteblazer readme.txt
+%%DATADIR%%/themes/gurrea2/wall.bmp
 %%DATADIR%%/themes/wb-dragoon/kd3.bmp
 %%DATADIR%%/themes/wb-dragoon/maderos01.bmp
+%%DATADIR%%/themes/wb-dragoon/maderos1.bmp
 %%DATADIR%%/themes/wb-dragoon/muro03a.bmp
 %%DATADIR%%/themes/wb-dragoon/ncob01.bmp
 %%DATADIR%%/themes/wb-dragoon/piedra1t1.bmp
 %%DATADIR%%/themes/wb-dragoon/pilarcem16a.bmp
 %%DATADIR%%/themes/wb-dragoon/suelo07b.bmp
-%%DATADIR%%/themes/wb-dragoon/maderos1.bmp
-%%DATADIR%%/world/spells.txt
-%%DATADIR%%/world/characters.txt
-%%DATADIR%%/world/creatures.txt
-%%DATADIR%%/world/gui.txt
-%%DATADIR%%/world/items.txt
-%%DATADIR%%/world/locations.txt
-%%DATADIR%%/world/missions.txt
-%%DATADIR%%/world/shapes.txt
-%%DATADIR%%/world/books.txt
-%%DATADIR%%/icons/i9.bmp
-%%DATADIR%%/icons/i1.bmp
-%%DATADIR%%/icons/i10.bmp
-%%DATADIR%%/icons/i11.bmp
-%%DATADIR%%/icons/i12.bmp
-%%DATADIR%%/icons/i13.bmp
-%%DATADIR%%/icons/i14.bmp
-%%DATADIR%%/icons/i2.bmp
-%%DATADIR%%/icons/i3.bmp
-%%DATADIR%%/icons/i4.bmp
-%%DATADIR%%/icons/i5.bmp
-%%DATADIR%%/icons/i6.bmp
-%%DATADIR%%/icons/i7.bmp
-%%DATADIR%%/icons/i8.bmp
-%%DATADIR%%/icons/i0.bmp
-%%DATADIR%%/fonts/curlfont.txf
-%%DATADIR%%/fonts/default.txf
-%%DATADIR%%/fonts/haeberli.txf
-%%DATADIR%%/fonts/rockfont.txf
-%%DATADIR%%/fonts/sorority.txf
-%%DATADIR%%/brick.bmp
-%%DATADIR%%/brick02.jpg
-%%DATADIR%%/brickfloor.bmp
-%%DATADIR%%/brickfloorv1.bmp
-%%DATADIR%%/brickv1.bmp
-%%DATADIR%%/candle.bmp
-%%DATADIR%%/chain.bmp
-%%DATADIR%%/chestfront.bmp
-%%DATADIR%%/chestside.bmp
-%%DATADIR%%/chesttop.bmp
-%%DATADIR%%/cloud.bmp
-%%DATADIR%%/copper.bmp
-%%DATADIR%%/gui.bmp
-%%DATADIR%%/corner.bmp
-%%DATADIR%%/crosshair.bmp
-%%DATADIR%%/cursor.bmp
-%%DATADIR%%/darkui.bmp
-%%DATADIR%%/darkuibutton.bmp
-%%DATADIR%%/darkuieast.bmp
-%%DATADIR%%/darkuieastsel.bmp
-%%DATADIR%%/darkuinorth.bmp
-%%DATADIR%%/darkuinorthsel.bmp
-%%DATADIR%%/darkuisel.bmp
-%%DATADIR%%/darkuisouth.bmp
-%%DATADIR%%/darkuisouthsel.bmp
-%%DATADIR%%/darkuitop.bmp
-%%DATADIR%%/darkuiwest.bmp
-%%DATADIR%%/darkuiwestsel.bmp
-%%DATADIR%%/door2NS.bmp
-%%DATADIR%%/doorEW.bmp
-%%DATADIR%%/doorNS.bmp
-%%DATADIR%%/dragon.bmp
-%%DATADIR%%/flame.bmp
-%%DATADIR%%/floor.bmp
-%%DATADIR%%/floor2.bmp
-%%DATADIR%%/floor2v1.bmp
-%%DATADIR%%/floor2v2.bmp
-%%DATADIR%%/floor3.bmp
-%%DATADIR%%/floor4.bmp
-%%DATADIR%%/floor4v1.bmp
-%%DATADIR%%/floor5.bmp
-%%DATADIR%%/floor5.psd
-%%DATADIR%%/floor5v1.bmp
-%%DATADIR%%/floor6.bmp
-%%DATADIR%%/floor6v1.bmp
-%%DATADIR%%/floor7.bmp
-%%DATADIR%%/floor7v1.bmp
-%%DATADIR%%/floorv1.bmp
-%%DATADIR%%/formation1.bmp
-%%DATADIR%%/formation2.bmp
-%%DATADIR%%/formation3.bmp
-%%DATADIR%%/formation4.bmp
-%%DATADIR%%/formation5.bmp
-%%DATADIR%%/formation6.bmp
-%%DATADIR%%/front.bmp
-%%DATADIR%%/fronttop.bmp
-%%DATADIR%%/frontv1.bmp
-%%DATADIR%%/frontv2.bmp
-%%DATADIR%%/gargoyle.bmp
-%%DATADIR%%/gui-wood.bmp
-%%DATADIR%%/gui2.bmp
-%%DATADIR%%/gui_small.bmp
-%%DATADIR%%/highlight.bmp
-%%DATADIR%%/iron.bmp
-%%DATADIR%%/light.bmp
-%%DATADIR%%/litewood.bmp
-%%DATADIR%%/logo.bmp
-%%DATADIR%%/logo2.bmp
-%%DATADIR%%/map.bmp
-%%DATADIR%%/marble.bmp
-%%DATADIR%%/metal.bmp
-%%DATADIR%%/paperdoll.bmp
-%%DATADIR%%/process.bmp
-%%DATADIR%%/ring2.bmp
-%%DATADIR%%/ripple.bmp
-%%DATADIR%%/scourge.bmp
-%%DATADIR%%/spells.bmp
-%%DATADIR%%/talk.bmp
+%%DATADIR%%/themes/wb-dragoon/whiteblazer readme.txt
 %%DATADIR%%/tiles.bmp
 %%DATADIR%%/torchback.bmp
 %%DATADIR%%/use.bmp
@@ -622,27 +673,32 @@ bin/scourge
 %%DATADIR%%/wallv1.bmp
 %%DATADIR%%/wood.bmp
 %%DATADIR%%/woodtop.bmp
-%%DATADIR%%/COPYRIGHT.TXT
-%%DATADIR%%/Cas_antn.ttf
-%%DATADIR%%/Vera.ttf
-%%DATADIR%%/VeraMono.ttf
-%%DATADIR%%/attack.bmp
-%%DATADIR%%/bar.bmp
-%%DATADIR%%/bookshelf.bmp
-%%DATADIR%%/border.bmp
-%%DATADIR%%/border2.bmp
-@dirrm %%DATADIR%%/sound/sword
-@dirrm %%DATADIR%%/sound/weapon-swish/bows
-@dirrm %%DATADIR%%/sound/weapon-swish/handheld
-@dirrm %%DATADIR%%/sound/weapon-swish
-@dirrm %%DATADIR%%/sound/ui
-@dirrm %%DATADIR%%/sound/potion
-@dirrm %%DATADIR%%/sound/imp
-@dirrm %%DATADIR%%/sound/equip
-@dirrm %%DATADIR%%/sound/magic
-@dirrm %%DATADIR%%/sound/knight
-@dirrm %%DATADIR%%/sound
+%%DATADIR%%/world/books.txt
+%%DATADIR%%/world/creatures.txt
+%%DATADIR%%/world/characters.txt
+%%DATADIR%%/world/gui.txt
+%%DATADIR%%/world/items.txt
+%%DATADIR%%/world/locations.txt
+%%DATADIR%%/world/map.nut
+%%DATADIR%%/world/missions.txt
+%%DATADIR%%/world/shapes.txt
+%%DATADIR%%/world/skills.nut
+%%DATADIR%%/world/skills.txt
+%%DATADIR%%/world/spells.txt
+@dirrm %%DATADIR%%/mapgrid
+@dirrm %%DATADIR%%/themes/egypt1
+@dirrm %%DATADIR%%/themes/egypt3
+@dirrm %%DATADIR%%/themes/egypt5
+@dirrm %%DATADIR%%/themes/gurrea1
+@dirrm %%DATADIR%%/themes/gurrea2
+@dirrm %%DATADIR%%/themes/wb-dragoon
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/cave/default
+@dirrm %%DATADIR%%/cave
 @dirrm %%DATADIR%%/maps
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/objects
+@dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/models/link
 @dirrm %%DATADIR%%/models/frog
 @dirrm %%DATADIR%%/models/npc/alita
@@ -667,17 +723,17 @@ bin/scourge
 @dirrm %%DATADIR%%/models/twigletman
 @dirrm %%DATADIR%%/models/yvonne
 @dirrm %%DATADIR%%/models
-@dirrm %%DATADIR%%/objects
 @dirrm %%DATADIR%%/portraits
-@dirrm %%DATADIR%%/mapgrid
-@dirrm %%DATADIR%%/themes/egypt1
-@dirrm %%DATADIR%%/themes/egypt3
-@dirrm %%DATADIR%%/themes/egypt5
-@dirrm %%DATADIR%%/themes/gurrea1
-@dirrm %%DATADIR%%/themes/gurrea2
-@dirrm %%DATADIR%%/themes/wb-dragoon
-@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/sound/sword
+@dirrm %%DATADIR%%/sound/weapon-swish/bows
+@dirrm %%DATADIR%%/sound/weapon-swish/handheld
+@dirrm %%DATADIR%%/sound/weapon-swish
+@dirrm %%DATADIR%%/sound/ui
+@dirrm %%DATADIR%%/sound/knight
+@dirrm %%DATADIR%%/sound/potion
+@dirrm %%DATADIR%%/sound/magic
+@dirrm %%DATADIR%%/sound/equip
+@dirrm %%DATADIR%%/sound/imp
+@dirrm %%DATADIR%%/sound
 @dirrm %%DATADIR%%/world
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%