[UPDATE] games/cataclysm-dda -> 20180628

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[UPDATE] games/cataclysm-dda -> 20180628

trondd-2
Overdue update to Cataclysm DDA.  Too many changes since February.  Lots
of cool stuff added/changed.

Tim.

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 5 Mar 2018 09:44:06 -0000 1.4
+++ Makefile 1 Jul 2018 21:58:54 -0000
@@ -1,12 +1,12 @@
 # $OpenBSD: Makefile,v 1.4 2018/03/05 09:44:06 sthen Exp $
 
 COMMENT= rogue-like zombie survival game
-DISTNAME= cataclysm-dda-2018.02.01
+DISTNAME= cataclysm-dda-2018.06.28
 CATEGORIES= games
 
 GH_ACCOUNT= CleverRaven
 GH_PROJECT= Cataclysm-DDA
-GH_COMMIT= cf64a8836391ba742ce1eca500e1e0409a654d83
+GH_COMMIT= 1db1b62b57a38c18e5f118fb57dcb1290d42d9b9
 
 HOMEPAGE= http://en.cataclysmdda.com
 MAINTAINER= Tim Meunier <[hidden email]>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 5 Mar 2018 09:44:06 -0000 1.3
+++ distinfo 1 Jul 2018 21:58:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (cataclysm-dda-2018.02.01-cf64a883.tar.gz) = PqoXPbvHznM8ezzgbiejZZ7xuyzhI+iyWlBB7bXgHTk=
-SIZE (cataclysm-dda-2018.02.01-cf64a883.tar.gz) = 60095165
+SHA256 (cataclysm-dda-2018.06.28-1db1b62b.tar.gz) = Ja37CLFcbbl1/6fCfe7lq38SxXSqg0d2ulmCuwhAhlg=
+SIZE (cataclysm-dda-2018.06.28-1db1b62b.tar.gz) = 64208890
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile
--- patches/patch-Makefile 5 Mar 2018 09:44:06 -0000 1.4
+++ patches/patch-Makefile 1 Jul 2018 21:58:54 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.4 2018/03/0
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -80,7 +80,6 @@
+@@ -78,7 +78,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
-@@ -232,7 +231,6 @@ ifdef RELEASE
+@@ -229,7 +228,6 @@ ifdef RELEASE
        OPTLEVEL = -O3
      endif
    endif
@@ -19,7 +19,7 @@ Index: Makefile
 
    ifdef LTO
      LDFLAGS += -fuse-ld=gold
-@@ -253,7 +251,7 @@ ifdef RELEASE
+@@ -250,7 +248,7 @@ ifdef RELEASE
    endif
    DEFINES += -DRELEASE
    # Check for astyle or JSON regressions on release builds.
@@ -28,7 +28,7 @@ Index: Makefile
  endif
 
  ifndef RELEASE
-@@ -268,7 +266,7 @@ endif
+@@ -265,7 +263,7 @@ endif
  ifeq ($(shell sh -c 'uname -o 2>/dev/null || echo not'),Cygwin)
      OTHERS += -std=gnu++11
    else
@@ -37,7 +37,7 @@ Index: Makefile
  endif
 
  CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS) -MMD -MP
-@@ -407,11 +405,6 @@ ifdef MAPSIZE
+@@ -406,11 +404,6 @@ ifdef MAPSIZE
      CXXFLAGS += -DMAPSIZE=$(MAPSIZE)
  endif
 
@@ -49,7 +49,7 @@ Index: Makefile
  PKG_CONFIG = $(CROSS)pkg-config
  SDL2_CONFIG = $(CROSS)sdl2-config
 
-@@ -716,7 +709,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS)
+@@ -708,7 +701,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 \
           )
-@@ -770,35 +762,35 @@ distclean:
+@@ -762,35 +754,35 @@ distclean:
  bindist: $(BINDIST)
 
  ifeq ($(TARGETSYSTEM), LINUX)
@@ -112,7 +112,7 @@ Index: Makefile
  mkdir -p $(LOCALE_DIR)
  ifdef LANGUAGES
  LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES)
-@@ -966,11 +958,6 @@ astyle: $(ASTYLED_WHITELIST)
+@@ -959,11 +951,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)
Index: pkg/PFRAG.no-no_x11
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/pkg/PFRAG.no-no_x11,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.no-no_x11
--- pkg/PFRAG.no-no_x11 5 Mar 2018 09:44:06 -0000 1.2
+++ pkg/PFRAG.no-no_x11 1 Jul 2018 21:58:54 -0000
@@ -12,13 +12,13 @@ share/cataclysm-dda/gfx/ChestHole16Tiles
 share/cataclysm-dda/gfx/ChestHole16Tileset/tiles.png
 share/cataclysm-dda/gfx/ChestHole16Tileset/tiles24.png
 share/cataclysm-dda/gfx/ChestHole16Tileset/tileset.txt
+share/cataclysm-dda/gfx/ChestHole16Tileset/tree.png
 share/cataclysm-dda/gfx/ChestHole32Tileset/
 share/cataclysm-dda/gfx/ChestHole32Tileset/fallback.png
 share/cataclysm-dda/gfx/ChestHole32Tileset/tile_config.json
 share/cataclysm-dda/gfx/ChestHole32Tileset/tiles.png
 share/cataclysm-dda/gfx/ChestHole32Tileset/tiles48.png
 share/cataclysm-dda/gfx/ChestHole32Tileset/tileset.txt
-share/cataclysm-dda/gfx/ChestHole32Tileset/tilesold.png
 share/cataclysm-dda/gfx/ChestHole32Tileset/tree.png
 share/cataclysm-dda/gfx/ChestHole32Tileset_iso/
 share/cataclysm-dda/gfx/ChestHole32Tileset_iso/fallback.png
