Looks like cataclysm has been passing in the bulk builds so I feel comfortble updating. Been playing this build for a bit to make sure there are no major bugs.
Tim. Index: Makefile =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile 23 Nov 2017 05:04:43 -0000 1.2 +++ Makefile 23 Dec 2017 22:20:41 -0000 @@ -1,13 +1,12 @@ # $OpenBSD: Makefile,v 1.2 2017/11/23 05:04:43 kirby Exp $ COMMENT= rogue-like zombie survival game -DISTNAME= cataclysm-dda-2017.10.13 +DISTNAME= cataclysm-dda-2017.12.14 CATEGORIES= games -REVISION= 0 GH_ACCOUNT= CleverRaven GH_PROJECT= Cataclysm-DDA -GH_COMMIT= f3fabc4047fadb4bcb4707d9d6b3bd7ff77e557c +GH_COMMIT= a2cff93463812d7d318c23db864cad7dfef992bd HOMEPAGE= http://en.cataclysmdda.com MAINTAINER= Tim Meunier <tro...@kagu-tsuchi.com> @@ -38,7 +37,7 @@ MAKE_FLAGS= RELEASE=1 USE_XDG_DIR=1 LOC LUA=1 LUA_BINARY=${MODLUA_BIN:T} .if ${FLAVOR:Mno_x11} -WANTLIB+= ncurses +WANTLIB+= curses .else WANTLIB+= SDL2 SDL2_image SDL2_mixer SDL2_ttf Index: distinfo =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 29 Oct 2017 17:27:18 -0000 1.1.1.1 +++ distinfo 23 Dec 2017 22:20:41 -0000 @@ -1,2 +1,2 @@ -SHA256 (cataclysm-dda-2017.10.13-f3fabc40.tar.gz) = gb6NEw+RUFg+qnRFLj0Iebol3kUnov7Lyy2MXJoIv2U= -SIZE (cataclysm-dda-2017.10.13-f3fabc40.tar.gz) = 56255948 +SHA256 (cataclysm-dda-2017.12.14-a2cff934.tar.gz) = ZWERVchcr/nYXdtKV2j9T1lExnlP1mte4lTut00IzqI= +SIZE (cataclysm-dda-2017.12.14-a2cff934.tar.gz) = 55792459 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-Makefile --- patches/patch-Makefile 23 Nov 2017 05:04:43 -0000 1.2 +++ patches/patch-Makefile 23 Dec 2017 22:20:41 -0000 @@ -49,7 +49,7 @@ Index: Makefile PKG_CONFIG = $(CROSS)pkg-config SDL2_CONFIG = $(CROSS)sdl2-config -@@ -696,7 +689,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS) +@@ -706,7 +699,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS) .PHONY: version json-verify version: @( VERSION_STRING=$(VERSION) ; \ @@ -57,7 +57,7 @@ Index: Makefile [ -e "$(SRC_DIR)/version.h" ] && OLDVERSION=$$(grep VERSION $(SRC_DIR)/version.h|cut -d '"' -f2) ; \ if [ "x$$VERSION_STRING" != "x$$OLDVERSION" ]; then echo "#define VERSION \"$$VERSION_STRING\"" | tee $(SRC_DIR)/version.h ; fi \ ) -@@ -750,35 +742,35 @@ distclean: +@@ -760,35 +752,35 @@ distclean: bindist: $(BINDIST) ifeq ($(TARGETSYSTEM), LINUX) @@ -112,24 +112,15 @@ Index: Makefile mkdir -p $(LOCALE_DIR) ifdef LANGUAGES LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES) -@@ -947,11 +939,6 @@ astyle-all: $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR +@@ -956,11 +948,6 @@ astyle: $(ASTYLED_WHITELIST) + astyle-all: $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR) $(TOOLSRC) $(ASTYLE_BINARY) --options=.astylerc -n $(SOURCES) $(HEADERS) $(ASTYLE_BINARY) --options=.astylerc -n $(TESTSRC) $(TESTHDR) - +- -# Test whether the system has a version of astyle that supports --dry-run -ifeq ($(shell if $(ASTYLE_BINARY) -Q -X --dry-run src/game.h > /dev/null; then echo foo; fi),foo) -ASTYLE_CHECK=$(shell LC_ALL=C $(ASTYLE_BINARY) --options=.astylerc --dry-run -X -Q $(ASTYLED_WHITELIST)) -endif -- + astyle-check: ifdef ASTYLE_CHECK - @if [ "$(findstring Formatted,$(ASTYLE_CHECK))" = "" ]; then echo "no astyle regressions";\ -@@ -961,7 +948,7 @@ else - endif - - style-json: json_whitelist json_formatter -- xargs -a json_whitelist -L 1 tools/format/json_formatter.cgi -+ cat json_whitelist | xargs -L 1 tools/format/json_formatter.cgi - - style-all-json: json_formatter - find data -name "*.json" -print0 | xargs -0 -L 1 tools/format/json_formatter.cgi Index: patches/patch-src_translations_cpp =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-src_translations_cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_translations_cpp --- patches/patch-src_translations_cpp 23 Nov 2017 05:04:43 -0000 1.1 +++ patches/patch-src_translations_cpp 23 Dec 2017 22:20:41 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-src_translations_cpp,v 1 Index: src/translations.cpp --- src/translations.cpp.orig +++ src/translations.cpp -@@ -80,7 +80,7 @@ void set_language() +@@ -176,7 +176,7 @@ void set_language() // Step 2. Bind to gettext domain. std::string locale_dir; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 29 Oct 2017 17:27:19 -0000 1.1.1.1 +++ pkg/PLIST 23 Dec 2017 22:20:41 -0000 @@ -251,6 +251,7 @@ share/cataclysm-dda/json/items/magazine/ share/cataclysm-dda/json/items/melee.json share/cataclysm-dda/json/items/migration.json share/cataclysm-dda/json/items/newspaper.json +share/cataclysm-dda/json/items/obsolete.json share/cataclysm-dda/json/items/ranged.json share/cataclysm-dda/json/items/resources/ share/cataclysm-dda/json/items/resources/metals.json @@ -293,12 +294,14 @@ share/cataclysm-dda/json/mapgen/basement share/cataclysm-dda/json/mapgen/basement/basement_guns.json share/cataclysm-dda/json/mapgen/basement/basement_survival.json share/cataclysm-dda/json/mapgen/basement/basement_weed.json +share/cataclysm-dda/json/mapgen/bike_shop.json share/cataclysm-dda/json/mapgen/bookstore1.json share/cataclysm-dda/json/mapgen/bookstore2.json share/cataclysm-dda/json/mapgen/bookstore3.json share/cataclysm-dda/json/mapgen/bowling_alley.json share/cataclysm-dda/json/mapgen/boxing.json share/cataclysm-dda/json/mapgen/bunker.json +share/cataclysm-dda/json/mapgen/butcher.json share/cataclysm-dda/json/mapgen/cabin00.json share/cataclysm-dda/json/mapgen/cabin03.json share/cataclysm-dda/json/mapgen/cabin_strange.json @@ -393,6 +396,9 @@ share/cataclysm-dda/json/mapgen/mapgen-t share/cataclysm-dda/json/mapgen/meth_lab.json share/cataclysm-dda/json/mapgen/mortuary.json share/cataclysm-dda/json/mapgen/motel.json +share/cataclysm-dda/json/mapgen/multistory_houses/ +share/cataclysm-dda/json/mapgen/multistory_houses/house_2story_base_north.json +share/cataclysm-dda/json/mapgen/multistory_houses/house_2story_second.json share/cataclysm-dda/json/mapgen/museum.json share/cataclysm-dda/json/mapgen/musicstore.json share/cataclysm-dda/json/mapgen/necropolis/ @@ -463,6 +469,7 @@ share/cataclysm-dda/json/mapgen/warehous share/cataclysm-dda/json/mapgen_palettes/ share/cataclysm-dda/json/mapgen_palettes/basement.json share/cataclysm-dda/json/mapgen_palettes/church.json +share/cataclysm-dda/json/mapgen_palettes/houses_multistory.json share/cataclysm-dda/json/mapgen_palettes/mansion.json share/cataclysm-dda/json/mapgen_palettes/office_doctor.json share/cataclysm-dda/json/martialarts.json @@ -486,6 +493,8 @@ share/cataclysm-dda/json/monsters/obsole share/cataclysm-dda/json/monsters/zed_children.json share/cataclysm-dda/json/monsters/zed_explosive.json share/cataclysm-dda/json/morale_types.json +share/cataclysm-dda/json/multitile_buildings_terrain.json +share/cataclysm-dda/json/multitile_city_buildings.json share/cataclysm-dda/json/mutation_category.json share/cataclysm-dda/json/mutation_ordering.json share/cataclysm-dda/json/mutations.json @@ -701,8 +710,10 @@ share/cataclysm-dda/mods/Craft_Gunpowder share/cataclysm-dda/mods/Craft_Gunpowder/cgp_recipes.json share/cataclysm-dda/mods/Craft_Gunpowder/modinfo.json share/cataclysm-dda/mods/CrazyCataclysm/ +share/cataclysm-dda/mods/CrazyCataclysm/aperturepotato.json share/cataclysm-dda/mods/CrazyCataclysm/items.json share/cataclysm-dda/mods/CrazyCataclysm/modinfo.json +share/cataclysm-dda/mods/CrazyCataclysm/speech.json share/cataclysm-dda/mods/DeoxyMod/ share/cataclysm-dda/mods/DeoxyMod/Deoxy_vehicle_parts.json share/cataclysm-dda/mods/DeoxyMod/modinfo.json @@ -720,7 +731,6 @@ share/cataclysm-dda/mods/EW_Pack/ew_book share/cataclysm-dda/mods/EW_Pack/ew_bullet_pulling.json share/cataclysm-dda/mods/EW_Pack/ew_item_groups.json share/cataclysm-dda/mods/EW_Pack/ew_magazines.json -share/cataclysm-dda/mods/EW_Pack/ew_mods.json share/cataclysm-dda/mods/EW_Pack/ew_recipes.json share/cataclysm-dda/mods/EW_Pack/ew_retool.json share/cataclysm-dda/mods/EW_Pack/ew_weapons.json @@ -785,6 +795,7 @@ share/cataclysm-dda/mods/More_Buildings/ share/cataclysm-dda/mods/More_Buildings/json/baseballfield_b1.json share/cataclysm-dda/mods/More_Buildings/json/baseballfield_b2.json share/cataclysm-dda/mods/More_Buildings/json/daycare.json +share/cataclysm-dda/mods/More_Buildings/json/map_palletes.json share/cataclysm-dda/mods/More_Buildings/json/petstore.json share/cataclysm-dda/mods/More_Buildings/json/restparking_1.json share/cataclysm-dda/mods/More_Buildings/json/restparking_2.json @@ -814,6 +825,240 @@ share/cataclysm-dda/mods/More_Buildings/ share/cataclysm-dda/mods/More_Buildings/overmap_terrain.json share/cataclysm-dda/mods/More_Buildings/regional_overlay.json share/cataclysm-dda/mods/More_Locations/ +share/cataclysm-dda/mods/More_Locations/bandit_tower/ +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1blc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1blc_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1blc_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1blc_04.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1blc_05.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1brc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1brc_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1brc_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1cyblc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1cybrc_00.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1cytlc_00.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1cytlc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1cytrc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1gate_00.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1gate_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1tlc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1tlc_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1tlc_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1trc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1trc_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1trc_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1ybe_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1ybe_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1ybe_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1yle_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1yle_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1yle_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1yre_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1yre_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1yre_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1yte_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1yte_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_1yte_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2blc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2blc_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2blc_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2blc_04.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2brc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2brc_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2brc_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2brc_04.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2brc_05.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2tlc_00.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2tlc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2tlc_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2tlc_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2tlc_04.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2tlc_05.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2tlc_07.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2trc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2trc_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2trc_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2trc_04.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_2trc_05.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3blc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3blc_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3blc_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3blc_04.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3blc_05.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3blc_06.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3brc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3brc_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3brc_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3brc_04.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3brc_05.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3brc_06.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3tlc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3tlc_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3tlc_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3tlc_04.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3tlc_05.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3tlc_06.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3trc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3trc_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3trc_03.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3trc_04.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3trc_05.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_3trc_06.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_4blc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_4blc_02.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_4brc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_4tlc_00.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_4tlc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_4trc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_ublc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_ubrc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_utlc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/bandit_tower_utrc_01.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/overmap_specials.json +share/cataclysm-dda/mods/More_Locations/bandit_tower/overmap_terrain.json +share/cataclysm-dda/mods/More_Locations/captive_faction/ +share/cataclysm-dda/mods/More_Locations/captive_faction/NC_CAPTIVE.json +share/cataclysm-dda/mods/More_Locations/captive_faction/NC_MUTANT_CAPTIVE.json +share/cataclysm-dda/mods/More_Locations/captive_faction/TALK_CAPTIVE.json +share/cataclysm-dda/mods/More_Locations/captive_faction/captive_classes.json +share/cataclysm-dda/mods/More_Locations/captive_faction/captive_item_groups.json +share/cataclysm-dda/mods/More_Locations/captive_faction/captive_npc.json +share/cataclysm-dda/mods/More_Locations/estate/ +share/cataclysm-dda/mods/More_Locations/estate/estate_1be_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1be_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1be_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1be_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1bloc_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1bloc_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1bloc_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1bloc_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1broc_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1broc_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1broc_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1broc_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1by_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1ica_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1ica_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1ica_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1ica_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1icb_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1icb_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1icb_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1icb_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1icc_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1icc_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1icc_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1icc_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1icd_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1icd_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1icd_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1icd_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1le_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1le_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1le_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1le_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1re_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1re_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1re_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1re_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1te_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1te_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1te_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1te_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1tloc_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1tloc_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1tloc_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1tloc_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1troc_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1troc_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1troc_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1troc_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_1ty_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2be_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2be_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2be_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2be_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2bloc.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2broc.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2broc_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2ica_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2ica_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2ica_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2ica_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2icb_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2icb_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2icb_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2icb_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2icc_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2icc_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2icc_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2icc_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2icd_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2icd_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2icd_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2icd_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2le_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2le_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2le_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2le_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2re_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2re_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2re_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2re_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2te_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2te_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2te_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2te_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2tloc_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2tloc_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2tloc_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2tloc_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2troc_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2troc_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2troc_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_2troc_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_00.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_02.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_03.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_04.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_05.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_06.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_07.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_08.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_09.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_10.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_11.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_12.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_13.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_14.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_15.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_16.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_17.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_18.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_19.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_20.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_21.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_22.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_23.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_30.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_31.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_32.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_33.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_34.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_35.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_36.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_37.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_38.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_39.json +share/cataclysm-dda/mods/More_Locations/estate/estate_mid_40.json +share/cataclysm-dda/mods/More_Locations/estate/estate_ube_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_ule_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_umid_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_ure_01.json +share/cataclysm-dda/mods/More_Locations/estate/estate_ute_01.json +share/cataclysm-dda/mods/More_Locations/estate/overmap_specials.json +share/cataclysm-dda/mods/More_Locations/estate/overmap_terrain.json share/cataclysm-dda/mods/More_Locations/factions.json share/cataclysm-dda/mods/More_Locations/factory/ share/cataclysm-dda/mods/More_Locations/factory/factory_be_01.json @@ -921,10 +1166,14 @@ share/cataclysm-dda/mods/More_Locations/ share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_3c_04.json share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_3c_05.json share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ube_00.json -share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ube_01.json -share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ube_02.json -share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ube_03.json -share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ube_04.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ubea_01.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ubea_02.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ubea_03.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ubea_04.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ubeb_01.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ubeb_02.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ubeb_03.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ubeb_04.json share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ublc_00.json share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ublc_01.json share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ublc_02.json @@ -951,11 +1200,16 @@ share/cataclysm-dda/mods/More_Locations/ share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ure_02.json share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ure_03.json share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ure_04.json -share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ute_00.json -share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ute_01.json -share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ute_02.json -share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ute_03.json -share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_ute_04.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_utea_00.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_utea_01.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_utea_02.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_utea_03.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_utea_04.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_uteb_00.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_uteb_01.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_uteb_02.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_uteb_03.json +share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_uteb_04.json share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_utlc_00.json share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_utlc_01.json share/cataclysm-dda/mods/More_Locations/military_outpost/mil_outpost_utlc_02.json @@ -1063,7 +1317,7 @@ share/cataclysm-dda/mods/More_Locations/ share/cataclysm-dda/mods/More_Locations/multistory_houses/3story_houses/3storyA_basement_01.json share/cataclysm-dda/mods/More_Locations/multistory_houses/3story_houses/3storyA_basement_02.json share/cataclysm-dda/mods/More_Locations/multistory_houses/3story_houses/3storyA_basement_03.json -share/cataclysm-dda/mods/More_Locations/multistory_houses/3story_houses/3storyA_basement_04j.json +share/cataclysm-dda/mods/More_Locations/multistory_houses/3story_houses/3storyA_basement_04.json share/cataclysm-dda/mods/More_Locations/multistory_houses/3story_houses/3storyA_basement_05.json share/cataclysm-dda/mods/More_Locations/multistory_houses/3story_houses/3storyA_first_00.json share/cataclysm-dda/mods/More_Locations/multistory_houses/3story_houses/3storyA_first_01.json @@ -1275,8 +1529,100 @@ share/cataclysm-dda/mods/More_Locations/ share/cataclysm-dda/mods/More_Locations/multistory_houses/overmap_specials.json share/cataclysm-dda/mods/More_Locations/multistory_houses/overmap_terrain.json share/cataclysm-dda/mods/More_Locations/npc.json +share/cataclysm-dda/mods/More_Locations/refugee_faction/ +share/cataclysm-dda/mods/More_Locations/refugee_faction/NC_MUTANT_REFUGEE.json +share/cataclysm-dda/mods/More_Locations/refugee_faction/NC_REFUGEE.json +share/cataclysm-dda/mods/More_Locations/refugee_faction/NC_TALENTED_REFUGEE.json +share/cataclysm-dda/mods/More_Locations/refugee_faction/refugee_classes.json +share/cataclysm-dda/mods/More_Locations/refugee_faction/refugee_item_groups.json +share/cataclysm-dda/mods/More_Locations/refugee_faction/refugee_npc.json +share/cataclysm-dda/mods/More_Locations/refugee_faction/talk_flags.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/ +share/cataclysm-dda/mods/More_Locations/refugee_tower/overmap_specials.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/overmap_terrain.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_1blc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_1brc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_1cyblc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_1cybrc_00.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_1cytlc_00.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_1cytlc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_1cytrc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_1gate_00.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_1gate_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_1tlc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_1trc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_1ybe_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_1yle_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_1yre_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_1yte_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_2blc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_2brc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_2tlc_00.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_2tlc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_2trc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_3blc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_3brc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_3tlc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_3trc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_4blc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_4brc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_4tlc_00.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_4tlc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_4trc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_5blc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_5brc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_5tlc_00.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_5tlc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_5trc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_ublc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_ubrc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_utlc_01.json +share/cataclysm-dda/mods/More_Locations/refugee_tower/refugee_tower_utrc_01.json +share/cataclysm-dda/mods/More_Locations/secret_doors/ +share/cataclysm-dda/mods/More_Locations/secret_doors/demo_map1.json +share/cataclysm-dda/mods/More_Locations/secret_doors/demo_map2.json +share/cataclysm-dda/mods/More_Locations/secret_doors/readme.txt +share/cataclysm-dda/mods/More_Locations/secret_doors/secret_door_gates.json +share/cataclysm-dda/mods/More_Locations/secret_doors/secret_door_terrain.json share/cataclysm-dda/mods/More_Locations/snippets.json share/cataclysm-dda/mods/More_Locations/terrain.json +share/cataclysm-dda/mods/More_Locations/tpalettes.json +share/cataclysm-dda/mods/More_Locations/tri_tower/ +share/cataclysm-dda/mods/More_Locations/tri_tower/overmap_specials.json +share/cataclysm-dda/mods/More_Locations/tri_tower/overmap_terrain.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_1blc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_1brc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_1cyblc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_1cybrc_00.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_1cytlc_00.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_1cytlc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_1cytrc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_1gate_00.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_1gate_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_1tlc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_1trc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_1ybe_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_1yle_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_1yre_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_1yte_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_2blc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_2brc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_2tlc_00.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_2tlc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_2trc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_3blc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_3brc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_3tlc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_3trc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_4blc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_4brc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_4tlc_00.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_4tlc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_4trc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_ublc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_ubrc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_utlc_01.json +share/cataclysm-dda/mods/More_Locations/tri_tower/tri_tower_utrc_01.json share/cataclysm-dda/mods/More_Survival_Tools/ share/cataclysm-dda/mods/More_Survival_Tools/ammo.json share/cataclysm-dda/mods/More_Survival_Tools/ammo_types.json @@ -1438,6 +1784,18 @@ share/cataclysm-dda/mods/Z-Level_Buildin share/cataclysm-dda/mods/Zombie_Nightvision/ share/cataclysm-dda/mods/Zombie_Nightvision/main.lua share/cataclysm-dda/mods/Zombie_Nightvision/modinfo.json +share/cataclysm-dda/mods/alt_map_key/ +share/cataclysm-dda/mods/alt_map_key/modinfo.json +share/cataclysm-dda/mods/alt_map_key/overmap_terrain.json +share/cataclysm-dda/mods/alt_map_key/readme.txt +share/cataclysm-dda/mods/bio_mod/ +share/cataclysm-dda/mods/bio_mod/b_bio_tools.json +share/cataclysm-dda/mods/bio_mod/b_bio_weapons.json +share/cataclysm-dda/mods/bio_mod/b_bionics.json +share/cataclysm-dda/mods/bio_mod/b_cbm.json +share/cataclysm-dda/mods/bio_mod/b_item_groups.json +share/cataclysm-dda/mods/bio_mod/b_professions.json +share/cataclysm-dda/mods/bio_mod/modinfo.json share/cataclysm-dda/mods/blazemod/ share/cataclysm-dda/mods/blazemod/PAQ.txt share/cataclysm-dda/mods/blazemod/blaze_ammo.json
