svn commit: r480153 - in head/games/cataclysm-dda: . files

Steve Wills swills at FreeBSD.org
Thu Sep 20 05:04:05 UTC 2018 

Author: swills
Date: Thu Sep 20 05:04:03 2018
New Revision: 480153
URL: https://svnweb.freebsd.org/changeset/ports/480153

Log:
  games/cataclysm-dda: update, fix build, add SDL option
  
  While here, give maintainership to submitter
  
  PR:		226418
  Submitted by:	Greg V <greg at unrelenting.technology>

Added:
  head/games/cataclysm-dda/files/patch-Makefile   (contents, props changed)
Deleted:
  head/games/cataclysm-dda/files/patch-src-cata_tiles.cpp
  head/games/cataclysm-dda/files/patch-src-game.cpp
  head/games/cataclysm-dda/files/patch-src-sdltiles.cpp
  head/games/cataclysm-dda/files/patch-src_options.cpp
  head/games/cataclysm-dda/files/patch-src_player.cpp
Modified:
  head/games/cataclysm-dda/Makefile   (contents, props changed)
  head/games/cataclysm-dda/distinfo   (contents, props changed)
  head/games/cataclysm-dda/files/patch-src-translations.cpp   (contents, props changed)
  head/games/cataclysm-dda/pkg-descr   (contents, props changed)
  head/games/cataclysm-dda/pkg-plist   (contents, props changed)

Modified: head/games/cataclysm-dda/Makefile
==============================================================================
--- head/games/cataclysm-dda/Makefile	Thu Sep 20 03:15:14 2018	(r480152)
+++ head/games/cataclysm-dda/Makefile	Thu Sep 20 05:04:03 2018	(r480153)
@@ -1,66 +1,60 @@
 # Created by: Vladimir Kondratiev <wulf at cicgroup.ru>
 # $FreeBSD$
 
-PORTNAME=	cataclysm-dda
-PORTVERSION=	0.C
-PORTREVISION=	3
-PORTEPOCH=	1
-CATEGORIES=	games
+PORTNAME=		cataclysm-dda
+DISTVERSION=		0.C-26605
+DISTVERSIONSUFFIX=	-g2009bc2950
+PORTEPOCH=		1
+CATEGORIES=		games
 