@@ -58,26 +58,22 @@ share/cataclysm-dda/gfx/MShock32TilesetM
 share/cataclysm-dda/gfx/MShock32TilesetModded/tileset.txt
 share/cataclysm-dda/gfx/MshockXotto+/
 share/cataclysm-dda/gfx/MshockXotto+/expan.png
+share/cataclysm-dda/gfx/MshockXotto+/expan2.png
 share/cataclysm-dda/gfx/MshockXotto+/fallback.png
 share/cataclysm-dda/gfx/MshockXotto+/tile_config.json
 share/cataclysm-dda/gfx/MshockXotto+/tiles.png
 share/cataclysm-dda/gfx/MshockXotto+/tileset.txt
 share/cataclysm-dda/gfx/MshockXotto+/tree.png
+share/cataclysm-dda/gfx/MshockXotto+/treeO.png
 share/cataclysm-dda/gfx/RetroASCIITileset/
 share/cataclysm-dda/gfx/RetroASCIITileset/retroasciitiles.png
 share/cataclysm-dda/gfx/RetroASCIITileset/tile_config.json
 share/cataclysm-dda/gfx/RetroASCIITileset/tileset.txt
-share/cataclysm-dda/gfx/RetroDaysTileset10/
-share/cataclysm-dda/gfx/RetroDaysTileset10/retrodaysfallback10.png
-share/cataclysm-dda/gfx/RetroDaysTileset10/retrodaystiles10.png
-share/cataclysm-dda/gfx/RetroDaysTileset10/tile_config.json
-share/cataclysm-dda/gfx/RetroDaysTileset10/tileset.txt
-share/cataclysm-dda/gfx/RetroDaysTileset20/
-share/cataclysm-dda/gfx/RetroDaysTileset20/tile_config.json
-share/cataclysm-dda/gfx/RetroDaysTileset20/tileset.txt
-share/cataclysm-dda/gfx/RetroDaysTileset20_iso/
-share/cataclysm-dda/gfx/RetroDaysTileset20_iso/retrodaystiles20.png
-share/cataclysm-dda/gfx/RetroDaysTileset20_iso/tile_config.json
+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/tileset.txt
 share/cataclysm-dda/gfx/ThuztorTileset@/
 share/cataclysm-dda/gfx/ThuztorTileset@/thuztortiles@.png
 share/cataclysm-dda/gfx/ThuztorTileset@/tile_config.json
@@ -86,15 +82,13 @@ share/cataclysm-dda/gfx/TsuTileset/
 share/cataclysm-dda/gfx/TsuTileset/tile_config.json
 share/cataclysm-dda/gfx/TsuTileset/tileset.txt
 share/cataclysm-dda/gfx/TsuTileset/tsutiles.png
-share/cataclysm-dda/gfx/make_iso.py
-share/cataclysm-dda/gfx/tile.png
 share/cataclysm-dda/gfx/tile_config.json
 share/cataclysm-dda/gfx/tile_config_template.json
 share/cataclysm-dda/gfx/tinytile.png
 share/cataclysm-dda/sound/
 share/cataclysm-dda/sound/Basic/
-share/cataclysm-dda/sound/Basic/menu_error.wav
-share/cataclysm-dda/sound/Basic/menu_move.wav
+share/cataclysm-dda/sound/Basic/menu_error.ogg
+share/cataclysm-dda/sound/Basic/menu_move.ogg
 share/cataclysm-dda/sound/Basic/musicset.json
 share/cataclysm-dda/sound/Basic/soundpack.txt
 share/cataclysm-dda/sound/Basic/soundset.json
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 5 Mar 2018 09:44:06 -0000 1.3
+++ pkg/PLIST 1 Jul 2018 21:58:54 -0000
@@ -39,6 +39,7 @@ share/cataclysm-dda/json/emit.json
 share/cataclysm-dda/json/faults.json
 share/cataclysm-dda/json/flags.json
 share/cataclysm-dda/json/furniture.json
+share/cataclysm-dda/json/game_balance.json
 share/cataclysm-dda/json/gates.json
 share/cataclysm-dda/json/harvest.json
 share/cataclysm-dda/json/health_msgs.json
@@ -75,6 +76,7 @@ share/cataclysm-dda/json/items/ammo/300.
 share/cataclysm-dda/json/items/ammo/3006.json
 share/cataclysm-dda/json/items/ammo/308.json
 share/cataclysm-dda/json/items/ammo/32.json
+share/cataclysm-dda/json/items/ammo/357.json
 share/cataclysm-dda/json/items/ammo/36paper.json
 share/cataclysm-dda/json/items/ammo/38.json
 share/cataclysm-dda/json/items/ammo/40.json
@@ -93,6 +95,7 @@ share/cataclysm-dda/json/items/ammo/700n
 share/cataclysm-dda/json/items/ammo/762.json
 share/cataclysm-dda/json/items/ammo/762R.json
 share/cataclysm-dda/json/items/ammo/762x25.json
+share/cataclysm-dda/json/items/ammo/84x246mm.json
 share/cataclysm-dda/json/items/ammo/8x40mm.json
 share/cataclysm-dda/json/items/ammo/9mm.json
 share/cataclysm-dda/json/items/ammo/9x18.json
@@ -111,6 +114,7 @@ share/cataclysm-dda/json/items/armor/ban
 share/cataclysm-dda/json/items/armor/boots.json
 share/cataclysm-dda/json/items/armor/holster.json
 share/cataclysm-dda/json/items/bionics.json
+share/cataclysm-dda/json/items/biosignatures.json
 share/cataclysm-dda/json/items/book/
 share/cataclysm-dda/json/items/book/archery.json
 share/cataclysm-dda/json/items/book/barter.json
@@ -152,6 +156,7 @@ share/cataclysm-dda/json/items/comestibl
 share/cataclysm-dda/json/items/comestibles/brewing.json
 share/cataclysm-dda/json/items/comestibles/carnivore.json
 share/cataclysm-dda/json/items/comestibles/drink.json
