Again, many updates since the last port update. Development is moving towards the next release so this pulls from the 0.D branch instead of master. 0.D will be the next release and has reached feature freeze so subsequent port updates will track the 0.D branch for bug fixes.
Tim. Index: Makefile =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile 3 Dec 2018 08:43:56 -0000 1.7 +++ Makefile 9 Feb 2019 21:53:58 -0000 @@ -1,12 +1,12 @@ # $OpenBSD: Makefile,v 1.7 2018/12/03 08:43:56 kirby Exp $ COMMENT= rogue-like zombie survival game -DISTNAME= cataclysm-dda-2018.11.01 +DISTNAME= cataclysm-dda-2019.02.08 CATEGORIES= games GH_ACCOUNT= CleverRaven GH_PROJECT= Cataclysm-DDA -GH_COMMIT= 473c84e270095e8095d5e00d8af8ddba012d9286 +GH_COMMIT= 4fd9499fed5caf477fb9abe0eaf0e76ba0323487 HOMEPAGE= http://en.cataclysmdda.com MAINTAINER= Tim Meunier <tro...@kagu-tsuchi.com> @@ -18,7 +18,7 @@ FLAVORS= no_x11 FLAVOR?= WANTLIB= ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} c \ - iconv intl m pthread + execinfo iconv intl m pthread COMPILER= base-clang ports-gcc @@ -29,7 +29,7 @@ MODLUA_SA= Yes BUILD_DEPENDS= devel/libexecinfo -LIB_DEPENDS= devel/gettext +LIB_DEPENDS= devel/libexecinfo devel/gettext MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" Index: distinfo =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 3 Dec 2018 08:43:56 -0000 1.6 +++ distinfo 9 Feb 2019 21:53:58 -0000 @@ -1,2 +1,2 @@ -SHA256 (cataclysm-dda-2018.11.01-473c84e2.tar.gz) = g0APey4DAnW6/b9vDYzNFgybfnVUx5NSIzXxWstHNDM= -SIZE (cataclysm-dda-2018.11.01-473c84e2.tar.gz) = 71795769 +SHA256 (cataclysm-dda-2019.02.08-4fd9499f.tar.gz) = b+CNCSP2wLKgsUWX9FvNzDl2Jn1J1+96ra9LfthApPo= +SIZE (cataclysm-dda-2019.02.08-4fd9499f.tar.gz) = 83424764 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-Makefile,v retrieving revision 1.7 diff -u -p -r1.7 patch-Makefile --- patches/patch-Makefile 3 Dec 2018 08:43:56 -0000 1.7 +++ patches/patch-Makefile 9 Feb 2019 21:53:58 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.7 2018/12/0 Index: Makefile --- Makefile.orig +++ Makefile -@@ -84,7 +84,6 @@ +@@ -86,7 +86,6 @@ # RELEASE is flags for release builds, this disables some debugging flags and # enforces build failure when warnings are encountered. # We want to error on everything to make sure we don't check in code with new warnings. @@ -11,7 +11,7 @@ Index: Makefile WARNINGS = -Wall -Wextra # Uncomment below to disable warnings #WARNINGS = -w -@@ -254,7 +253,6 @@ ifdef RELEASE +@@ -276,7 +275,6 @@ ifdef RELEASE OPTLEVEL = -O3 endif endif @@ -19,16 +19,16 @@ Index: Makefile ifdef LTO LDFLAGS += -fuse-ld=gold -@@ -295,7 +293,7 @@ endif +@@ -317,7 +315,7 @@ endif ifeq ($(shell sh -c 'uname -o 2>/dev/null || echo not'),Cygwin) - OTHERS += -std=gnu++11 - else -- OTHERS += -std=c++11 -+ OTHERS += -std=c++11 -I${LOCALBASE}/include + OTHERS += -std=gnu++11 + else +- OTHERS += -std=c++11 ++ OTHERS += -std=c++11 -I${LOCALBASE}/include endif CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS) -MMD -MP -@@ -440,11 +438,6 @@ ifdef MAPSIZE +@@ -462,11 +460,6 @@ ifdef MAPSIZE CXXFLAGS += -DMAPSIZE=$(MAPSIZE) endif @@ -40,7 +40,7 @@ Index: Makefile PKG_CONFIG = $(CROSS)pkg-config SDL2_CONFIG = $(CROSS)sdl2-config -@@ -754,7 +747,7 @@ ifdef LTO +@@ -780,7 +773,7 @@ ifdef LTO endif endif @@ -49,7 +49,7 @@ Index: Makefile @ $(TARGET): $(OBJS) -@@ -773,7 +766,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(OBJS) +@@ -799,7 +792,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(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 \ ) -@@ -827,36 +819,36 @@ distclean: +@@ -853,36 +845,36 @@ distclean: bindist: $(BINDIST) ifeq ($(TARGETSYSTEM), LINUX) @@ -114,14 +114,14 @@ Index: Makefile mkdir -p $(LOCALE_DIR) ifdef LANGUAGES LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES) -@@ -1029,11 +1021,6 @@ astyle: $(ASTYLED_WHITELIST) +@@ -1055,11 +1047,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)) +- ASTYLE_CHECK=$(shell LC_ALL=C $(ASTYLE_BINARY) --options=.astylerc --dry-run -X -Q $(ASTYLED_WHITELIST)) -endif astyle-check: Index: patches/patch-src_translations_cpp =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-src_translations_cpp,v retrieving revision 1.3 diff -u -p -r1.3 patch-src_translations_cpp --- patches/patch-src_translations_cpp 3 Dec 2018 08:43:56 -0000 1.3 +++ patches/patch-src_translations_cpp 9 Feb 2019 21:53:58 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-src_translations_cpp,v 1 Index: src/translations.cpp --- src/translations.cpp.orig +++ src/translations.cpp -@@ -190,7 +190,7 @@ void set_language() +@@ -195,7 +195,7 @@ void set_language() auto env = getenv( "LANGUAGE" ); locale_dir = std::string( FILENAMES["base_path"] + "lang/mo/" + ( env ? env : "none" ) + "/LC_MESSAGES/cataclysm-dda.mo" ); Index: pkg/PFRAG.no-no_x11 =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/pkg/PFRAG.no-no_x11,v retrieving revision 1.3 diff -u -p -r1.3 PFRAG.no-no_x11 --- pkg/PFRAG.no-no_x11 3 Jul 2018 14:32:48 -0000 1.3 +++ pkg/PFRAG.no-no_x11 9 Feb 2019 21:53:58 -0000 @@ -46,6 +46,26 @@ share/cataclysm-dda/gfx/HoderTileset/ share/cataclysm-dda/gfx/HoderTileset/hodertiles.png share/cataclysm-dda/gfx/HoderTileset/tile_config.json share/cataclysm-dda/gfx/HoderTileset/tileset.txt +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/ +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/10_xfiles_32x32_22052-22195.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/11_tiles_kawaiimaidmod_32x32_22196-22291.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/12_tiles_kawaiimaidmod_offset_32x32_22292-22339.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/13_tiles_kawaiimaidmod_64x48-22340-22364.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/14_tiles2_32x32_22365-27564.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/15_tiles-connected_variants_32x32_27565-32764.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/16_tiles_trees_64x80_32765-33165.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/17_top_hats_32x32.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/1_tiles_32x32_0-5199.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/2_expan_32x32_5200-5391.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/3_tree_64x80_5392-5471.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/4_fallback_5472-9567.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/5_tiles_character_customization_32x32_9568-11567.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/6_tiles_wide_monsters_160x128_11568-11603.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/7_expan2_32x32_11604-11651.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/8_tiles-monster-variants_32x32_11652-16851.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/9_tiles-connected_32x32_16852-22051.png +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/tile_config.json +share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/tileset.txt share/cataclysm-dda/gfx/MShock24TilesetModded/ share/cataclysm-dda/gfx/MShock24TilesetModded/fallback.png share/cataclysm-dda/gfx/MShock24TilesetModded/tile_config.json @@ -66,6 +86,7 @@ share/cataclysm-dda/gfx/MshockXotto+/til share/cataclysm-dda/gfx/MshockXotto+/tree.png share/cataclysm-dda/gfx/MshockXotto+/treeO.png share/cataclysm-dda/gfx/RetroASCIITileset/ +share/cataclysm-dda/gfx/RetroASCIITileset/fallback.png share/cataclysm-dda/gfx/RetroASCIITileset/retroasciitiles.png share/cataclysm-dda/gfx/RetroASCIITileset/tile_config.json share/cataclysm-dda/gfx/RetroASCIITileset/tileset.txt @@ -73,6 +94,7 @@ share/cataclysm-dda/gfx/RetroDaysTileset share/cataclysm-dda/gfx/RetroDaysTileset/fallback.png share/cataclysm-dda/gfx/RetroDaysTileset/tile_config.json share/cataclysm-dda/gfx/RetroDaysTileset/tiles.png +share/cataclysm-dda/gfx/RetroDaysTileset/tiles_20x20.png share/cataclysm-dda/gfx/RetroDaysTileset/tileset.txt share/cataclysm-dda/gfx/ThuztorTileset@/ share/cataclysm-dda/gfx/ThuztorTileset@/thuztortiles@.png Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- pkg/PLIST 3 Dec 2018 08:43:56 -0000 1.6 +++ pkg/PLIST 9 Feb 2019 21:53:58 -0000 @@ -89,6 +89,7 @@ share/cataclysm-dda/json/items/ammo/44pa share/cataclysm-dda/json/items/ammo/45.json share/cataclysm-dda/json/items/ammo/454.json share/cataclysm-dda/json/items/ammo/46.json +share/cataclysm-dda/json/items/ammo/460.json share/cataclysm-dda/json/items/ammo/50.json share/cataclysm-dda/json/items/ammo/500.json share/cataclysm-dda/json/items/ammo/545x39.json @@ -133,6 +134,7 @@ share/cataclysm-dda/json/items/book/fabr share/cataclysm-dda/json/items/book/firstaid.json share/cataclysm-dda/json/items/book/gun.json share/cataclysm-dda/json/items/book/launcher.json +share/cataclysm-dda/json/items/book/maps.json share/cataclysm-dda/json/items/book/martial.json share/cataclysm-dda/json/items/book/mechanics.json share/cataclysm-dda/json/items/book/melee.json @@ -156,25 +158,47 @@ share/cataclysm-dda/json/items/classes/c share/cataclysm-dda/json/items/classes/gun.json share/cataclysm-dda/json/items/classes/magazine.json share/cataclysm-dda/json/items/comestibles/ -share/cataclysm-dda/json/items/comestibles.json +share/cataclysm-dda/json/items/comestibles/alcohol.json +share/cataclysm-dda/json/items/comestibles/bread.json share/cataclysm-dda/json/items/comestibles/brewing.json share/cataclysm-dda/json/items/comestibles/carnivore.json +share/cataclysm-dda/json/items/comestibles/dairy.json share/cataclysm-dda/json/items/comestibles/drink.json +share/cataclysm-dda/json/items/comestibles/drink_other.json share/cataclysm-dda/json/items/comestibles/egg.json share/cataclysm-dda/json/items/comestibles/frozen.json +share/cataclysm-dda/json/items/comestibles/fruit_dishes.json +share/cataclysm-dda/json/items/comestibles/irradiated_fruit.json +share/cataclysm-dda/json/items/comestibles/irradiated_veggy.json +share/cataclysm-dda/json/items/comestibles/junkfood.json +share/cataclysm-dda/json/items/comestibles/meat_dishes.json +share/cataclysm-dda/json/items/comestibles/meat_dishes_human.json share/cataclysm-dda/json/items/comestibles/med.json +share/cataclysm-dda/json/items/comestibles/mre.json +share/cataclysm-dda/json/items/comestibles/mushroom.json share/cataclysm-dda/json/items/comestibles/mutagen.json +share/cataclysm-dda/json/items/comestibles/nuts.json +share/cataclysm-dda/json/items/comestibles/offal_dishes.json +share/cataclysm-dda/json/items/comestibles/other.json share/cataclysm-dda/json/items/comestibles/protein.json +share/cataclysm-dda/json/items/comestibles/raw_fruit.json +share/cataclysm-dda/json/items/comestibles/raw_veggy.json +share/cataclysm-dda/json/items/comestibles/sandwich.json share/cataclysm-dda/json/items/comestibles/seed.json +share/cataclysm-dda/json/items/comestibles/soup.json share/cataclysm-dda/json/items/comestibles/spice.json +share/cataclysm-dda/json/items/comestibles/veggy_dishes.json +share/cataclysm-dda/json/items/comestibles/wheat.json share/cataclysm-dda/json/items/containers.json share/cataclysm-dda/json/items/crossbows.json share/cataclysm-dda/json/items/fake.json +share/cataclysm-dda/json/items/fluff.json share/cataclysm-dda/json/items/fuel.json share/cataclysm-dda/json/items/generic/ share/cataclysm-dda/json/items/generic.json share/cataclysm-dda/json/items/generic/ammolink.json share/cataclysm-dda/json/items/generic/casing.json +share/cataclysm-dda/json/items/generic/currency.json share/cataclysm-dda/json/items/generic/spares.json share/cataclysm-dda/json/items/generic/string.json share/cataclysm-dda/json/items/grenades.json @@ -197,6 +221,7 @@ share/cataclysm-dda/json/items/gun/44pap share/cataclysm-dda/json/items/gun/45.json share/cataclysm-dda/json/items/gun/454.json share/cataclysm-dda/json/items/gun/46.json +share/cataclysm-dda/json/items/gun/460.json share/cataclysm-dda/json/items/gun/50.json share/cataclysm-dda/json/items/gun/500.json share/cataclysm-dda/json/items/gun/545x39.json @@ -249,6 +274,7 @@ share/cataclysm-dda/json/items/magazine/ share/cataclysm-dda/json/items/magazine/44.json share/cataclysm-dda/json/items/magazine/45.json share/cataclysm-dda/json/items/magazine/46.json +share/cataclysm-dda/json/items/magazine/460.json share/cataclysm-dda/json/items/magazine/50.json share/cataclysm-dda/json/items/magazine/545x39.json share/cataclysm-dda/json/items/magazine/57.json @@ -277,6 +303,7 @@ share/cataclysm-dda/json/items/tool/depl share/cataclysm-dda/json/items/tool/lighting.json share/cataclysm-dda/json/items/tool/med.json share/cataclysm-dda/json/items/tool/radio_tools.json +share/cataclysm-dda/json/items/tool/science.json share/cataclysm-dda/json/items/tool/workshop.json share/cataclysm-dda/json/items/tool_armor.json share/cataclysm-dda/json/items/toolmod.json @@ -458,6 +485,7 @@ share/cataclysm-dda/json/mapgen/necropol share/cataclysm-dda/json/mapgen/office_cubical.json share/cataclysm-dda/json/mapgen/office_doctor.json share/cataclysm-dda/json/mapgen/office_small.json +share/cataclysm-dda/json/mapgen/office_tower.json share/cataclysm-dda/json/mapgen/office_tower_2.json share/cataclysm-dda/json/mapgen/orchard_apple.json share/cataclysm-dda/json/mapgen/orchard_fruit.json @@ -481,6 +509,9 @@ share/cataclysm-dda/json/mapgen/prison_1 share/cataclysm-dda/json/mapgen/public_works.json share/cataclysm-dda/json/mapgen/pump_station.json share/cataclysm-dda/json/mapgen/radio_tower.json +share/cataclysm-dda/json/mapgen/railroad/ +share/cataclysm-dda/json/mapgen/railroad/railroad_level_crossing.json +share/cataclysm-dda/json/mapgen/railroad/railroad_station.json share/cataclysm-dda/json/mapgen/ranch_camp.json share/cataclysm-dda/json/mapgen/recycle_center.json share/cataclysm-dda/json/mapgen/restaurant.json @@ -523,6 +554,7 @@ share/cataclysm-dda/json/mapgen/thrift.j share/cataclysm-dda/json/mapgen/trail_nature.json share/cataclysm-dda/json/mapgen/trail_small.json share/cataclysm-dda/json/mapgen/trailer_park.json +share/cataclysm-dda/json/mapgen/trailhead.json share/cataclysm-dda/json/mapgen/triffid_grove.json share/cataclysm-dda/json/mapgen/veterinarian.json share/cataclysm-dda/json/mapgen/vfw.json @@ -539,6 +571,8 @@ share/cataclysm-dda/json/mapgen_palettes share/cataclysm-dda/json/mapgen_palettes/mansion.json share/cataclysm-dda/json/mapgen_palettes/mil_surplus.json share/cataclysm-dda/json/mapgen_palettes/office_doctor.json +share/cataclysm-dda/json/mapgen_palettes/railroad.json +share/cataclysm-dda/json/mapgen_palettes/ranch_camp.json share/cataclysm-dda/json/mapgen_palettes/road.json share/cataclysm-dda/json/mapgen_palettes/shelter.json share/cataclysm-dda/json/mapgen_palettes/subway.json @@ -570,11 +604,69 @@ share/cataclysm-dda/json/monsters/triffi 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/music.json share/cataclysm-dda/json/mutation_category.json share/cataclysm-dda/json/mutation_ordering.json share/cataclysm-dda/json/mutation_type.json share/cataclysm-dda/json/mutations.json share/cataclysm-dda/json/npcs/ +share/cataclysm-dda/json/npcs/BG_trait_groups.json +share/cataclysm-dda/json/npcs/BG_traits.json +share/cataclysm-dda/json/npcs/Backgrounds/ +share/cataclysm-dda/json/npcs/Backgrounds/backgrounds_table_of_contents.json +share/cataclysm-dda/json/npcs/Backgrounds/burger_flipper_1.json +share/cataclysm-dda/json/npcs/Backgrounds/codger.json +share/cataclysm-dda/json/npcs/Backgrounds/confused_1.json +share/cataclysm-dda/json/npcs/Backgrounds/cop_1.json +share/cataclysm-dda/json/npcs/Backgrounds/cop_2.json +share/cataclysm-dda/json/npcs/Backgrounds/cop_3.json +share/cataclysm-dda/json/npcs/Backgrounds/criminal_1.json +share/cataclysm-dda/json/npcs/Backgrounds/criminal_2.json +share/cataclysm-dda/json/npcs/Backgrounds/dreamer.json +share/cataclysm-dda/json/npcs/Backgrounds/evacuee_1.json +share/cataclysm-dda/json/npcs/Backgrounds/evacuee_2.json +share/cataclysm-dda/json/npcs/Backgrounds/evacuee_3.json +share/cataclysm-dda/json/npcs/Backgrounds/evacuee_4.json +share/cataclysm-dda/json/npcs/Backgrounds/evacuee_5.json +share/cataclysm-dda/json/npcs/Backgrounds/evacuee_6.json +share/cataclysm-dda/json/npcs/Backgrounds/fema_evacuee_1.json +share/cataclysm-dda/json/npcs/Backgrounds/grad_student_1.json +share/cataclysm-dda/json/npcs/Backgrounds/gung_ho_1.json +share/cataclysm-dda/json/npcs/Backgrounds/gung_ho_2.json +share/cataclysm-dda/json/npcs/Backgrounds/gung_ho_3.json +share/cataclysm-dda/json/npcs/Backgrounds/high_school_1.json +share/cataclysm-dda/json/npcs/Backgrounds/hospital_1.json +share/cataclysm-dda/json/npcs/Backgrounds/hospital_2.json +share/cataclysm-dda/json/npcs/Backgrounds/hospital_3.json +share/cataclysm-dda/json/npcs/Backgrounds/hunter_1.json +share/cataclysm-dda/json/npcs/Backgrounds/hunter_2.json +share/cataclysm-dda/json/npcs/Backgrounds/lab_1.json +share/cataclysm-dda/json/npcs/Backgrounds/left_for_dead_1.json +share/cataclysm-dda/json/npcs/Backgrounds/left_for_dead_2.json +share/cataclysm-dda/json/npcs/Backgrounds/lost_partner_1.json +share/cataclysm-dda/json/npcs/Backgrounds/lost_partner_2.json +share/cataclysm-dda/json/npcs/Backgrounds/nerd_1.json +share/cataclysm-dda/json/npcs/Backgrounds/no_past_1.json +share/cataclysm-dda/json/npcs/Backgrounds/no_past_2.json +share/cataclysm-dda/json/npcs/Backgrounds/no_past_3.json +share/cataclysm-dda/json/npcs/Backgrounds/no_past_4.json +share/cataclysm-dda/json/npcs/Backgrounds/no_past_5.json +share/cataclysm-dda/json/npcs/Backgrounds/out_of_town_1.json +share/cataclysm-dda/json/npcs/Backgrounds/out_of_town_2.json +share/cataclysm-dda/json/npcs/Backgrounds/prepper_1.json +share/cataclysm-dda/json/npcs/Backgrounds/prepper_2.json +share/cataclysm-dda/json/npcs/Backgrounds/prisoner_1.json +share/cataclysm-dda/json/npcs/Backgrounds/professor_1.json +share/cataclysm-dda/json/npcs/Backgrounds/religious_1.json +share/cataclysm-dda/json/npcs/Backgrounds/religious_2.json +share/cataclysm-dda/json/npcs/Backgrounds/rural_1.json +share/cataclysm-dda/json/npcs/Backgrounds/rural_2.json +share/cataclysm-dda/json/npcs/Backgrounds/scavenger_merc_1.json +share/cataclysm-dda/json/npcs/Backgrounds/scientist_1.json +share/cataclysm-dda/json/npcs/Backgrounds/scientist_2.json +share/cataclysm-dda/json/npcs/Backgrounds/soldier_1.json +share/cataclysm-dda/json/npcs/Backgrounds/soldier_2.json +share/cataclysm-dda/json/npcs/Backgrounds/wedding_1.json share/cataclysm-dda/json/npcs/NC_ARSONIST.json share/cataclysm-dda/json/npcs/NC_BARTENDER.json share/cataclysm-dda/json/npcs/NC_BOUNTY_HUNTER.json @@ -592,8 +684,10 @@ share/cataclysm-dda/json/npcs/NC_SOLDIER share/cataclysm-dda/json/npcs/NC_THUG.json share/cataclysm-dda/json/npcs/NC_TRADER.json share/cataclysm-dda/json/npcs/TALK_ARSONIST.json +share/cataclysm-dda/json/npcs/TALK_COMMON_ALLY.json share/cataclysm-dda/json/npcs/TALK_COMMON_GREET.json share/cataclysm-dda/json/npcs/TALK_COMMON_MISSION.json +share/cataclysm-dda/json/npcs/TALK_COMMON_OTHER.json share/cataclysm-dda/json/npcs/TALK_EVAC_GUARD1.json share/cataclysm-dda/json/npcs/TALK_EVAC_GUARD2.json share/cataclysm-dda/json/npcs/TALK_EVAC_GUARD3.json @@ -601,21 +695,38 @@ share/cataclysm-dda/json/npcs/TALK_EVAC_ share/cataclysm-dda/json/npcs/TALK_EVAC_MERCHANT.json share/cataclysm-dda/json/npcs/TALK_FACTION_CAMP.json share/cataclysm-dda/json/npcs/TALK_FREE_MERCHANT.json +share/cataclysm-dda/json/npcs/TALK_FRIEND_CONVERSATION.json share/cataclysm-dda/json/npcs/TALK_GUARD.json share/cataclysm-dda/json/npcs/TALK_OLD_GUARD_NECROPOLIS.json share/cataclysm-dda/json/npcs/TALK_OLD_GUARD_REP.json +share/cataclysm-dda/json/npcs/TALK_REFUGEE_BEGGAR_1.json +share/cataclysm-dda/json/npcs/TALK_REFUGEE_BEGGAR_2.json +share/cataclysm-dda/json/npcs/TALK_REFUGEE_BEGGAR_3.json +share/cataclysm-dda/json/npcs/TALK_REFUGEE_BEGGAR_4.json +share/cataclysm-dda/json/npcs/TALK_REFUGEE_BEGGAR_5.json share/cataclysm-dda/json/npcs/TALK_REFUGE_RANCH.json share/cataclysm-dda/json/npcs/TALK_SCAVENGER_MERC.json share/cataclysm-dda/json/npcs/TALK_SCIENCE_REP.json share/cataclysm-dda/json/npcs/TALK_TEST.json share/cataclysm-dda/json/npcs/classes.json +share/cataclysm-dda/json/npcs/classes_uncommon.json share/cataclysm-dda/json/npcs/destination_locations.json share/cataclysm-dda/json/npcs/epilogues.json +share/cataclysm-dda/json/npcs/expertise_traits.json share/cataclysm-dda/json/npcs/factions.json share/cataclysm-dda/json/npcs/hints.json share/cataclysm-dda/json/npcs/items_generic.json share/cataclysm-dda/json/npcs/missiondef.json share/cataclysm-dda/json/npcs/npc.json +share/cataclysm-dda/json/npcs/refugee_center/ +share/cataclysm-dda/json/npcs/refugee_center/NPC_Aleesha_Seward.json +share/cataclysm-dda/json/npcs/refugee_center/NPC_Boris_Borichenko.json +share/cataclysm-dda/json/npcs/refugee_center/NPC_Dana_Nunez.json +share/cataclysm-dda/json/npcs/refugee_center/NPC_Jenny_Forcette.json +share/cataclysm-dda/json/npcs/refugee_center/NPC_Pablo_Nunez.json +share/cataclysm-dda/json/npcs/refugee_center/NPC_Stan_Borichenko.json +share/cataclysm-dda/json/npcs/refugee_center/NPC_Vanessa_Toby.json +share/cataclysm-dda/json/npcs/starting_traits.json share/cataclysm-dda/json/npcs/talk_tags.json share/cataclysm-dda/json/overmap/ share/cataclysm-dda/json/overmap/multitile_buildings_terrain.json @@ -655,6 +766,7 @@ share/cataclysm-dda/json/recipes/food/br share/cataclysm-dda/json/recipes/food/distill.json share/cataclysm-dda/json/recipes/food/dry.json share/cataclysm-dda/json/recipes/food/frozen.json +share/cataclysm-dda/json/recipes/food/offal_dishes.json share/cataclysm-dda/json/recipes/food/pasta.json share/cataclysm-dda/json/recipes/food/seed.json share/cataclysm-dda/json/recipes/other/ @@ -669,6 +781,7 @@ share/cataclysm-dda/json/recipes/recipe_ share/cataclysm-dda/json/recipes/recipe_companion.json share/cataclysm-dda/json/recipes/recipe_construction_om.json share/cataclysm-dda/json/recipes/recipe_deconstruction.json +share/cataclysm-dda/json/recipes/recipe_deconstruction_package.json share/cataclysm-dda/json/recipes/recipe_electronics.json share/cataclysm-dda/json/recipes/recipe_food.json share/cataclysm-dda/json/recipes/recipe_groups.json @@ -757,6 +870,7 @@ share/cataclysm-dda/json/vehicles/farm.j share/cataclysm-dda/json/vehicles/helicopters.json share/cataclysm-dda/json/vehicles/military.json share/cataclysm-dda/json/vehicles/test.json +share/cataclysm-dda/json/vehicles/trains.json share/cataclysm-dda/json/vehicles/trucks.json share/cataclysm-dda/json/vehicles/utility.json share/cataclysm-dda/json/vehicles/vans_busses.json @@ -776,17 +890,16 @@ share/cataclysm-dda/mods/Animatronics/re share/cataclysm-dda/mods/Animatronics/snippets.json share/cataclysm-dda/mods/Animatronics/speech.json share/cataclysm-dda/mods/Boats/ -share/cataclysm-dda/mods/Boats/b_inflatable_boat_parts.json share/cataclysm-dda/mods/Boats/b_item_groups.json share/cataclysm-dda/mods/Boats/b_items.json share/cataclysm-dda/mods/Boats/b_recipes.json -share/cataclysm-dda/mods/Boats/b_var_veh_parts.json -share/cataclysm-dda/mods/Boats/b_var_wood_veh_parts.json -share/cataclysm-dda/mods/Boats/b_vehicles.json -share/cataclysm-dda/mods/Boats/b_wooden_boat_parts.json +share/cataclysm-dda/mods/Boats/items_vehicleparts_boats.json share/cataclysm-dda/mods/Boats/modinfo.json share/cataclysm-dda/mods/Boats/overmap_terrain.json share/cataclysm-dda/mods/Boats/specials.json +share/cataclysm-dda/mods/Boats/vehicle_groups_boats.json +share/cataclysm-dda/mods/Boats/vehicleparts_boats.json +share/cataclysm-dda/mods/Boats/vehicles_boats.json share/cataclysm-dda/mods/Boats/whaleys_boat_rental.json share/cataclysm-dda/mods/Boats/whaleys_boats.json share/cataclysm-dda/mods/Boats/whaleys_house_river.json @@ -828,15 +941,29 @@ share/cataclysm-dda/mods/CrazyCataclysm/ share/cataclysm-dda/mods/CrazyCataclysm/crazy_comestibles.json share/cataclysm-dda/mods/CrazyCataclysm/crazy_item_groups.json share/cataclysm-dda/mods/CrazyCataclysm/crazy_items.json +share/cataclysm-dda/mods/CrazyCataclysm/crazy_monstergroups.json share/cataclysm-dda/mods/CrazyCataclysm/crazy_monsters.json share/cataclysm-dda/mods/CrazyCataclysm/crazy_speech.json share/cataclysm-dda/mods/CrazyCataclysm/modinfo.json +share/cataclysm-dda/mods/DeadPeople_Chesthole/ +share/cataclysm-dda/mods/DeadPeople_Chesthole/Chest_Items.png +share/cataclysm-dda/mods/DeadPeople_Chesthole/mod_tileset.json +share/cataclysm-dda/mods/DeadPeople_Chesthole/modinfo.json +share/cataclysm-dda/mods/DeadPeople_Hybrid/ +share/cataclysm-dda/mods/DeadPeople_Hybrid/Hybrid_Items.png +share/cataclysm-dda/mods/DeadPeople_Hybrid/mod_tileset.json +share/cataclysm-dda/mods/DeadPeople_Hybrid/modinfo.json +share/cataclysm-dda/mods/DeadPeople_Xotto/ +share/cataclysm-dda/mods/DeadPeople_Xotto/Xotto_Items.png +share/cataclysm-dda/mods/DeadPeople_Xotto/mod_tileset.json +share/cataclysm-dda/mods/DeadPeople_Xotto/modinfo.json share/cataclysm-dda/mods/DeoxyMod/ share/cataclysm-dda/mods/DeoxyMod/Deoxy_vehicle_parts.json share/cataclysm-dda/mods/DeoxyMod/modinfo.json share/cataclysm-dda/mods/DinoMod/ share/cataclysm-dda/mods/DinoMod/dinosaur.json share/cataclysm-dda/mods/DinoMod/fieldoffice.json +share/cataclysm-dda/mods/DinoMod/harvest.json share/cataclysm-dda/mods/DinoMod/modinfo.json share/cataclysm-dda/mods/DinoMod/regional_overlay.json share/cataclysm-dda/mods/DinoMod/snippets.json @@ -949,6 +1076,10 @@ share/cataclysm-dda/mods/Generic_Guns/gg share/cataclysm-dda/mods/Generic_Guns/gg_other_blacklist.json share/cataclysm-dda/mods/Generic_Guns/gg_vehicle_override.json share/cataclysm-dda/mods/Generic_Guns/modinfo.json +share/cataclysm-dda/mods/Growable_pots/ +share/cataclysm-dda/mods/Growable_pots/items.json +share/cataclysm-dda/mods/Growable_pots/modinfo.json +share/cataclysm-dda/mods/Growable_pots/recipes.json share/cataclysm-dda/mods/ManualBionicInstall/ share/cataclysm-dda/mods/ManualBionicInstall/game_balance.json share/cataclysm-dda/mods/ManualBionicInstall/modinfo.json @@ -1854,8 +1985,6 @@ share/cataclysm-dda/mods/Mutant_NPCs/npc share/cataclysm-dda/mods/Mutant_NPCs/trait_groups.json share/cataclysm-dda/mods/NPC_Traits/ share/cataclysm-dda/mods/NPC_Traits/modinfo.json -share/cataclysm-dda/mods/NPC_Traits/npc_classes.json -share/cataclysm-dda/mods/NPC_Traits/trait_groups.json share/cataclysm-dda/mods/NW_Pack/ share/cataclysm-dda/mods/NW_Pack/modinfo.json share/cataclysm-dda/mods/NW_Pack/nw_archery.json @@ -1877,6 +2006,12 @@ share/cataclysm-dda/mods/National_Guard_ share/cataclysm-dda/mods/National_Guard_Camp/overmap_terrain.json share/cataclysm-dda/mods/No_Acid_Zombies/ share/cataclysm-dda/mods/No_Acid_Zombies/modinfo.json +share/cataclysm-dda/mods/No_Anthills/ +share/cataclysm-dda/mods/No_Anthills/modinfo.json +share/cataclysm-dda/mods/No_Beehives/ +share/cataclysm-dda/mods/No_Beehives/modinfo.json +share/cataclysm-dda/mods/No_Big_Zombies/ +share/cataclysm-dda/mods/No_Big_Zombies/modinfo.json share/cataclysm-dda/mods/No_Explosive_Zombies/ share/cataclysm-dda/mods/No_Explosive_Zombies/modinfo.json share/cataclysm-dda/mods/No_Faults/ @@ -1887,7 +2022,6 @@ share/cataclysm-dda/mods/No_Fungi/ share/cataclysm-dda/mods/No_Fungi/comestibles.json share/cataclysm-dda/mods/No_Fungi/furniture.json share/cataclysm-dda/mods/No_Fungi/modinfo.json -share/cataclysm-dda/mods/No_Fungi/overmap_specials.json share/cataclysm-dda/mods/No_Fungi/terrain.json share/cataclysm-dda/mods/No_Medieval_Items/ share/cataclysm-dda/mods/No_Medieval_Items/modinfo.json @@ -1909,7 +2043,6 @@ share/cataclysm-dda/mods/No_Survivor_Arm share/cataclysm-dda/mods/No_Survivor_Armor/survivor.json share/cataclysm-dda/mods/No_Triffids/ share/cataclysm-dda/mods/No_Triffids/modinfo.json -share/cataclysm-dda/mods/No_Triffids/overmap_specials.json share/cataclysm-dda/mods/No_Zombie_Animals/ share/cataclysm-dda/mods/No_Zombie_Animals/modinfo.json share/cataclysm-dda/mods/Only_Wildlife/ @@ -2032,7 +2165,7 @@ share/cataclysm-dda/mods/Urban_Developme share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_4_house_basement.json share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_5_house.json share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_6_house.json -share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_7_house _garden.json +share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_7_house_garden.json share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_8_house_brick_garden.json share/cataclysm-dda/mods/Urban_Development/building_jsons/urban_9_house_garage_loft.json share/cataclysm-dda/mods/Urban_Development/mapgen_palettes/ @@ -2042,12 +2175,9 @@ share/cataclysm-dda/mods/Urban_Developme share/cataclysm-dda/mods/Urban_Development/modinfo.json share/cataclysm-dda/mods/Urban_Development/overmap_specials.json share/cataclysm-dda/mods/Urban_Development/overmap_terrain.json +share/cataclysm-dda/mods/Urban_Development/regional_overlay.json share/cataclysm-dda/mods/Z-Level_Buildings/ -share/cataclysm-dda/mods/Z-Level_Buildings/2fmotel.json share/cataclysm-dda/mods/Z-Level_Buildings/modinfo.json -share/cataclysm-dda/mods/Z-Level_Buildings/office_tower.json -share/cataclysm-dda/mods/Z-Level_Buildings/overmap_specials.json -share/cataclysm-dda/mods/Z-Level_Buildings/overmap_terrain.json share/cataclysm-dda/mods/Zombie_Nightvision/ share/cataclysm-dda/mods/Zombie_Nightvision/main.lua share/cataclysm-dda/mods/Zombie_Nightvision/modinfo.json @@ -2056,12 +2186,6 @@ share/cataclysm-dda/mods/alt_map_key/mod 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 @@ -2243,6 +2367,31 @@ share/cataclysm-dda/mods/no_scifi/ share/cataclysm-dda/mods/no_scifi/modinfo.json share/cataclysm-dda/mods/novitamins/ share/cataclysm-dda/mods/novitamins/modinfo.json +share/cataclysm-dda/mods/oa_additional_buildings/ +share/cataclysm-dda/mods/oa_additional_buildings/json/ +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_car_dealership.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_car_showroom.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_city_dump_small.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_gardening_allotment.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_internet_cafe.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_market_small.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_open_sewer_small.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_private_park.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_public_art_piece.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_public_space.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_sex_shop.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/cs_tire_shop.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ws_fire_lookout_tower.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ws_giant_sinkhole.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ws_regional_dump.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ws_survivor_bunker.json +share/cataclysm-dda/mods/oa_additional_buildings/json/mapgen/ws_survivor_camp.json +share/cataclysm-dda/mods/oa_additional_buildings/json/oa_shared_item_groups.json +share/cataclysm-dda/mods/oa_additional_buildings/json/overmap_specials.json +share/cataclysm-dda/mods/oa_additional_buildings/json/overmap_terrain.json +share/cataclysm-dda/mods/oa_additional_buildings/json/regional_overlay.json +share/cataclysm-dda/mods/oa_additional_buildings/modinfo.json share/cataclysm-dda/mods/realguns/ share/cataclysm-dda/mods/realguns/ammo.json share/cataclysm-dda/mods/realguns/ammo_types.json