-MAINTAINER=	ports at FreeBSD.org
-COMMENT=	Fork/variant of Cataclysm Roguelike by Whales
+MAINTAINER=	greg at unrelenting.technology
+COMMENT=	Roguelike set in a post-apocalyptic world
 
 LICENSE=	CC-BY-SA-3.0
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BROKEN_aarch64=		fails to compile: comparison of integers of different signs: wchar_t and const int
-BROKEN_armv6=		fails to compile: comparison of integers of different signs: wchar_t and const int
-BROKEN_armv7=		fails to compile: comparison of integers of different signs: wchar_t and const int
-BROKEN_powerpc64=	fails to compile: overmap.cpp: 'pow' is not a member of 'std'
-
-USES=		alias compiler:c++11-lib gmake shebangfix
-SHEBANG_FILES=	lang/*.sh
+USES=		alias compiler:c++14-lang gmake shebangfix
+SHEBANG_FILES=	lang/*.sh gfx/make_iso.py
 bash_CMD=	/bin/sh
+python_CMD=	${LOCALBASE}/bin/python2.7
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CleverRaven
 GH_PROJECT=	Cataclysm-DDA
 
-MAKE_ARGS=	CXX="${CXX}" LD="${CXX}" RELEASE=1
+MAKE_ARGS=	CXX="${CXX}" LD="${CXX}" RELEASE=1 WARNINGS=-w USE_XDG_DIR=1
 
-LDFLAGS+=	-lexecinfo
+PORTDOCS=	*
 
-MAKE_JOBS_UNSAFE=	yes
-
-OPTIONS_DEFINE=	NLS DOCS LUA SOUND
-OPTIONS_DEFAULT=NCURSES
-OPTIONS_SINGLE=	UI
+OPTIONS_DEFINE=		NLS DOCS LUA SOUND
+OPTIONS_DEFAULT=	NLS NCURSES LUA
+OPTIONS_SINGLE=		UI
 OPTIONS_SINGLE_UI=	NCURSES SDL
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
 UI_DESC=	User Interface
 SOUND_DESC=	Sound support (SDL UI only)
 
-NCURSES_USES=	ncurses
-SDL_USE=	SDL=image2,ttf2
-SDL_USES=	pkgconfig
-SDL_MAKE_ARGS=	TILES=1 TILESTARGET=cataclysm
-SDL_RUN_DEPENDS=terminus-font>0:x11-fonts/terminus-font
-SDL_CPPFLAGS=	$$(sdl2-config --cflags)
-SDL_LDFLAGS=	$$(sdl2-config --libs)
-SDL_DESKTOP_ENTRIES="Cataclysm-DDA" "" "" "cataclysm" "" ""
-NLS_USES=	gettext
-NLS_LDFLAGS=	-L${LOCALBASE}/lib -lintl
-NLS_MAKE_ARGS_OFF=LOCALIZE=0
-NLS_CPPFLAGS=	-I${LOCALBASE}/include
-LUA_USES=	lua pkgconfig
-LUA_MAKE_ARGS=	LUA=1 LUA_BINARY="${LUA_CMD}"
-SOUND_MASTER_SITES=	http://polehammer.com/azmodean/:sound
-SOUND_DISTFILES=	${SOUND_FILES:S/$/:sound/}
-SOUND_EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-SOUND_USE=		SDL=mixer2
-SOUND_MAKE_ARGS=	SOUND=1
-SOUND_IMPLIES=		SDL
+NCURSES_USES=			ncurses
+SDL_CONFLICTS_INSTALL=		${PORTNAME}-[0-9]*
+SDL_CONFLICTS_INSTALL_OFF=	${PORTNAME}-sdl-[0-9]*
+SDL_USE=			SDL=image2,ttf2
+SDL_USES=			pkgconfig
+SDL_MAKE_ARGS=			TILES=1 TILESTARGET=cataclysm
+SDL_CPPFLAGS=			$$(sdl2-config --cflags)
+SDL_LDFLAGS=			$$(sdl2-config --libs)
+SDL_DESKTOP_ENTRIES=		"Cataclysm: DDA" "" "" "cataclysm" "" ""
+NLS_USES=			gettext iconv localbase
+NLS_MAKE_ARGS=			LANGUAGES=all
+NLS_MAKE_ARGS_OFF=		LOCALIZE=0
+LUA_USES=			lua:53 pkgconfig
+LUA_MAKE_ARGS=			LUA=1 LUA_BINARY="${LUA_CMD}"
+SOUND_MASTER_SITES=		http://polehammer.com/azmodean/:sound
+SOUND_DISTFILES=		${SOUND_FILES:S/$/:sound/}
+SOUND_EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
+SOUND_USE=			SDL=mixer2
+SOUND_MAKE_ARGS=		SOUND=1
+SOUND_IMPLIES=			SDL
 
 SOUND_FILES=	cataclysmthemeREV6.ogg Dark_Days_Ahead_demo_2.ogg
 
@@ -76,22 +70,16 @@ CPPFLAGS+=	-DCATA_NO_CPP11_STRING_CONVERSIONS
 
 post-patch:
 	 @${REINPLACE_CMD} -e \
-		'/CXXFLAGS/s|-O[0-3s]|| ; \
-		 /LDFLAGS/s|-s$$|| ; \
-		 s|$$(shell ncursesw5-config --cflags)|| ; \
-		 s|$$(shell ncursesw5-config --libs)|-lncursesw -ltinfow| ; \
-		 s|\($$(CXX)\) \($$(DEFINES)\)|\1 $$(CPPFLAGS) \2| ; \
-		 s|\([[:blank:]]\)\($$(DATA_PREFIX)\)|\1$$(DESTDIR)\2| ; \
-		 s|\([[:blank:]]\)\($$(BIN_PREFIX)\)|\1$$(DESTDIR)\2| ; \
-		 s|--mode=|-m | ; \
+		's|--mode=|-m | ; \
 		 s|--no-preserve=ownership|| ; \
-		 s|-t || ; \
-		 s|\([[:blank:]]\)\($$(LOCALE_DIR)\)|\1$$(DESTDIR)\2| ; \
-		 s|\(=\)\($$(LOCALE_DIR)\)|\1$$(DESTDIR)\2|' \
+		 s|-t ||' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e \
 		's|/usr/local/share/fonts|${LOCALBASE}/share/fonts|' \
 		${WRKSRC}/src/sdltiles.cpp
+	@${REINPLACE_CMD} -e \
+		's|.wav|.ogg|' \
+		${WRKSRC}/data/sound/Basic/musicset.json
 
 post-patch-NLS-off:
 	 @${REINPLACE_CMD} -e \
@@ -100,15 +88,11 @@ post-patch-NLS-off:
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cataclysm
-# replace bundled windows version of terminus font with X-compatible one
-	${RM} ${STAGEDIR}${DATADIR}/font/terminus.fon
-	${LN} -sf ${PREFIX}/share/fonts/terminus/ter-u14n.pcf.gz \
-		${STAGEDIR}${DATADIR}/font/terminus.fon
 
 post-install-SOUND-on:
 	cd ${WRKSRC}/data && ${COPYTREE_SHARE} sound ${STAGEDIR}${DATADIR}
 	cd ${DISTDIR} && ${INSTALL_DATA} ${SOUND_FILES} \
-		${STAGEDIR}${DATADIR}/sound
+		${STAGEDIR}${DATADIR}/sound/Basic
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/games/cataclysm-dda/distinfo
==============================================================================
--- head/games/cataclysm-dda/distinfo	Thu Sep 20 03:15:14 2018	(r480152)
+++ head/games/cataclysm-dda/distinfo	Thu Sep 20 05:04:03 2018	(r480153)
@@ -1,6 +1,7 @@
+TIMESTAMP = 1520375284
 SHA256 (cataclysmthemeREV6.ogg) = fa305afea557b27ed341f6a10dcfab5aa07ecdd92e42b4dddec61eccb3c1c77f
 SIZE (cataclysmthemeREV6.ogg) = 7964468
 SHA256 (Dark_Days_Ahead_demo_2.ogg) = 75fe6b792ab06b842add070989acb9fe62f0acc5c17f344d724d774a772a68d4
 SIZE (Dark_Days_Ahead_demo_2.ogg) = 9182431
-SHA256 (CleverRaven-Cataclysm-DDA-0.C_GH0.tar.gz) = 69e947824626fffb505ca4ec44187ec94bba32c1e5957ba5c771b3445f958af6
-SIZE (CleverRaven-Cataclysm-DDA-0.C_GH0.tar.gz) = 26887684
+SHA256 (CleverRaven-Cataclysm-DDA-0.C-26605-g2009bc2950_GH0.tar.gz) = 20df143fc8b7e765fb5f6a71d1e6cce473d8f3a38dcc344752a900edf6668d36
+SIZE (CleverRaven-Cataclysm-DDA-0.C-26605-g2009bc2950_GH0.tar.gz) = 60119058

Added: head/games/cataclysm-dda/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/cataclysm-dda/files/patch-Makefile	Thu Sep 20 05:04:03 2018	(r480153)
@@ -0,0 +1,10 @@
+--- Makefile.orig	2018-07-11 20:54:11 UTC
++++ Makefile
+@@ -613,7 +613,7 @@ ifeq ($(BSD), 1)
+
+  # And similarly, their libcs don't have gettext built in
+   ifeq ($(LOCALIZE),1)
+-    LDFLAGS += -lintl -liconv
++    LDFLAGS += -lintl
+   endif
+ endif

Modified: head/games/cataclysm-dda/files/patch-src-translations.cpp
==============================================================================
--- head/games/cataclysm-dda/files/patch-src-translations.cpp	Thu Sep 20 03:15:14 2018	(r480152)
+++ head/games/cataclysm-dda/files/patch-src-translations.cpp	Thu Sep 20 05:04:03 2018	(r480153)
@@ -1,11 +1,11 @@
---- src/translations.cpp.orig	2015-03-09 05:25:34 UTC
+--- src/translations.cpp.orig	2018-03-06 08:11:44 UTC
 +++ src/translations.cpp
-@@ -72,7 +72,7 @@ void set_language(bool reload_options)
+@@ -176,7 +176,7 @@ void set_language()
  
      // Step 2. Bind to gettext domain.
-     const char *locale_dir;
--#ifdef __linux__
-+#if (defined __linux__ || defined __FreeBSD__)
-     if (!FILENAMES["base_path"].empty()) {
-         locale_dir = std::string(FILENAMES["base_path"] + "share/locale").c_str();
+     std::string locale_dir;
+-#if (defined __linux__ || (defined MACOSX && !defined TILES))
++#if (defined __linux__ || defined __FreeBSD__ || (defined MACOSX && !defined TILES))
+     if( !FILENAMES["base_path"].empty() ) {
+         locale_dir = FILENAMES["base_path"] + "share/locale";
      } else {

Modified: head/games/cataclysm-dda/pkg-descr
==============================================================================
--- head/games/cataclysm-dda/pkg-descr	Thu Sep 20 03:15:14 2018	(r480152)
+++ head/games/cataclysm-dda/pkg-descr	Thu Sep 20 05:04:03 2018	(r480153)
@@ -8,4 +8,4 @@ variety of powerful monstrosities, from zombies to gia
 robots and things far stranger and deadlier, and against the others like
 yourself, that want what you have...
 
-WWW: http://en.cataclysmdda.com/
+WWW: https://cataclysmdda.org

Modified: head/games/cataclysm-dda/pkg-plist
==============================================================================
--- head/games/cataclysm-dda/pkg-plist	Thu Sep 20 03:15:14 2018	(r480152)
+++ head/games/cataclysm-dda/pkg-plist	Thu Sep 20 05:04:03 2018	(r480153)
@@ -1,39 +1,74 @@
 bin/cataclysm
 %%DATADIR%%/LICENSE.txt
-%%DATADIR%%/README.txt
 %%DATADIR%%/cataicon.ico
 %%DATADIR%%/changelog.txt
+%%DATADIR%%/core/basic.json
 %%DATADIR%%/credits/de.credits
 %%DATADIR%%/credits/en.credits
 %%DATADIR%%/credits/es_AR.credits
 %%DATADIR%%/credits/es_ES.credits
 %%DATADIR%%/credits/it_IT.credits
+%%DATADIR%%/credits/ko.credits
+%%DATADIR%%/credits/pt_BR.credits
 %%DATADIR%%/credits/ru.credits
-%%DATADIR%%/font/fixedsys.ttf
-%%DATADIR%%/font/square.ttf
-%%DATADIR%%/font/terminus.fon
-%%DATADIR%%/fontdata.json
+%%DATADIR%%/credits/zh_CN.credits
+%%DATADIR%%/credits/zh_TW.credits
+%%SDL%%%%DATADIR%%/font/Square-Smallcaps.ttf
+%%SDL%%%%DATADIR%%/font/fixedsys.ttf
+%%SDL%%%%DATADIR%%/font/square.ttf
+%%SDL%%%%DATADIR%%/font/terminus.fon
+%%SDL%%%%DATADIR%%/font/unifont.ttf
+%%SDL%%%%DATADIR%%/fontdata.json
 %%SDL%%%%DATADIR%%/gfx/BlockheadTileset/blockheadtiles.png
 %%SDL%%%%DATADIR%%/gfx/BlockheadTileset/tile_config.json
 %%SDL%%%%DATADIR%%/gfx/BlockheadTileset/tileset.txt
+%%SDL%%%%DATADIR%%/gfx/ChestHole16Tileset/fallback.png
+%%SDL%%%%DATADIR%%/gfx/ChestHole16Tileset/tile_config.json
+%%SDL%%%%DATADIR%%/gfx/ChestHole16Tileset/tiles.png
+%%SDL%%%%DATADIR%%/gfx/ChestHole16Tileset/tiles24.png
+%%SDL%%%%DATADIR%%/gfx/ChestHole16Tileset/tileset.txt
+%%SDL%%%%DATADIR%%/gfx/ChestHole32Tileset/fallback.png
+%%SDL%%%%DATADIR%%/gfx/ChestHole32Tileset/tile_config.json
+%%SDL%%%%DATADIR%%/gfx/ChestHole32Tileset/tiles.png
+%%SDL%%%%DATADIR%%/gfx/ChestHole32Tileset/tiles48.png
+%%SDL%%%%DATADIR%%/gfx/ChestHole32Tileset/tileset.txt
+%%SDL%%%%DATADIR%%/gfx/ChestHole32Tileset/tilesold.png
+%%SDL%%%%DATADIR%%/gfx/ChestHole32Tileset/tree.png
+%%SDL%%%%DATADIR%%/gfx/ChestHole32Tileset_iso/fallback.png
+%%SDL%%%%DATADIR%%/gfx/ChestHole32Tileset_iso/tile_config.json
+%%SDL%%%%DATADIR%%/gfx/ChestHole32Tileset_iso/tiles.png
+%%SDL%%%%DATADIR%%/gfx/ChestHole32Tileset_iso/tiles48.png
+%%SDL%%%%DATADIR%%/gfx/ChestHole32Tileset_iso/tileset.txt
 %%SDL%%%%DATADIR%%/gfx/ChestHoleTileset/fallback.png
 %%SDL%%%%DATADIR%%/gfx/ChestHoleTileset/tile_config.json
 %%SDL%%%%DATADIR%%/gfx/ChestHoleTileset/tiles.png
+%%SDL%%%%DATADIR%%/gfx/ChestHoleTileset/tiles32.png
 %%SDL%%%%DATADIR%%/gfx/ChestHoleTileset/tileset.txt
+%%SDL%%%%DATADIR%%/gfx/ChestHoleTileset/tree.png
 %%SDL%%%%DATADIR%%/gfx/DeonTileset/deontiles.png
 %%SDL%%%%DATADIR%%/gfx/DeonTileset/tile_config.json
 %%SDL%%%%DATADIR%%/gfx/DeonTileset/tileset.txt
+%%SDL%%%%DATADIR%%/gfx/HitButton_iso/HitButton_iso.png
+%%SDL%%%%DATADIR%%/gfx/HitButton_iso/fallback.png
+%%SDL%%%%DATADIR%%/gfx/HitButton_iso/tile_config.json
+%%SDL%%%%DATADIR%%/gfx/HitButton_iso/tileset.txt
 %%SDL%%%%DATADIR%%/gfx/HoderTileset/hodertiles.png
 %%SDL%%%%DATADIR%%/gfx/HoderTileset/tile_config.json
 %%SDL%%%%DATADIR%%/gfx/HoderTileset/tileset.txt
-%%SDL%%%%DATADIR%%/gfx/MShock24Tileset/fallback.png
-%%SDL%%%%DATADIR%%/gfx/MShock24Tileset/tile_config.json
-%%SDL%%%%DATADIR%%/gfx/MShock24Tileset/tiles.png
-%%SDL%%%%DATADIR%%/gfx/MShock24Tileset/tileset.txt
-%%SDL%%%%DATADIR%%/gfx/MShock32Tileset/fallback.png
-%%SDL%%%%DATADIR%%/gfx/MShock32Tileset/tile_config.json
-%%SDL%%%%DATADIR%%/gfx/MShock32Tileset/tiles.png
-%%SDL%%%%DATADIR%%/gfx/MShock32Tileset/tileset.txt
+%%SDL%%%%DATADIR%%/gfx/MShock24TilesetModded/fallback.png
+%%SDL%%%%DATADIR%%/gfx/MShock24TilesetModded/tile_config.json
+%%SDL%%%%DATADIR%%/gfx/MShock24TilesetModded/tiles.png
+%%SDL%%%%DATADIR%%/gfx/MShock24TilesetModded/tileset.txt
+%%SDL%%%%DATADIR%%/gfx/MShock32TilesetModded/fallback.png
+%%SDL%%%%DATADIR%%/gfx/MShock32TilesetModded/tile_config.json
+%%SDL%%%%DATADIR%%/gfx/MShock32TilesetModded/tiles.png
+%%SDL%%%%DATADIR%%/gfx/MShock32TilesetModded/tileset.txt
+%%SDL%%%%DATADIR%%/gfx/MshockXotto+/expan.png
+%%SDL%%%%DATADIR%%/gfx/MshockXotto+/fallback.png
+%%SDL%%%%DATADIR%%/gfx/MshockXotto+/tile_config.json
+%%SDL%%%%DATADIR%%/gfx/MshockXotto+/tiles.png
+%%SDL%%%%DATADIR%%/gfx/MshockXotto+/tileset.txt
+%%SDL%%%%DATADIR%%/gfx/MshockXotto+/tree.png
 %%SDL%%%%DATADIR%%/gfx/RetroASCIITileset/retroasciitiles.png
 %%SDL%%%%DATADIR%%/gfx/RetroASCIITileset/tile_config.json
 %%SDL%%%%DATADIR%%/gfx/RetroASCIITileset/tileset.txt
@@ -41,158 +76,555 @@ bin/cataclysm
 %%SDL%%%%DATADIR%%/gfx/RetroDaysTileset10/retrodaystiles10.png
 %%SDL%%%%DATADIR%%/gfx/RetroDaysTileset10/tile_config.json
 %%SDL%%%%DATADIR%%/gfx/RetroDaysTileset10/tileset.txt
-%%SDL%%%%DATADIR%%/gfx/RetroDaysTileset20/retrodaysfallback20.png
-%%SDL%%%%DATADIR%%/gfx/RetroDaysTileset20/retrodaystiles20.png
 %%SDL%%%%DATADIR%%/gfx/RetroDaysTileset20/tile_config.json
 %%SDL%%%%DATADIR%%/gfx/RetroDaysTileset20/tileset.txt
+%%SDL%%%%DATADIR%%/gfx/RetroDaysTileset20_iso/retrodaystiles20.png
+%%SDL%%%%DATADIR%%/gfx/RetroDaysTileset20_iso/tile_config.json
 %%SDL%%%%DATADIR%%/gfx/ThuztorTileset@/thuztortiles at .png
 %%SDL%%%%DATADIR%%/gfx/ThuztorTileset@/tile_config.json
 %%SDL%%%%DATADIR%%/gfx/ThuztorTileset@/tileset.txt
 %%SDL%%%%DATADIR%%/gfx/TsuTileset/tile_config.json
 %%SDL%%%%DATADIR%%/gfx/TsuTileset/tileset.txt
 %%SDL%%%%DATADIR%%/gfx/TsuTileset/tsutiles.png
+%%SDL%%%%DATADIR%%/gfx/make_iso.py
 %%SDL%%%%DATADIR%%/gfx/tile.png
 %%SDL%%%%DATADIR%%/gfx/tile_config.json
 %%SDL%%%%DATADIR%%/gfx/tile_config_template.json
 %%SDL%%%%DATADIR%%/gfx/tinytile.png
 %%DATADIR%%/json/LOADING_ORDER.md
+%%DATADIR%%/json/anatomy.json
 %%DATADIR%%/json/bionics.json
-%%DATADIR%%/json/bullet_pulling.json
+%%DATADIR%%/json/body_parts.json
 %%DATADIR%%/json/construction.json
+%%DATADIR%%/json/default_blacklist.json
 %%DATADIR%%/json/doll_speech.json
 %%DATADIR%%/json/dreams.json
 %%DATADIR%%/json/effects.json
-%%DATADIR%%/json/fish.json
+%%DATADIR%%/json/emit.json
+%%DATADIR%%/json/faults.json
+%%DATADIR%%/json/flags.json
 %%DATADIR%%/json/furniture.json
-%%DATADIR%%/json/furniture/ags_furniture.json
+%%DATADIR%%/json/gates.json
+%%DATADIR%%/json/harvest.json
+%%DATADIR%%/json/health_msgs.json
 %%DATADIR%%/json/hints.json
 %%DATADIR%%/json/item_actions.json
+%%DATADIR%%/json/item_category.json
 %%DATADIR%%/json/item_groups.json
-%%DATADIR%%/json/items/ags_items.json
+%%DATADIR%%/json/itemgroups/ammo.json
+%%DATADIR%%/json/itemgroups/books.json
+%%DATADIR%%/json/itemgroups/clothing.json
+%%DATADIR%%/json/itemgroups/drugs.json
+%%DATADIR%%/json/itemgroups/forage.json
+%%DATADIR%%/json/itemgroups/gear.json
+%%DATADIR%%/json/itemgroups/gunmod.json
+%%DATADIR%%/json/itemgroups/guns.json
+%%DATADIR%%/json/itemgroups/locations.json
+%%DATADIR%%/json/itemgroups/magazines.json
+%%DATADIR%%/json/itemgroups/main.json
+%%DATADIR%%/json/itemgroups/mansion.json
+%%DATADIR%%/json/itemgroups/misc.json
+%%DATADIR%%/json/itemgroups/monster_drops.json
+%%DATADIR%%/json/itemgroups/supplies.json
+%%DATADIR%%/json/itemgroups/tools.json
+%%DATADIR%%/json/itemgroups/vending_machines.json
 %%DATADIR%%/json/items/ammo.json
+%%DATADIR%%/json/items/ammo/12mm.json
+%%DATADIR%%/json/items/ammo/20x66mm.json
+%%DATADIR%%/json/items/ammo/22.json
+%%DATADIR%%/json/items/ammo/223.json
+%%DATADIR%%/json/items/ammo/300.json
+%%DATADIR%%/json/items/ammo/3006.json
+%%DATADIR%%/json/items/ammo/308.json
+%%DATADIR%%/json/items/ammo/32.json
+%%DATADIR%%/json/items/ammo/357.json
+%%DATADIR%%/json/items/ammo/36paper.json
+%%DATADIR%%/json/items/ammo/38.json
+%%DATADIR%%/json/items/ammo/40.json
+%%DATADIR%%/json/items/ammo/40mm.json
+%%DATADIR%%/json/items/ammo/44.json
+%%DATADIR%%/json/items/ammo/44paper.json
+%%DATADIR%%/json/items/ammo/45.json
+%%DATADIR%%/json/items/ammo/454.json
+%%DATADIR%%/json/items/ammo/46.json
+%%DATADIR%%/json/items/ammo/50.json
+%%DATADIR%%/json/items/ammo/500.json
+%%DATADIR%%/json/items/ammo/545x39.json
+%%DATADIR%%/json/items/ammo/57.json
+%%DATADIR%%/json/items/ammo/5x50.json
+%%DATADIR%%/json/items/ammo/700nx.json
+%%DATADIR%%/json/items/ammo/762.json
+%%DATADIR%%/json/items/ammo/762R.json
+%%DATADIR%%/json/items/ammo/762x25.json
+%%DATADIR%%/json/items/ammo/8x40mm.json
+%%DATADIR%%/json/items/ammo/9mm.json
+%%DATADIR%%/json/items/ammo/9x18.json
+%%DATADIR%%/json/items/ammo/flintlock.json
+%%DATADIR%%/json/items/ammo/metal_rail.json
+%%DATADIR%%/json/items/ammo/nail.json
+%%DATADIR%%/json/items/ammo/shot.json
+%%DATADIR%%/json/items/ammo/signal_flare.json
+%%DATADIR%%/json/items/ammo/weldgas.json
 %%DATADIR%%/json/items/ammo_types.json
 %%DATADIR%%/json/items/archery.json
 %%DATADIR%%/json/items/armor.json
+%%DATADIR%%/json/items/armor/ammo_pouch.json
+%%DATADIR%%/json/items/armor/bandolier.json
+%%DATADIR%%/json/items/armor/boots.json
+%%DATADIR%%/json/items/armor/holster.json
 %%DATADIR%%/json/items/bionics.json
-%%DATADIR%%/json/items/books.json
+%%DATADIR%%/json/items/book/archery.json
+%%DATADIR%%/json/items/book/barter.json
+%%DATADIR%%/json/items/book/bashing.json
+%%DATADIR%%/json/items/book/computer.json
+%%DATADIR%%/json/items/book/cooking.json
+%%DATADIR%%/json/items/book/cutting.json
+%%DATADIR%%/json/items/book/dodge.json
+%%DATADIR%%/json/items/book/driving.json
+%%DATADIR%%/json/items/book/electronics.json
+%%DATADIR%%/json/items/book/fabrication.json
+%%DATADIR%%/json/items/book/firstaid.json
+%%DATADIR%%/json/items/book/gun.json
+%%DATADIR%%/json/items/book/launcher.json
+%%DATADIR%%/json/items/book/martial.json
+%%DATADIR%%/json/items/book/mechanics.json
+%%DATADIR%%/json/items/book/melee.json
+%%DATADIR%%/json/items/book/misc.json
+%%DATADIR%%/json/items/book/pistol.json
+%%DATADIR%%/json/items/book/rifle.json
+%%DATADIR%%/json/items/book/shotgun.json
+%%DATADIR%%/json/items/book/smg.json
+%%DATADIR%%/json/items/book/speech.json
+%%DATADIR%%/json/items/book/stabbing.json
+%%DATADIR%%/json/items/book/survival.json
+%%DATADIR%%/json/items/book/swimming.json
+%%DATADIR%%/json/items/book/tailor.json
+%%DATADIR%%/json/items/book/throw.json
+%%DATADIR%%/json/items/book/traps.json
+%%DATADIR%%/json/items/book/unarmed.json
 %%DATADIR%%/json/items/chemicals_and_resources.json
+%%DATADIR%%/json/items/classes/book.json
+%%DATADIR%%/json/items/classes/comestible.json
+%%DATADIR%%/json/items/classes/gun.json
+%%DATADIR%%/json/items/classes/magazine.json
 %%DATADIR%%/json/items/comestibles.json
+%%DATADIR%%/json/items/comestibles/brewing.json
+%%DATADIR%%/json/items/comestibles/carnivore.json
+%%DATADIR%%/json/items/comestibles/drink.json
+%%DATADIR%%/json/items/comestibles/med.json
+%%DATADIR%%/json/items/comestibles/mutagen.json
+%%DATADIR%%/json/items/comestibles/protein.json
+%%DATADIR%%/json/items/comestibles/seed.json
+%%DATADIR%%/json/items/comestibles/spice.json
 %%DATADIR%%/json/items/containers.json
+%%DATADIR%%/json/items/crossbows.json
+%%DATADIR%%/json/items/fake.json
+%%DATADIR%%/json/items/fuel.json
+%%DATADIR%%/json/items/generic.json
+%%DATADIR%%/json/items/generic/ammolink.json
+%%DATADIR%%/json/items/generic/casing.json
+%%DATADIR%%/json/items/generic/spares.json
+%%DATADIR%%/json/items/generic/string.json
+%%DATADIR%%/json/items/grenades.json
+%%DATADIR%%/json/items/gun/12mm.json
+%%DATADIR%%/json/items/gun/20x66mm.json
+%%DATADIR%%/json/items/gun/22.json
+%%DATADIR%%/json/items/gun/223.json
+%%DATADIR%%/json/items/gun/300.json
+%%DATADIR%%/json/items/gun/3006.json
+%%DATADIR%%/json/items/gun/308.json
+%%DATADIR%%/json/items/gun/32.json
+%%DATADIR%%/json/items/gun/357.json
+%%DATADIR%%/json/items/gun/36paper.json
+%%DATADIR%%/json/items/gun/38.json
+%%DATADIR%%/json/items/gun/40.json
+%%DATADIR%%/json/items/gun/40mm.json
+%%DATADIR%%/json/items/gun/44.json
+%%DATADIR%%/json/items/gun/44paper.json
+%%DATADIR%%/json/items/gun/45.json
+%%DATADIR%%/json/items/gun/454.json
+%%DATADIR%%/json/items/gun/46.json
+%%DATADIR%%/json/items/gun/50.json
+%%DATADIR%%/json/items/gun/500.json
+%%DATADIR%%/json/items/gun/545x39.json
+%%DATADIR%%/json/items/gun/57.json
+%%DATADIR%%/json/items/gun/5x50.json
+%%DATADIR%%/json/items/gun/700nx.json
+%%DATADIR%%/json/items/gun/762.json
+%%DATADIR%%/json/items/gun/762R.json
+%%DATADIR%%/json/items/gun/762x25.json
+%%DATADIR%%/json/items/gun/8x40mm.json
+%%DATADIR%%/json/items/gun/9mm.json
+%%DATADIR%%/json/items/gun/9x18.json
+%%DATADIR%%/json/items/gun/bio.json
+%%DATADIR%%/json/items/gun/blunderbuss.json
+%%DATADIR%%/json/items/gun/flammable.json
+%%DATADIR%%/json/items/gun/flintlock.json
+%%DATADIR%%/json/items/gun/metal_rail.json
+%%DATADIR%%/json/items/gun/nail.json
+%%DATADIR%%/json/items/gun/shot.json
+%%DATADIR%%/json/items/gun/signal_flare.json
+%%DATADIR%%/json/items/gun/ups.json
+%%DATADIR%%/json/items/gunmod/accessories.json
+%%DATADIR%%/json/items/gunmod/barrel.json
+%%DATADIR%%/json/items/gunmod/grip.json
+%%DATADIR%%/json/items/gunmod/laser_gunmods.json
+%%DATADIR%%/json/items/gunmod/magazine.json
+%%DATADIR%%/json/items/gunmod/mechanism.json
+%%DATADIR%%/json/items/gunmod/muzzle.json
+%%DATADIR%%/json/items/gunmod/rail.json
+%%DATADIR%%/json/items/gunmod/sights.json
+%%DATADIR%%/json/items/gunmod/stock.json
+%%DATADIR%%/json/items/gunmod/underbarrel.json
 %%DATADIR%%/json/items/handloaded_bullets.json
-%%DATADIR%%/json/items/martial_arts_manuals.json
+%%DATADIR%%/json/items/magazine/12mm.json
+%%DATADIR%%/json/items/magazine/20x60mm.json
+%%DATADIR%%/json/items/magazine/22.json
+%%DATADIR%%/json/items/magazine/223.json
+%%DATADIR%%/json/items/magazine/300.json
+%%DATADIR%%/json/items/magazine/3006.json
+%%DATADIR%%/json/items/magazine/308.json
+%%DATADIR%%/json/items/magazine/32.json
+%%DATADIR%%/json/items/magazine/357.json
+%%DATADIR%%/json/items/magazine/38.json
+%%DATADIR%%/json/items/magazine/40.json
+%%DATADIR%%/json/items/magazine/40mm.json
+%%DATADIR%%/json/items/magazine/44.json
+%%DATADIR%%/json/items/magazine/45.json
+%%DATADIR%%/json/items/magazine/46.json
+%%DATADIR%%/json/items/magazine/50.json
+%%DATADIR%%/json/items/magazine/545x39.json
+%%DATADIR%%/json/items/magazine/57.json
+%%DATADIR%%/json/items/magazine/5x50.json
+%%DATADIR%%/json/items/magazine/762.json
+%%DATADIR%%/json/items/magazine/762x25.json
+%%DATADIR%%/json/items/magazine/8x40mm.json
+%%DATADIR%%/json/items/magazine/9mm.json
+%%DATADIR%%/json/items/magazine/9x18.json
+%%DATADIR%%/json/items/magazine/nail.json
+%%DATADIR%%/json/items/magazine/shot.json
+%%DATADIR%%/json/items/magazine/weldgas.json
 %%DATADIR%%/json/items/melee.json
-%%DATADIR%%/json/items/mods.json
+%%DATADIR%%/json/items/migration.json
 %%DATADIR%%/json/items/newspaper.json
+%%DATADIR%%/json/items/obsolete.json
 %%DATADIR%%/json/items/ranged.json
+%%DATADIR%%/json/items/resources/metals.json
+%%DATADIR%%/json/items/resources/misc.json
+%%DATADIR%%/json/items/software.json
+%%DATADIR%%/json/items/tool/lighting.json
+%%DATADIR%%/json/items/tool/med.json
+%%DATADIR%%/json/items/tool/radio_tools.json
+%%DATADIR%%/json/items/tool/workshop.json
 %%DATADIR%%/json/items/tool_armor.json
+%%DATADIR%%/json/items/toolmod.json
 %%DATADIR%%/json/items/tools.json
-%%DATADIR%%/json/items/var_vehicle_parts.json
+%%DATADIR%%/json/items/vehicle/alternator.json
+%%DATADIR%%/json/items/vehicle/battery.json
+%%DATADIR%%/json/items/vehicle/engine.json
+%%DATADIR%%/json/items/vehicle/engineering.json
+%%DATADIR%%/json/items/vehicle/rigs.json
+%%DATADIR%%/json/items/vehicle/wheel.json
 %%DATADIR%%/json/items/vehicle_parts.json
 %%DATADIR%%/json/lab_notes.json
-%%LUA%%%%DATADIR%%/json/main.lua
 %%DATADIR%%/json/map_extra_items.json
 %%DATADIR%%/json/mapgen/Prepper_house01.json
 %%DATADIR%%/json/mapgen/abandoned01.json
+%%DATADIR%%/json/mapgen/abstorefront.json
 %%DATADIR%%/json/mapgen/ags_station.json
 %%DATADIR%%/json/mapgen/antique_store.json
+%%DATADIR%%/json/mapgen/apartment_con.json
+%%DATADIR%%/json/mapgen/apartment_mod.json
 %%DATADIR%%/json/mapgen/arcade.json
 %%DATADIR%%/json/mapgen/bandit_cabin.json
 %%DATADIR%%/json/mapgen/bandit_camp.json
+%%DATADIR%%/json/mapgen/bank.json
 %%DATADIR%%/json/mapgen/bar.json
+%%DATADIR%%/json/mapgen/basement/basement_chem.json
+%%DATADIR%%/json/mapgen/basement/basement_game.json
+%%DATADIR%%/json/mapgen/basement/basement_guns.json
+%%DATADIR%%/json/mapgen/basement/basement_survival.json
+%%DATADIR%%/json/mapgen/basement/basement_weed.json
+%%DATADIR%%/json/mapgen/bike_shop.json
+%%DATADIR%%/json/mapgen/bookstore1.json
+%%DATADIR%%/json/mapgen/bookstore2.json
+%%DATADIR%%/json/mapgen/bookstore3.json
 %%DATADIR%%/json/mapgen/bowling_alley.json
 %%DATADIR%%/json/mapgen/boxing.json
+%%DATADIR%%/json/mapgen/bunker.json
+%%DATADIR%%/json/mapgen/butcher.json
+%%DATADIR%%/json/mapgen/cabin00.json
 %%DATADIR%%/json/mapgen/cabin03.json
+%%DATADIR%%/json/mapgen/cabin_strange.json
+%%DATADIR%%/json/mapgen/campsite.json
+%%DATADIR%%/json/mapgen/cathedral.json
+%%DATADIR%%/json/mapgen/cemetery_4square.json
+%%DATADIR%%/json/mapgen/church_gothic.json
+%%DATADIR%%/json/mapgen/church_new_england.json
+%%DATADIR%%/json/mapgen/clothing0.json
+%%DATADIR%%/json/mapgen/clothing1.json
+%%DATADIR%%/json/mapgen/clothing2.json
+%%DATADIR%%/json/mapgen/clothing3.json
+%%DATADIR%%/json/mapgen/clothing4.json
+%%DATADIR%%/json/mapgen/clothing5.json
+%%DATADIR%%/json/mapgen/clothing6.json
 %%DATADIR%%/json/mapgen/coffee_shop.json
+%%DATADIR%%/json/mapgen/coffee_shop2.json
+%%DATADIR%%/json/mapgen/dairy_farm.json
+%%DATADIR%%/json/mapgen/debug_ramps.json
 %%DATADIR%%/json/mapgen/diner.json
 %%DATADIR%%/json/mapgen/dojo.json
+%%DATADIR%%/json/mapgen/electronics0.json
 %%DATADIR%%/json/mapgen/electronics1.json
 %%DATADIR%%/json/mapgen/evac_center.json
+%%DATADIR%%/json/mapgen/farm.json
+%%DATADIR%%/json/mapgen/field_football.json
 %%DATADIR%%/json/mapgen/fire_station.json
 %%DATADIR%%/json/mapgen/fortified_house01.json
+%%DATADIR%%/json/mapgen/furniture.json
+%%DATADIR%%/json/mapgen/garage.json
+%%DATADIR%%/json/mapgen/garage_gas.json
 %%DATADIR%%/json/mapgen/gardening_store.json
+%%DATADIR%%/json/mapgen/grocery0.json
 %%DATADIR%%/json/mapgen/grocery1.json
 %%DATADIR%%/json/mapgen/gunsmith.json
 %%DATADIR%%/json/mapgen/gunstore_home_defense.json
 %%DATADIR%%/json/mapgen/gym.json
+%%DATADIR%%/json/mapgen/hardware1.json
+%%DATADIR%%/json/mapgen/hardware2.json
+%%DATADIR%%/json/mapgen/hardware3.json
+%%DATADIR%%/json/mapgen/hardware4.json
 %%DATADIR%%/json/mapgen/homeimprovement.json
-%%DATADIR%%/json/mapgen/house04.json
-%%DATADIR%%/json/mapgen/house05.json
-%%DATADIR%%/json/mapgen/house05_ab.json
-%%DATADIR%%/json/mapgen/house06.json
-%%DATADIR%%/json/mapgen/house07.json
-%%DATADIR%%/json/mapgen/house08.json
-%%DATADIR%%/json/mapgen/house09 .json
-%%DATADIR%%/json/mapgen/house10.json
-%%DATADIR%%/json/mapgen/house11.json
-%%DATADIR%%/json/mapgen/house12.json
-%%DATADIR%%/json/mapgen/house13.json
-%%DATADIR%%/json/mapgen/house14.json
-%%DATADIR%%/json/mapgen/house15.json
-%%DATADIR%%/json/mapgen/house16.json
-%%DATADIR%%/json/mapgen/house17.json
-%%DATADIR%%/json/mapgen/house_dogs.json
-%%DATADIR%%/json/mapgen/house_duplex.json
-%%DATADIR%%/json/mapgen/house_garage.json
-%%DATADIR%%/json/mapgen/house_garage2.json
-%%DATADIR%%/json/mapgen/house_garage3.json
-%%DATADIR%%/json/mapgen/house_garage4.json
-%%DATADIR%%/json/mapgen/house_garage5.json
-%%DATADIR%%/json/mapgen/house_garage_prepper.json
-%%DATADIR%%/json/mapgen/house_gardener.json
-%%DATADIR%%/json/mapgen/house_library.json
-%%DATADIR%%/json/mapgen/house_modern_lx.json
-%%DATADIR%%/json/mapgen/house_patio.json
-%%DATADIR%%/json/mapgen/house_porch.json
-%%DATADIR%%/json/mapgen/house_quiverfull.json
-%%DATADIR%%/json/mapgen/house_rv.json
-%%DATADIR%%/json/mapgen/house_tool_shed.json
+%%DATADIR%%/json/mapgen/homeimprovement_superstore.json
+%%DATADIR%%/json/mapgen/hospital/hospital.json
+%%DATADIR%%/json/mapgen/hotel_tower.json
+%%DATADIR%%/json/mapgen/house/house04.json
+%%DATADIR%%/json/mapgen/house/house05.json
+%%DATADIR%%/json/mapgen/house/house05_ab.json
+%%DATADIR%%/json/mapgen/house/house06.json
+%%DATADIR%%/json/mapgen/house/house07.json
+%%DATADIR%%/json/mapgen/house/house08.json
+%%DATADIR%%/json/mapgen/house/house09.json
+%%DATADIR%%/json/mapgen/house/house10.json
+%%DATADIR%%/json/mapgen/house/house11.json
+%%DATADIR%%/json/mapgen/house/house12.json
+%%DATADIR%%/json/mapgen/house/house13.json
+%%DATADIR%%/json/mapgen/house/house14.json
+%%DATADIR%%/json/mapgen/house/house15.json
+%%DATADIR%%/json/mapgen/house/house16.json
+%%DATADIR%%/json/mapgen/house/house17.json
+%%DATADIR%%/json/mapgen/house/house18.json
+%%DATADIR%%/json/mapgen/house/house19.json
+%%DATADIR%%/json/mapgen/house/house_dogs.json
+%%DATADIR%%/json/mapgen/house/house_duplex.json
+%%DATADIR%%/json/mapgen/house/house_garage.json
+%%DATADIR%%/json/mapgen/house/house_garage2.json
+%%DATADIR%%/json/mapgen/house/house_garage3.json
+%%DATADIR%%/json/mapgen/house/house_garage4.json
+%%DATADIR%%/json/mapgen/house/house_garage5.json
+%%DATADIR%%/json/mapgen/house/house_garage6.json
+%%DATADIR%%/json/mapgen/house/house_garage_prepper.json
+%%DATADIR%%/json/mapgen/house/house_gardener.json
+%%DATADIR%%/json/mapgen/house/house_library.json
+%%DATADIR%%/json/mapgen/house/house_modern_lx.json
+%%DATADIR%%/json/mapgen/house/house_patio.json
+%%DATADIR%%/json/mapgen/house/house_porch.json
+%%DATADIR%%/json/mapgen/house/house_quiverfull.json
+%%DATADIR%%/json/mapgen/house/house_rv.json
+%%DATADIR%%/json/mapgen/house/house_suicide.json
+%%DATADIR%%/json/mapgen/house/house_tool_shed.json
 %%DATADIR%%/json/mapgen/jewel_store.json
+%%DATADIR%%/json/mapgen/laundromat.json
+%%DATADIR%%/json/mapgen/library1.json
+%%DATADIR%%/json/mapgen/library2.json
+%%DATADIR%%/json/mapgen/lmoe.json
+%%DATADIR%%/json/mapgen/lmoe_under01.json
+%%DATADIR%%/json/mapgen/lmoe_under02.json
 %%DATADIR%%/json/mapgen/mall.json
+%%DATADIR%%/json/mapgen/mansion/mansion.json
+%%DATADIR%%/json/mapgen/mapgen-test.json
 %%DATADIR%%/json/mapgen/meth_lab.json
+%%DATADIR%%/json/mapgen/mortuary.json
 %%DATADIR%%/json/mapgen/motel.json
+%%DATADIR%%/json/mapgen/multistory_houses/house_2story_base_north.json
+%%DATADIR%%/json/mapgen/multistory_houses/house_2story_second.json
 %%DATADIR%%/json/mapgen/museum.json
-%%DATADIR%%/json/mapgen/necropolis.json
-%%DATADIR%%/json/mapgen/necropolisB1.json
+%%DATADIR%%/json/mapgen/musicstore.json
+%%DATADIR%%/json/mapgen/necropolis/necropolis.json
+%%DATADIR%%/json/mapgen/necropolis/necropolisB1.json
+%%DATADIR%%/json/mapgen/necropolis/necropolisB2.json
+%%DATADIR%%/json/mapgen/necropolis/necropolisB3.json
+%%DATADIR%%/json/mapgen/office_cubical.json
+%%DATADIR%%/json/mapgen/office_doctor.json
 %%DATADIR%%/json/mapgen/office_tower_2.json
+%%DATADIR%%/json/mapgen/orchard_apple.json
+%%DATADIR%%/json/mapgen/park.json
+%%DATADIR%%/json/mapgen/parks_recreation/art_gallery.json
+%%DATADIR%%/json/mapgen/parks_recreation/cemetery_small.json
+%%DATADIR%%/json/mapgen/parks_recreation/derelict_property.json
+%%DATADIR%%/json/mapgen/parks_recreation/dispensary.json
+%%DATADIR%%/json/mapgen/parks_recreation/fishing_pond0_0.json
+%%DATADIR%%/json/mapgen/parks_recreation/fishing_pond0_1.json
+%%DATADIR%%/json/mapgen/parks_recreation/fishing_pond1_0.json
+%%DATADIR%%/json/mapgen/parks_recreation/fishing_pond1_1.json
+%%DATADIR%%/json/mapgen/parks_recreation/hunting_blind.json
+%%DATADIR%%/json/mapgen/parks_recreation/orchard.json
+%%DATADIR%%/json/mapgen/parks_recreation/pavilion.json
+%%DATADIR%%/json/mapgen/parks_recreation/skate_park.json
+%%DATADIR%%/json/mapgen/parks_recreation/small_office.json
+%%DATADIR%%/json/mapgen/parks_recreation/small_storage_units.json
+%%DATADIR%%/json/mapgen/parks_recreation/small_wooded_trail.json
+%%DATADIR%%/json/mapgen/parks_recreation/state_park0_0.json
+%%DATADIR%%/json/mapgen/parks_recreation/state_park0_1.json
+%%DATADIR%%/json/mapgen/parks_recreation/state_park1_0.json
+%%DATADIR%%/json/mapgen/parks_recreation/state_park1_1.json
 %%DATADIR%%/json/mapgen/pharmacy_1.json
 %%DATADIR%%/json/mapgen/pharmacy_1_open.json
 %%DATADIR%%/json/mapgen/pizza_parlor.json
+%%DATADIR%%/json/mapgen/ponds.json
+%%DATADIR%%/json/mapgen/pool.json
 %%DATADIR%%/json/mapgen/power_station_large.json
 %%DATADIR%%/json/mapgen/power_station_small.json
+%%DATADIR%%/json/mapgen/prison_1.json
+%%DATADIR%%/json/mapgen/public_works.json
+%%DATADIR%%/json/mapgen/pump_station.json
+%%DATADIR%%/json/mapgen/radio_tower.json
+%%DATADIR%%/json/mapgen/ranch_camp.json
 %%DATADIR%%/json/mapgen/restaurant.json
 %%DATADIR%%/json/mapgen/restaurant2.json
 %%DATADIR%%/json/mapgen/restaurant_fast.json
+%%DATADIR%%/json/mapgen/river_shipwreck.json
+%%DATADIR%%/json/mapgen/road_4way.json
+%%DATADIR%%/json/mapgen/roadstop.json
+%%DATADIR%%/json/mapgen/roadstop_a.json
+%%DATADIR%%/json/mapgen/roadstop_b.json
 %%DATADIR%%/json/mapgen/s_gas_rural.json
+%%DATADIR%%/json/mapgen/s_gun0.json
+%%DATADIR%%/json/mapgen/s_library.json
+%%DATADIR%%/json/mapgen/s_liquor.json
 %%DATADIR%%/json/mapgen/sai.json
+%%DATADIR%%/json/mapgen/school_1.json
+%%DATADIR%%/json/mapgen/shelter.json
+%%DATADIR%%/json/mapgen/small_town_buildings/bakery.json
+%%DATADIR%%/json/mapgen/small_town_buildings/candy_shop.json
+%%DATADIR%%/json/mapgen/small_town_buildings/construction_site.json
+%%DATADIR%%/json/mapgen/small_town_buildings/icecream_shop.json
+%%DATADIR%%/json/mapgen/small_town_buildings/lumberyard_0_0.json
+%%DATADIR%%/json/mapgen/small_town_buildings/lumberyard_0_1.json
+%%DATADIR%%/json/mapgen/small_town_buildings/lumberyard_1_0.json
+%%DATADIR%%/json/mapgen/small_town_buildings/lumberyard_1_1.json
+%%DATADIR%%/json/mapgen/small_town_buildings/post_office.json
+%%DATADIR%%/json/mapgen/standing_stones.json
+%%DATADIR%%/json/mapgen/sub_station.json
+%%DATADIR%%/json/mapgen/subway_tunnels.json
+%%DATADIR%%/json/mapgen/sugar_house.json
+%%DATADIR%%/json/mapgen/swamp_shack.json
+%%DATADIR%%/json/mapgen/teashop.json
+%%DATADIR%%/json/mapgen/triffid_grove.json
+%%DATADIR%%/json/mapgen/veterinarian.json
 %%DATADIR%%/json/mapgen/warehouse.json
+%%DATADIR%%/json/mapgen_palettes/basement.json
+%%DATADIR%%/json/mapgen_palettes/church.json
+%%DATADIR%%/json/mapgen_palettes/hospital.json
+%%DATADIR%%/json/mapgen_palettes/houses_multistory.json
+%%DATADIR%%/json/mapgen_palettes/lumberyard.json
+%%DATADIR%%/json/mapgen_palettes/mansion.json
+%%DATADIR%%/json/mapgen_palettes/office_doctor.json
+%%DATADIR%%/json/mapgen_palettes/shelter.json
+%%DATADIR%%/json/mapgen_palettes/subway.json
 %%DATADIR%%/json/martialarts.json
 %%DATADIR%%/json/materials.json
+%%DATADIR%%/json/monster_attacks.json
 %%DATADIR%%/json/monster_drops.json
 %%DATADIR%%/json/monster_factions.json
+%%DATADIR%%/json/monsterdrops/zombie_cop.json
+%%DATADIR%%/json/monsterdrops/zombie_soldier.json
+%%DATADIR%%/json/monsterdrops/zombie_survivor.json
+%%DATADIR%%/json/monsterdrops/zombie_technician.json
 %%DATADIR%%/json/monstergroups.json
 %%DATADIR%%/json/monsters.json
+%%DATADIR%%/json/monsters/defense_bot.json
+%%DATADIR%%/json/monsters/drones.json
+%%DATADIR%%/json/monsters/fish.json
+%%DATADIR%%/json/monsters/military.json
+%%DATADIR%%/json/monsters/obsolete.json
+%%DATADIR%%/json/monsters/zed_children.json
+%%DATADIR%%/json/monsters/zed_explosive.json
+%%DATADIR%%/json/morale_types.json
+%%DATADIR%%/json/multitile_buildings_terrain.json
+%%DATADIR%%/json/multitile_city_buildings.json
+%%DATADIR%%/json/mutation_category.json
+%%DATADIR%%/json/mutation_ordering.json
 %%DATADIR%%/json/mutations.json
 %%DATADIR%%/json/npcs/NC_ARSONIST.json
+%%DATADIR%%/json/npcs/NC_BARTENDER.json
 %%DATADIR%%/json/npcs/NC_BOUNTY_HUNTER.json
 %%DATADIR%%/json/npcs/NC_COWBOY.json
+%%DATADIR%%/json/npcs/NC_DEBUG.json
 %%DATADIR%%/json/npcs/NC_DOCTOR.json
 %%DATADIR%%/json/npcs/NC_EVAC_SHOPKEEP.json
 %%DATADIR%%/json/npcs/NC_HACKER.json
 %%DATADIR%%/json/npcs/NC_HUNTER.json
+%%DATADIR%%/json/npcs/NC_JUNK_SHOPKEEP.json
 %%DATADIR%%/json/npcs/NC_NINJA.json
 %%DATADIR%%/json/npcs/NC_SCAVENGER.json
 %%DATADIR%%/json/npcs/NC_SCIENTIST.json
+%%DATADIR%%/json/npcs/NC_SOLDIER.json
 %%DATADIR%%/json/npcs/NC_THUG.json
 %%DATADIR%%/json/npcs/NC_TRADER.json
+%%DATADIR%%/json/npcs/TALK_ARSONIST.json
+%%DATADIR%%/json/npcs/TALK_COMMON.json
+%%DATADIR%%/json/npcs/TALK_EVAC_GUARD1.json
+%%DATADIR%%/json/npcs/TALK_EVAC_GUARD2.json
+%%DATADIR%%/json/npcs/TALK_EVAC_GUARD3.json
+%%DATADIR%%/json/npcs/TALK_EVAC_HUNTER.json
+%%DATADIR%%/json/npcs/TALK_EVAC_MERCHANT.json
+%%DATADIR%%/json/npcs/TALK_OLD_GUARD_REP.json
+%%DATADIR%%/json/npcs/TALK_SCAVENGER_MERC.json
+%%DATADIR%%/json/npcs/classes.json
+%%DATADIR%%/json/npcs/epilogues.json
 %%DATADIR%%/json/npcs/factions.json
 %%DATADIR%%/json/npcs/items_generic.json
+%%DATADIR%%/json/npcs/missiondef.json
 %%DATADIR%%/json/npcs/npc.json
+%%DATADIR%%/json/npcs/talk_tags.json
+%%DATADIR%%/json/overmap_connections.json
+%%DATADIR%%/json/overmap_locations.json
 %%DATADIR%%/json/overmap_specials.json
 %%DATADIR%%/json/overmap_terrain.json
-%%LUA%%%%DATADIR%%/json/preload.lua
+%%DATADIR%%/json/player_activities.json
 %%DATADIR%%/json/professions.json
+%%DATADIR%%/json/recipes/ammo/components.json
+%%DATADIR%%/json/recipes/ammo/grenades.json
+%%DATADIR%%/json/recipes/ammo/pistol.json
+%%DATADIR%%/json/recipes/ammo/rifle.json
+%%DATADIR%%/json/recipes/ammo/shot.json
+%%DATADIR%%/json/recipes/armor/arms.json
+%%DATADIR%%/json/recipes/armor/feet.json
+%%DATADIR%%/json/recipes/armor/hands.json
+%%DATADIR%%/json/recipes/armor/head.json
+%%DATADIR%%/json/recipes/armor/legs.json
+%%DATADIR%%/json/recipes/armor/other.json
+%%DATADIR%%/json/recipes/armor/storage.json
+%%DATADIR%%/json/recipes/armor/suit.json
+%%DATADIR%%/json/recipes/armor/torso.json
+%%DATADIR%%/json/recipes/chem/fuel.json
+%%DATADIR%%/json/recipes/chem/other.json
+%%DATADIR%%/json/recipes/electronics/parts.json
+%%DATADIR%%/json/recipes/electronics/toolmod.json
+%%DATADIR%%/json/recipes/food/brewing.json
+%%DATADIR%%/json/recipes/food/distill.json
+%%DATADIR%%/json/recipes/food/dry.json
+%%DATADIR%%/json/recipes/food/pasta.json
+%%DATADIR%%/json/recipes/food/seed.json
+%%DATADIR%%/json/recipes/other/containers.json
+%%DATADIR%%/json/recipes/other/materials.json
+%%DATADIR%%/json/recipes/other/medical.json
+%%DATADIR%%/json/recipes/other/other.json
+%%DATADIR%%/json/recipes/other/parts.json
+%%DATADIR%%/json/recipes/other/tool.json
+%%DATADIR%%/json/recipes/other/vehicle.json
 %%DATADIR%%/json/recipes/recipe_ammo.json
-%%DATADIR%%/json/recipes/recipe_armor.json
 %%DATADIR%%/json/recipes/recipe_deconstruction.json
 %%DATADIR%%/json/recipes/recipe_electronics.json
 %%DATADIR%%/json/recipes/recipe_food.json
@@ -200,7 +632,23 @@ bin/cataclysm
 %%DATADIR%%/json/recipes/recipe_others.json
 %%DATADIR%%/json/recipes/recipe_weapon.json
 %%DATADIR%%/json/recipes/recipes.json
+%%DATADIR%%/json/recipes/weapon/bashing.json
+%%DATADIR%%/json/recipes/weapon/cutting.json
+%%DATADIR%%/json/recipes/weapon/explosive.json
+%%DATADIR%%/json/recipes/weapon/magazines.json
+%%DATADIR%%/json/recipes/weapon/mods.json
+%%DATADIR%%/json/recipes/weapon/piercing.json
+%%DATADIR%%/json/recipes/weapon/ranged.json
 %%DATADIR%%/json/regional_map_settings.json
+%%DATADIR%%/json/requirements/ammo.json
+%%DATADIR%%/json/requirements/cooking_components.json
+%%DATADIR%%/json/requirements/cooking_tools.json
+%%DATADIR%%/json/requirements/materials.json
+%%DATADIR%%/json/requirements/toolsets.json
+%%DATADIR%%/json/requirements/uncraft.json
+%%DATADIR%%/json/requirements/vehicle.json
+%%DATADIR%%/json/road_vehicles.json
+%%DATADIR%%/json/rotatable_symbols.json
 %%DATADIR%%/json/scenarios/scenarios.json
 %%DATADIR%%/json/skills.json
 %%DATADIR%%/json/snippets.json
@@ -209,20 +657,55 @@ bin/cataclysm
 %%DATADIR%%/json/start_locations.json
 %%DATADIR%%/json/techniques.json
 %%DATADIR%%/json/terrain.json
-%%DATADIR%%/json/terrain/ags_terrain.json
 %%DATADIR%%/json/test_regions.json
 %%DATADIR%%/json/tool_qualities.json
 %%DATADIR%%/json/traps.json
 %%DATADIR%%/json/tutorial.json
+%%DATADIR%%/json/uncraft/ammo/38.json
+%%DATADIR%%/json/uncraft/ammo/40.json
+%%DATADIR%%/json/uncraft/ammo/45.json
+%%DATADIR%%/json/uncraft/ammo/762x25.json
+%%DATADIR%%/json/uncraft/ammo/9mm.json
+%%DATADIR%%/json/uncraft/ammo/flintlock.json
+%%DATADIR%%/json/uncraft/ammo/shot.json
+%%DATADIR%%/json/uncraft/classes/ammo.json
+%%DATADIR%%/json/uncraft/generic.json
+%%DATADIR%%/json/uncraft/vehicle/alternator.json
+%%DATADIR%%/json/uncraft/weapon/explosive.json
+%%DATADIR%%/json/vehicle_groups.json
 %%DATADIR%%/json/vehicle_parts.json
+%%DATADIR%%/json/vehicleparts/alternator.json
+%%DATADIR%%/json/vehicleparts/battery.json
+%%DATADIR%%/json/vehicleparts/boards.json
+%%DATADIR%%/json/vehicleparts/combustion.json
+%%DATADIR%%/json/vehicleparts/engineering.json
+%%DATADIR%%/json/vehicleparts/frames.json
+%%DATADIR%%/json/vehicleparts/lights.json
+%%DATADIR%%/json/vehicleparts/manual.json
+%%DATADIR%%/json/vehicleparts/motor.json
+%%DATADIR%%/json/vehicleparts/tanks.json
+%%DATADIR%%/json/vehicleparts/turret.json
+%%DATADIR%%/json/vehicleparts/wheel.json
+%%DATADIR%%/json/vehicles/bikes.json
+%%DATADIR%%/json/vehicles/cars.json
+%%DATADIR%%/json/vehicles/carts.json
+%%DATADIR%%/json/vehicles/custom_vehicles.json
+%%DATADIR%%/json/vehicles/emergency.json
+%%DATADIR%%/json/vehicles/farm.json
+%%DATADIR%%/json/vehicles/military.json
+%%DATADIR%%/json/vehicles/trucks.json
+%%DATADIR%%/json/vehicles/utility.json
+%%DATADIR%%/json/vehicles/vans_busses.json
 %%DATADIR%%/json/vehicles/vehicles.json
+%%DATADIR%%/json/vitamin.json
 %%LUA%%%%DATADIR%%/lua/autoexec.lua
 %%LUA%%%%DATADIR%%/lua/class_definitions.lua
 %%DATADIR%%/mods/Animatronics/animatronics.json
 %%DATADIR%%/mods/Animatronics/bankrupt_pizzeria.json
 %%DATADIR%%/mods/Animatronics/dead_animatronics.json
 %%DATADIR%%/mods/Animatronics/modinfo.json
-%%DATADIR%%/mods/Animatronics/regional_map_settings.json
+%%DATADIR%%/mods/Animatronics/regional_overlay.json
+%%DATADIR%%/mods/Animatronics/snippets.json
 %%DATADIR%%/mods/Animatronics/speech.json
 %%DATADIR%%/mods/Boats/b_inflatable_boat_parts.json
 %%DATADIR%%/mods/Boats/b_item_groups.json
@@ -233,127 +716,1150 @@ bin/cataclysm
 %%DATADIR%%/mods/Boats/b_vehicles.json
 %%DATADIR%%/mods/Boats/b_wooden_boat_parts.json
 %%DATADIR%%/mods/Boats/modinfo.json
+%%DATADIR%%/mods/BrightNights/effects.json
+%%DATADIR%%/mods/BrightNights/gun.json
+%%DATADIR%%/mods/BrightNights/item groups/locations.json
+%%DATADIR%%/mods/BrightNights/item_groups.json
+%%DATADIR%%/mods/BrightNights/items/books.json
+%%DATADIR%%/mods/BrightNights/items/generic.json
+%%DATADIR%%/mods/BrightNights/mapgen/map_palletes.json
+%%DATADIR%%/mods/BrightNights/mapgen/municipal_microreactor.json
+%%DATADIR%%/mods/BrightNights/mapgen/s_gas.json
+%%DATADIR%%/mods/BrightNights/misc.json
+%%DATADIR%%/mods/BrightNights/modinfo.json
+%%DATADIR%%/mods/BrightNights/overmap_specials.json
+%%DATADIR%%/mods/BrightNights/overmap_terrain.json
+%%DATADIR%%/mods/BrightNights/recipe.json
+%%DATADIR%%/mods/BrightNights/regional_map_settings.json
+%%DATADIR%%/mods/BrightNights/terrain.json
+%%DATADIR%%/mods/BrightNights/vehicle_groups.json
+%%DATADIR%%/mods/BrightNights/vehicle_parts.json

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list