+share/cataclysm-dda/json/items/comestibles/egg.json
 share/cataclysm-dda/json/items/comestibles/med.json
 share/cataclysm-dda/json/items/comestibles/mutagen.json
 share/cataclysm-dda/json/items/comestibles/protein.json
@@ -177,6 +182,7 @@ share/cataclysm-dda/json/items/gun/300.j
 share/cataclysm-dda/json/items/gun/3006.json
 share/cataclysm-dda/json/items/gun/308.json
 share/cataclysm-dda/json/items/gun/32.json
+share/cataclysm-dda/json/items/gun/357.json
 share/cataclysm-dda/json/items/gun/36paper.json
 share/cataclysm-dda/json/items/gun/38.json
 share/cataclysm-dda/json/items/gun/40.json
@@ -195,6 +201,7 @@ share/cataclysm-dda/json/items/gun/700nx
 share/cataclysm-dda/json/items/gun/762.json
 share/cataclysm-dda/json/items/gun/762R.json
 share/cataclysm-dda/json/items/gun/762x25.json
+share/cataclysm-dda/json/items/gun/84x246mm.json
 share/cataclysm-dda/json/items/gun/8x40mm.json
 share/cataclysm-dda/json/items/gun/9mm.json
 share/cataclysm-dda/json/items/gun/9x18.json
@@ -210,7 +217,6 @@ share/cataclysm-dda/json/items/gun/ups.j
 share/cataclysm-dda/json/items/gunmod/
 share/cataclysm-dda/json/items/gunmod/accessories.json
 share/cataclysm-dda/json/items/gunmod/barrel.json
-share/cataclysm-dda/json/items/gunmod/bore.json
 share/cataclysm-dda/json/items/gunmod/grip.json
 share/cataclysm-dda/json/items/gunmod/laser_gunmods.json
 share/cataclysm-dda/json/items/gunmod/magazine.json
@@ -230,6 +236,7 @@ share/cataclysm-dda/json/items/magazine/
 share/cataclysm-dda/json/items/magazine/3006.json
 share/cataclysm-dda/json/items/magazine/308.json
 share/cataclysm-dda/json/items/magazine/32.json
+share/cataclysm-dda/json/items/magazine/357.json
 share/cataclysm-dda/json/items/magazine/38.json
 share/cataclysm-dda/json/items/magazine/40.json
 share/cataclysm-dda/json/items/magazine/40mm.json
@@ -241,10 +248,12 @@ share/cataclysm-dda/json/items/magazine/
 share/cataclysm-dda/json/items/magazine/57.json
 share/cataclysm-dda/json/items/magazine/5x50.json
 share/cataclysm-dda/json/items/magazine/762.json
+share/cataclysm-dda/json/items/magazine/762R.json
 share/cataclysm-dda/json/items/magazine/762x25.json
 share/cataclysm-dda/json/items/magazine/8x40mm.json
 share/cataclysm-dda/json/items/magazine/9mm.json
 share/cataclysm-dda/json/items/magazine/9x18.json
+share/cataclysm-dda/json/items/magazine/liquid.json
 share/cataclysm-dda/json/items/magazine/nail.json
 share/cataclysm-dda/json/items/magazine/shot.json
 share/cataclysm-dda/json/items/magazine/weldgas.json
@@ -258,6 +267,7 @@ share/cataclysm-dda/json/items/resources
 share/cataclysm-dda/json/items/resources/misc.json
 share/cataclysm-dda/json/items/software.json
 share/cataclysm-dda/json/items/tool/
+share/cataclysm-dda/json/items/tool/deployable.json
 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
@@ -289,6 +299,7 @@ share/cataclysm-dda/json/mapgen/bandit_c
 share/cataclysm-dda/json/mapgen/bank.json
 share/cataclysm-dda/json/mapgen/bar.json
 share/cataclysm-dda/json/mapgen/basement/
+share/cataclysm-dda/json/mapgen/basement/basement_bionic.json
 share/cataclysm-dda/json/mapgen/basement/basement_chem.json
 share/cataclysm-dda/json/mapgen/basement/basement_game.json
 share/cataclysm-dda/json/mapgen/basement/basement_guns.json
@@ -374,6 +385,8 @@ share/cataclysm-dda/json/mapgen/house/ho
 share/cataclysm-dda/json/mapgen/house/house_garage4.json
 share/cataclysm-dda/json/mapgen/house/house_garage5.json
 share/cataclysm-dda/json/mapgen/house/house_garage6.json
+share/cataclysm-dda/json/mapgen/house/house_garage7.json
+share/cataclysm-dda/json/mapgen/house/house_garage8.json
 share/cataclysm-dda/json/mapgen/house/house_garage_prepper.json
 share/cataclysm-dda/json/mapgen/house/house_gardener.json
 share/cataclysm-dda/json/mapgen/house/house_library.json
@@ -482,11 +495,13 @@ 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/evac_center.json
 share/cataclysm-dda/json/mapgen_palettes/hospital.json
 share/cataclysm-dda/json/mapgen_palettes/houses_multistory.json
 share/cataclysm-dda/json/mapgen_palettes/lumberyard.json
 share/cataclysm-dda/json/mapgen_palettes/mansion.json
 share/cataclysm-dda/json/mapgen_palettes/office_doctor.json
+share/cataclysm-dda/json/mapgen_palettes/shelter.json
 share/cataclysm-dda/json/mapgen_palettes/subway.json
 share/cataclysm-dda/json/martialarts.json
 share/cataclysm-dda/json/materials.json
@@ -499,13 +514,19 @@ share/cataclysm-dda/json/monsterdrops/zo
 share/cataclysm-dda/json/monsterdrops/zombie_survivor.json
 share/cataclysm-dda/json/monsterdrops/zombie_technician.json
 share/cataclysm-dda/json/monstergroups.json
