Update to a recent commit with lots of updates. Some highlights include: Updatse to the ChestHole tileset New 'seeds' category Cash cards are finally displayed in dollars instead of cents. Removed prepper house as a starting location so you don't step on a landmine and die on your first move Cars now have dashboards Fix to low level mutations Translations updates NPCs more intelligently run from explosives Replaced loose pickels with jars of pickels Speedloaders More reasonable nutrition from mustard and mayonnaise Morale crafting speed penalty Play Now! mode Railroads Scope recipes
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 26 Apr 2018 23:32:40 -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.04.21 CATEGORIES= games GH_ACCOUNT= CleverRaven GH_PROJECT= Cataclysm-DDA -GH_COMMIT= cf64a8836391ba742ce1eca500e1e0409a654d83 +GH_COMMIT= 4f7da1ef4d04be66a9b81dec3e5470c15772bef0 HOMEPAGE= http://en.cataclysmdda.com MAINTAINER= Tim Meunier <[email protected]> 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 26 Apr 2018 23:32:40 -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.04.21-4f7da1ef.tar.gz) = inUlKkXT01yZQPNk72rLYyeXYn+c9xEs4tS915L/j60= +SIZE (cataclysm-dda-2018.04.21-4f7da1ef.tar.gz) = 60672877 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 26 Apr 2018 23:32:40 -0000 @@ -37,7 +37,7 @@ Index: Makefile endif CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS) -MMD -MP -@@ -407,11 +405,6 @@ ifdef MAPSIZE +@@ -409,11 +407,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) +@@ -718,7 +711,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: +@@ -772,35 +764,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) +@@ -968,11 +960,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 26 Apr 2018 23:32:40 -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 @@ -67,17 +67,11 @@ share/cataclysm-dda/gfx/RetroASCIITilese 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@/[email protected] share/cataclysm-dda/gfx/ThuztorTileset@/tile_config.json @@ -86,15 +80,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 26 Apr 2018 23:32:40 -0000 @@ -75,6 +75,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 @@ -177,6 +178,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 @@ -210,7 +212,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 +231,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 +243,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 +262,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 @@ -374,6 +379,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 @@ -487,6 +494,7 @@ share/cataclysm-dda/json/mapgen_palettes 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 @@ -514,6 +522,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 +557,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 +707,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 +760,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 @@ -1661,6 +1673,7 @@ share/cataclysm-dda/mods/Mundane_Zombies 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 +1883,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