+share/cataclysm-dda/json/monstergroups_egg.json
 share/cataclysm-dda/json/monsters/
 share/cataclysm-dda/json/monsters.json
+share/cataclysm-dda/json/monsters/bird.json
 share/cataclysm-dda/json/monsters/defense_bot.json
 share/cataclysm-dda/json/monsters/drones.json
 share/cataclysm-dda/json/monsters/fish.json
+share/cataclysm-dda/json/monsters/insect_spider.json
+share/cataclysm-dda/json/monsters/mammal.json
 share/cataclysm-dda/json/monsters/military.json
 share/cataclysm-dda/json/monsters/obsolete.json
+share/cataclysm-dda/json/monsters/reptile_amphibian.json
+share/cataclysm-dda/json/monsters/triffid.json
 share/cataclysm-dda/json/monsters/zed_children.json
 share/cataclysm-dda/json/monsters/zed_explosive.json
 share/cataclysm-dda/json/morale_types.json
@@ -514,6 +535,7 @@ share/cataclysm-dda/json/multitile_city_
 share/cataclysm-dda/json/mutation_category.json
 share/cataclysm-dda/json/mutation_ordering.json
 share/cataclysm-dda/json/mutations.json
+share/cataclysm-dda/json/npc_destination_locations.json
 share/cataclysm-dda/json/npcs/
 share/cataclysm-dda/json/npcs/NC_ARSONIST.json
 share/cataclysm-dda/json/npcs/NC_BARTENDER.json
@@ -548,11 +570,12 @@ share/cataclysm-dda/json/npcs/missiondef
 share/cataclysm-dda/json/npcs/npc.json
 share/cataclysm-dda/json/npcs/talk_tags.json
 share/cataclysm-dda/json/overmap_connections.json
-share/cataclysm-dda/json/overmap_locations.json
+share/cataclysm-dda/json/overmap_special_locations.json
 share/cataclysm-dda/json/overmap_specials.json
 share/cataclysm-dda/json/overmap_terrain.json
 share/cataclysm-dda/json/player_activities.json
 share/cataclysm-dda/json/professions.json
+share/cataclysm-dda/json/ranged_balance.json
 share/cataclysm-dda/json/recipes/
 share/cataclysm-dda/json/recipes/ammo/
 share/cataclysm-dda/json/recipes/ammo/components.json
@@ -697,12 +720,14 @@ share/cataclysm-dda/mods/Boats/b_vehicle
 share/cataclysm-dda/mods/Boats/b_wooden_boat_parts.json
 share/cataclysm-dda/mods/Boats/modinfo.json
 share/cataclysm-dda/mods/BrightNights/
+share/cataclysm-dda/mods/BrightNights/bionics.json
 share/cataclysm-dda/mods/BrightNights/effects.json
 share/cataclysm-dda/mods/BrightNights/gun.json
 share/cataclysm-dda/mods/BrightNights/item groups/
 share/cataclysm-dda/mods/BrightNights/item groups/locations.json
 share/cataclysm-dda/mods/BrightNights/item_groups.json
 share/cataclysm-dda/mods/BrightNights/items/
+share/cataclysm-dda/mods/BrightNights/items/bionics.json
 share/cataclysm-dda/mods/BrightNights/items/books.json
 share/cataclysm-dda/mods/BrightNights/items/generic.json
 share/cataclysm-dda/mods/BrightNights/mapgen/
@@ -748,9 +773,9 @@ share/cataclysm-dda/mods/EW_Pack/ew_bull
 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_recipes.json
-share/cataclysm-dda/mods/EW_Pack/ew_retool.json
 share/cataclysm-dda/mods/EW_Pack/ew_weapons.json
 share/cataclysm-dda/mods/EW_Pack/modinfo.json
+share/cataclysm-dda/mods/EW_Pack/obsolete.json
 share/cataclysm-dda/mods/Fast_Zombies/
 share/cataclysm-dda/mods/Fast_Zombies/main.lua
 share/cataclysm-dda/mods/Fast_Zombies/modinfo.json
@@ -1658,9 +1683,11 @@ share/cataclysm-dda/mods/More_Survival_T
 share/cataclysm-dda/mods/More_Survival_Tools/traps.json
 share/cataclysm-dda/mods/Mundane_Zombies/
 share/cataclysm-dda/mods/Mundane_Zombies/modinfo.json
+share/cataclysm-dda/mods/Mundane_Zombies/z2keep.txt
 share/cataclysm-dda/mods/Mutant_NPCs/
 share/cataclysm-dda/mods/Mutant_NPCs/modinfo.json
 share/cataclysm-dda/mods/Mutant_NPCs/npc_classes_mutant.json
+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
@@ -1870,6 +1897,7 @@ share/cataclysm-dda/mods/realguns/gunmod
 share/cataclysm-dda/mods/realguns/item_groups.json
 share/cataclysm-dda/mods/realguns/magazine.json
 share/cataclysm-dda/mods/realguns/modinfo.json
+share/cataclysm-dda/mods/realguns/obsolete.json
 share/cataclysm-dda/mods/realguns/recipes.json
 share/cataclysm-dda/mods/realguns/requirements.json
 share/cataclysm-dda/mods/realguns/uncraft.json

Reply | Threaded
Open this post in threaded view
|

Re: [UPDATE] games/cataclysm-dda -> 20180628

Brian Callahan-3

On 07/01/18 18:13, trondd wrote:
> Overdue update to Cataclysm DDA.  Too many changes since February.  Lots
> of cool stuff added/changed.

Thanks Tim. Everything checks out here.
Anyone else want to give it a spin/OK or should I just go ahead and
commit it?

~Brian

> Tim.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile 5 Mar 2018 09:44:06 -0000 1.4
> +++ Makefile 1 Jul 2018 21:58:54 -0000
> @@ -1,12 +1,12 @@
>   # $OpenBSD: Makefile,v 1.4 2018/03/05 09:44:06 sthen Exp $
>  
>   COMMENT= rogue-like zombie survival game
> -DISTNAME= cataclysm-dda-2018.02.01
> +DISTNAME= cataclysm-dda-2018.06.28
>   CATEGORIES= games
>  
>   GH_ACCOUNT= CleverRaven
>   GH_PROJECT= Cataclysm-DDA
> -GH_COMMIT= cf64a8836391ba742ce1eca500e1e0409a654d83
> +GH_COMMIT= 1db1b62b57a38c18e5f118fb57dcb1290d42d9b9
>  
>   HOMEPAGE= http://en.cataclysmdda.com
>   MAINTAINER= Tim Meunier <[hidden email]>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 5 Mar 2018 09:44:06 -0000 1.3
> +++ distinfo 1 Jul 2018 21:58:54 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (cataclysm-dda-2018.02.01-cf64a883.tar.gz) = PqoXPbvHznM8ezzgbiejZZ7xuyzhI+iyWlBB7bXgHTk=
> -SIZE (cataclysm-dda-2018.02.01-cf64a883.tar.gz) = 60095165
> +SHA256 (cataclysm-dda-2018.06.28-1db1b62b.tar.gz) = Ja37CLFcbbl1/6fCfe7lq38SxXSqg0d2ulmCuwhAhlg=
> +SIZE (cataclysm-dda-2018.06.28-1db1b62b.tar.gz) = 64208890
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-Makefile
> --- patches/patch-Makefile 5 Mar 2018 09:44:06 -0000 1.4
> +++ patches/patch-Makefile 1 Jul 2018 21:58:54 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.4 2018/03/0
>   Index: Makefile
>   --- Makefile.orig
>   +++ Makefile
> -@@ -80,7 +80,6 @@
> +@@ -78,7 +78,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
> -@@ -232,7 +231,6 @@ ifdef RELEASE
> +@@ -229,7 +228,6 @@ ifdef RELEASE
>          OPTLEVEL = -O3
>        endif
>      endif
> @@ -19,7 +19,7 @@ Index: Makefile
>    
>      ifdef LTO
>        LDFLAGS += -fuse-ld=gold
> -@@ -253,7 +251,7 @@ ifdef RELEASE
> +@@ -250,7 +248,7 @@ ifdef RELEASE
>      endif
>      DEFINES += -DRELEASE
>      # Check for astyle or JSON regressions on release builds.
> @@ -28,7 +28,7 @@ Index: Makefile
>    endif
>    
>    ifndef RELEASE
> -@@ -268,7 +266,7 @@ endif
> +@@ -265,7 +263,7 @@ endif
>    ifeq ($(shell sh -c 'uname -o 2>/dev/null || echo not'),Cygwin)
>        OTHERS += -std=gnu++11
>      else
> @@ -37,7 +37,7 @@ Index: Makefile
>    endif
>    
>    CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS) -MMD -MP
> -@@ -407,11 +405,6 @@ ifdef MAPSIZE
> +@@ -406,11 +404,6 @@ ifdef MAPSIZE
>        CXXFLAGS += -DMAPSIZE=$(MAPSIZE)
>    endif
>    
> @@ -49,7 +49,7 @@ Index: Makefile
>    PKG_CONFIG = $(CROSS)pkg-config
>    SDL2_CONFIG = $(CROSS)sdl2-config
>    
> -@@ -716,7 +709,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS)
> +@@ -708,7 +701,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 \
>             )
> -@@ -770,35 +762,35 @@ distclean:
> +@@ -762,35 +754,35 @@ distclean:
>    bindist: $(BINDIST)
>    
>    ifeq ($(TARGETSYSTEM), LINUX)
> @@ -112,7 +112,7 @@ Index: Makefile
>     mkdir -p $(LOCALE_DIR)
>    ifdef LANGUAGES
>     LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES)
> -@@ -966,11 +958,6 @@ astyle: $(ASTYLED_WHITELIST)
> +@@ -959,11 +951,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)
> Index: pkg/PFRAG.no-no_x11
> ===================================================================
> RCS file: /cvs/ports/games/cataclysm-dda/pkg/PFRAG.no-no_x11,v
> retrieving revision 1.2
> diff -u -p -r1.2 PFRAG.no-no_x11
> --- pkg/PFRAG.no-no_x11 5 Mar 2018 09:44:06 -0000 1.2
> +++ pkg/PFRAG.no-no_x11 1 Jul 2018 21:58:54 -0000
> @@ -12,13 +12,13 @@ share/cataclysm-dda/gfx/ChestHole16Tiles
>   share/cataclysm-dda/gfx/ChestHole16Tileset/tiles.png
>   share/cataclysm-dda/gfx/ChestHole16Tileset/tiles24.png
>   share/cataclysm-dda/gfx/ChestHole16Tileset/tileset.txt
> +share/cataclysm-dda/gfx/ChestHole16Tileset/tree.png
>   share/cataclysm-dda/gfx/ChestHole32Tileset/
>   share/cataclysm-dda/gfx/ChestHole32Tileset/fallback.png
>   share/cataclysm-dda/gfx/ChestHole32Tileset/tile_config.json
>   share/cataclysm-dda/gfx/ChestHole32Tileset/tiles.png
>   share/cataclysm-dda/gfx/ChestHole32Tileset/tiles48.png
>   share/cataclysm-dda/gfx/ChestHole32Tileset/tileset.txt
> -share/cataclysm-dda/gfx/ChestHole32Tileset/tilesold.png
>   share/cataclysm-dda/gfx/ChestHole32Tileset/tree.png
>   share/cataclysm-dda/gfx/ChestHole32Tileset_iso/
>   share/cataclysm-dda/gfx/ChestHole32Tileset_iso/fallback.png
> @@ -58,26 +58,22 @@ share/cataclysm-dda/gfx/MShock32TilesetM
>   share/cataclysm-dda/gfx/MShock32TilesetModded/tileset.txt
>   share/cataclysm-dda/gfx/MshockXotto+/
>   share/cataclysm-dda/gfx/MshockXotto+/expan.png
> +share/cataclysm-dda/gfx/MshockXotto+/expan2.png
>   share/cataclysm-dda/gfx/MshockXotto+/fallback.png
>   share/cataclysm-dda/gfx/MshockXotto+/tile_config.json
>   share/cataclysm-dda/gfx/MshockXotto+/tiles.png
>   share/cataclysm-dda/gfx/MshockXotto+/tileset.txt
>   share/cataclysm-dda/gfx/MshockXotto+/tree.png
> +share/cataclysm-dda/gfx/MshockXotto+/treeO.png
>   share/cataclysm-dda/gfx/RetroASCIITileset/
>   share/cataclysm-dda/gfx/RetroASCIITileset/retroasciitiles.png
>   share/cataclysm-dda/gfx/RetroASCIITileset/tile_config.json
>   share/cataclysm-dda/gfx/RetroASCIITileset/tileset.txt
> -share/cataclysm-dda/gfx/RetroDaysTileset10/
> -share/cataclysm-dda/gfx/RetroDaysTileset10/retrodaysfallback10.png
> -share/cataclysm-dda/gfx/RetroDaysTileset10/retrodaystiles10.png
> -share/cataclysm-dda/gfx/RetroDaysTileset10/tile_config.json
> -share/cataclysm-dda/gfx/RetroDaysTileset10/tileset.txt
> -share/cataclysm-dda/gfx/RetroDaysTileset20/
> -share/cataclysm-dda/gfx/RetroDaysTileset20/tile_config.json
> -share/cataclysm-dda/gfx/RetroDaysTileset20/tileset.txt
> -share/cataclysm-dda/gfx/RetroDaysTileset20_iso/
> -share/cataclysm-dda/gfx/RetroDaysTileset20_iso/retrodaystiles20.png
> -share/cataclysm-dda/gfx/RetroDaysTileset20_iso/tile_config.json
> +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/tileset.txt
>   share/cataclysm-dda/gfx/ThuztorTileset@/
>   share/cataclysm-dda/gfx/ThuztorTileset@/thuztortiles@.png
>   share/cataclysm-dda/gfx/ThuztorTileset@/tile_config.json
> @@ -86,15 +82,13 @@ share/cataclysm-dda/gfx/TsuTileset/
>   share/cataclysm-dda/gfx/TsuTileset/tile_config.json
>   share/cataclysm-dda/gfx/TsuTileset/tileset.txt
>   share/cataclysm-dda/gfx/TsuTileset/tsutiles.png
> -share/cataclysm-dda/gfx/make_iso.py
> -share/cataclysm-dda/gfx/tile.png
>   share/cataclysm-dda/gfx/tile_config.json
>   share/cataclysm-dda/gfx/tile_config_template.json
>   share/cataclysm-dda/gfx/tinytile.png
>   share/cataclysm-dda/sound/
>   share/cataclysm-dda/sound/Basic/
> -share/cataclysm-dda/sound/Basic/menu_error.wav
> -share/cataclysm-dda/sound/Basic/menu_move.wav
> +share/cataclysm-dda/sound/Basic/menu_error.ogg
> +share/cataclysm-dda/sound/Basic/menu_move.ogg
>   share/cataclysm-dda/sound/Basic/musicset.json
>   share/cataclysm-dda/sound/Basic/soundpack.txt
>   share/cataclysm-dda/sound/Basic/soundset.json
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/games/cataclysm-dda/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 5 Mar 2018 09:44:06 -0000 1.3
> +++ pkg/PLIST 1 Jul 2018 21:58:54 -0000
> @@ -39,6 +39,7 @@ share/cataclysm-dda/json/emit.json
>   share/cataclysm-dda/json/faults.json
>   share/cataclysm-dda/json/flags.json
>   share/cataclysm-dda/json/furniture.json
> +share/cataclysm-dda/json/game_balance.json
>   share/cataclysm-dda/json/gates.json
>   share/cataclysm-dda/json/harvest.json
>   share/cataclysm-dda/json/health_msgs.json
> @@ -75,6 +76,7 @@ share/cataclysm-dda/json/items/ammo/300.
>   share/cataclysm-dda/json/items/ammo/3006.json
>   share/cataclysm-dda/json/items/ammo/308.json
>   share/cataclysm-dda/json/items/ammo/32.json
> +share/cataclysm-dda/json/items/ammo/357.json
>   share/cataclysm-dda/json/items/ammo/36paper.json
>   share/cataclysm-dda/json/items/ammo/38.json
>   share/cataclysm-dda/json/items/ammo/40.json
> @@ -93,6 +95,7 @@ share/cataclysm-dda/json/items/ammo/700n
>   share/cataclysm-dda/json/items/ammo/762.json
>   share/cataclysm-dda/json/items/ammo/762R.json
>   share/cataclysm-dda/json/items/ammo/762x25.json
> +share/cataclysm-dda/json/items/ammo/84x246mm.json
>   share/cataclysm-dda/json/items/ammo/8x40mm.json
>   share/cataclysm-dda/json/items/ammo/9mm.json
>   share/cataclysm-dda/json/items/ammo/9x18.json
> @@ -111,6 +114,7 @@ share/cataclysm-dda/json/items/armor/ban
>   share/cataclysm-dda/json/items/armor/boots.json
>   share/cataclysm-dda/json/items/armor/holster.json
>   share/cataclysm-dda/json/items/bionics.json
> +share/cataclysm-dda/json/items/biosignatures.json
>   share/cataclysm-dda/json/items/book/
>   share/cataclysm-dda/json/items/book/archery.json
>   share/cataclysm-dda/json/items/book/barter.json
> @@ -152,6 +156,7 @@ share/cataclysm-dda/json/items/comestibl
>   share/cataclysm-dda/json/items/comestibles/brewing.json
>   share/cataclysm-dda/json/items/comestibles/carnivore.json
>   share/cataclysm-dda/json/items/comestibles/drink.json
> +share/cataclysm-dda/json/items/comestibles/egg.json
>   share/cataclysm-dda/json/items/comestibles/med.json
>   share/cataclysm-dda/json/items/comestibles/mutagen.json
>   share/cataclysm-dda/json/items/comestibles/protein.json
> @@ -177,6 +182,7 @@ share/cataclysm-dda/json/items/gun/300.j
>   share/cataclysm-dda/json/items/gun/3006.json
>   share/cataclysm-dda/json/items/gun/308.json
>   share/cataclysm-dda/json/items/gun/32.json
> +share/cataclysm-dda/json/items/gun/357.json
>   share/cataclysm-dda/json/items/gun/36paper.json
>   share/cataclysm-dda/json/items/gun/38.json
>   share/cataclysm-dda/json/items/gun/40.json
> @@ -195,6 +201,7 @@ share/cataclysm-dda/json/items/gun/700nx
>   share/cataclysm-dda/json/items/gun/762.json
>   share/cataclysm-dda/json/items/gun/762R.json
>   share/cataclysm-dda/json/items/gun/762x25.json
> +share/cataclysm-dda/json/items/gun/84x246mm.json
>   share/cataclysm-dda/json/items/gun/8x40mm.json
>   share/cataclysm-dda/json/items/gun/9mm.json
>   share/cataclysm-dda/json/items/gun/9x18.json
> @@ -210,7 +217,6 @@ share/cataclysm-dda/json/items/gun/ups.j
>   share/cataclysm-dda/json/items/gunmod/
>   share/cataclysm-dda/json/items/gunmod/accessories.json
>   share/cataclysm-dda/json/items/gunmod/barrel.json
> -share/cataclysm-dda/json/items/gunmod/bore.json
>   share/cataclysm-dda/json/items/gunmod/grip.json
>   share/cataclysm-dda/json/items/gunmod/laser_gunmods.json
>   share/cataclysm-dda/json/items/gunmod/magazine.json
> @@ -230,6 +236,7 @@ share/cataclysm-dda/json/items/magazine/
>   share/cataclysm-dda/json/items/magazine/3006.json
>   share/cataclysm-dda/json/items/magazine/308.json
>   share/cataclysm-dda/json/items/magazine/32.json
> +share/cataclysm-dda/json/items/magazine/357.json
>   share/cataclysm-dda/json/items/magazine/38.json
>   share/cataclysm-dda/json/items/magazine/40.json
>   share/cataclysm-dda/json/items/magazine/40mm.json
> @@ -241,10 +248,12 @@ share/cataclysm-dda/json/items/magazine/
>   share/cataclysm-dda/json/items/magazine/57.json
>   share/cataclysm-dda/json/items/magazine/5x50.json
>   share/cataclysm-dda/json/items/magazine/762.json
> +share/cataclysm-dda/json/items/magazine/762R.json
>   share/cataclysm-dda/json/items/magazine/762x25.json
>   share/cataclysm-dda/json/items/magazine/8x40mm.json
>   share/cataclysm-dda/json/items/magazine/9mm.json
>   share/cataclysm-dda/json/items/magazine/9x18.json
> +share/cataclysm-dda/json/items/magazine/liquid.json
>   share/cataclysm-dda/json/items/magazine/nail.json
>   share/cataclysm-dda/json/items/magazine/shot.json
>   share/cataclysm-dda/json/items/magazine/weldgas.json
> @@ -258,6 +267,7 @@ share/cataclysm-dda/json/items/resources
>   share/cataclysm-dda/json/items/resources/misc.json
>   share/cataclysm-dda/json/items/software.json
>   share/cataclysm-dda/json/items/tool/
> +share/cataclysm-dda/json/items/tool/deployable.json
>   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
> @@ -289,6 +299,7 @@ share/cataclysm-dda/json/mapgen/bandit_c
>   share/cataclysm-dda/json/mapgen/bank.json
>   share/cataclysm-dda/json/mapgen/bar.json
>   share/cataclysm-dda/json/mapgen/basement/
> +share/cataclysm-dda/json/mapgen/basement/basement_bionic.json
>   share/cataclysm-dda/json/mapgen/basement/basement_chem.json
>   share/cataclysm-dda/json/mapgen/basement/basement_game.json
>   share/cataclysm-dda/json/mapgen/basement/basement_guns.json
> @@ -374,6 +385,8 @@ share/cataclysm-dda/json/mapgen/house/ho
>   share/cataclysm-dda/json/mapgen/house/house_garage4.json
>   share/cataclysm-dda/json/mapgen/house/house_garage5.json
>   share/cataclysm-dda/json/mapgen/house/house_garage6.json
> +share/cataclysm-dda/json/mapgen/house/house_garage7.json
> +share/cataclysm-dda/json/mapgen/house/house_garage8.json
>   share/cataclysm-dda/json/mapgen/house/house_garage_prepper.json
>   share/cataclysm-dda/json/mapgen/house/house_gardener.json
>   share/cataclysm-dda/json/mapgen/house/house_library.json
> @@ -482,11 +495,13 @@ 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/evac_center.json
>   share/cataclysm-dda/json/mapgen_palettes/hospital.json
>   share/cataclysm-dda/json/mapgen_palettes/houses_multistory.json
>   share/cataclysm-dda/json/mapgen_palettes/lumberyard.json
>   share/cataclysm-dda/json/mapgen_palettes/mansion.json
>   share/cataclysm-dda/json/mapgen_palettes/office_doctor.json
> +share/cataclysm-dda/json/mapgen_palettes/shelter.json
>   share/cataclysm-dda/json/mapgen_palettes/subway.json
>   share/cataclysm-dda/json/martialarts.json
>   share/cataclysm-dda/json/materials.json
> @@ -499,13 +514,19 @@ share/cataclysm-dda/json/monsterdrops/zo
>   share/cataclysm-dda/json/monsterdrops/zombie_survivor.json
>   share/cataclysm-dda/json/monsterdrops/zombie_technician.json
>   share/cataclysm-dda/json/monstergroups.json
> +share/cataclysm-dda/json/monstergroups_egg.json
>   share/cataclysm-dda/json/monsters/
>   share/cataclysm-dda/json/monsters.json
> +share/cataclysm-dda/json/monsters/bird.json
>   share/cataclysm-dda/json/monsters/defense_bot.json
>   share/cataclysm-dda/json/monsters/drones.json
>   share/cataclysm-dda/json/monsters/fish.json
> +share/cataclysm-dda/json/monsters/insect_spider.json
> +share/cataclysm-dda/json/monsters/mammal.json
>   share/cataclysm-dda/json/monsters/military.json
>   share/cataclysm-dda/json/monsters/obsolete.json
> +share/cataclysm-dda/json/monsters/reptile_amphibian.json
> +share/cataclysm-dda/json/monsters/triffid.json
>   share/cataclysm-dda/json/monsters/zed_children.json
>   share/cataclysm-dda/json/monsters/zed_explosive.json
>   share/cataclysm-dda/json/morale_types.json
> @@ -514,6 +535,7 @@ share/cataclysm-dda/json/multitile_city_
>   share/cataclysm-dda/json/mutation_category.json
>   share/cataclysm-dda/json/mutation_ordering.json
>   share/cataclysm-dda/json/mutations.json
> +share/cataclysm-dda/json/npc_destination_locations.json
>   share/cataclysm-dda/json/npcs/
>   share/cataclysm-dda/json/npcs/NC_ARSONIST.json
>   share/cataclysm-dda/json/npcs/NC_BARTENDER.json
> @@ -548,11 +570,12 @@ share/cataclysm-dda/json/npcs/missiondef
>   share/cataclysm-dda/json/npcs/npc.json
>   share/cataclysm-dda/json/npcs/talk_tags.json
>   share/cataclysm-dda/json/overmap_connections.json
> -share/cataclysm-dda/json/overmap_locations.json
> +share/cataclysm-dda/json/overmap_special_locations.json
>   share/cataclysm-dda/json/overmap_specials.json
>   share/cataclysm-dda/json/overmap_terrain.json
>   share/cataclysm-dda/json/player_activities.json
>   share/cataclysm-dda/json/professions.json
> +share/cataclysm-dda/json/ranged_balance.json
>   share/cataclysm-dda/json/recipes/
>   share/cataclysm-dda/json/recipes/ammo/
>   share/cataclysm-dda/json/recipes/ammo/components.json
> @@ -697,12 +720,14 @@ share/cataclysm-dda/mods/Boats/b_vehicle
>   share/cataclysm-dda/mods/Boats/b_wooden_boat_parts.json
>   share/cataclysm-dda/mods/Boats/modinfo.json
>   share/cataclysm-dda/mods/BrightNights/
> +share/cataclysm-dda/mods/BrightNights/bionics.json
>   share/cataclysm-dda/mods/BrightNights/effects.json
>   share/cataclysm-dda/mods/BrightNights/gun.json
>   share/cataclysm-dda/mods/BrightNights/item groups/
>   share/cataclysm-dda/mods/BrightNights/item groups/locations.json
>   share/cataclysm-dda/mods/BrightNights/item_groups.json
>   share/cataclysm-dda/mods/BrightNights/items/
> +share/cataclysm-dda/mods/BrightNights/items/bionics.json
>   share/cataclysm-dda/mods/BrightNights/items/books.json
>   share/cataclysm-dda/mods/BrightNights/items/generic.json
>   share/cataclysm-dda/mods/BrightNights/mapgen/
> @@ -748,9 +773,9 @@ share/cataclysm-dda/mods/EW_Pack/ew_bull
>   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_recipes.json
> -share/cataclysm-dda/mods/EW_Pack/ew_retool.json
>   share/cataclysm-dda/mods/EW_Pack/ew_weapons.json
>   share/cataclysm-dda/mods/EW_Pack/modinfo.json
> +share/cataclysm-dda/mods/EW_Pack/obsolete.json
>   share/cataclysm-dda/mods/Fast_Zombies/
>   share/cataclysm-dda/mods/Fast_Zombies/main.lua
>   share/cataclysm-dda/mods/Fast_Zombies/modinfo.json
> @@ -1658,9 +1683,11 @@ share/cataclysm-dda/mods/More_Survival_T
>   share/cataclysm-dda/mods/More_Survival_Tools/traps.json
>   share/cataclysm-dda/mods/Mundane_Zombies/
>   share/cataclysm-dda/mods/Mundane_Zombies/modinfo.json
> +share/cataclysm-dda/mods/Mundane_Zombies/z2keep.txt
>   share/cataclysm-dda/mods/Mutant_NPCs/
>   share/cataclysm-dda/mods/Mutant_NPCs/modinfo.json
>   share/cataclysm-dda/mods/Mutant_NPCs/npc_classes_mutant.json
> +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
> @@ -1870,6 +1897,7 @@ share/cataclysm-dda/mods/realguns/gunmod
>   share/cataclysm-dda/mods/realguns/item_groups.json
>   share/cataclysm-dda/mods/realguns/magazine.json
>   share/cataclysm-dda/mods/realguns/modinfo.json
> +share/cataclysm-dda/mods/realguns/obsolete.json
>   share/cataclysm-dda/mods/realguns/recipes.json
>   share/cataclysm-dda/mods/realguns/requirements.json
>   share/cataclysm-dda/mods/realguns/uncraft.json
>