Charlene Wendling <juliana...@posteo.jp> wrote: > On Sun, 11 Nov 2018 18:58:15 -0500 > trondd wrote: > > > Charlene Wendling <juliana...@posteo.jp> wrote: > > > > > On Fri, 02 Nov 2018 21:13:14 -0400 > > > trondd wrote: > > > > > > > A catch up update to Cataclysm DDA. A lot of changes as usual. > > > > Over 2,000 commits. Some highlights I could pick out: > > > > > > > > Mushy food - still edible but not pleasant > > > > Thorned bushes > > > > Tall grass - slows movement > > > > Coal buring steam engines > > > > Have to wield an item to trow it > > > > Nuts added as food > > > > Vehicle bike racks > > > > Hauling items on the ground > > > > Map memory - the areas you've seen are still visible at night and > > > > behind walls Different levels of butchery - quick, field dress, > > > > etc for better yields vs time Auto actions like autosortng > > > > Vermin spawn in dirty areas - mop up your space > > > > Building updates > > > > Scenario updates > > > > UI tweaks > > > > Etc. > > > > > > > > Important upgrade note: > > > > Bio-mod was obsoleted. If you have a world with it enabled you'll > > > > get a duplicate bionics error when loading a saved world with it > > > > enabled. You can edit your save file and remove the mod. > > > > > > > > Tim. > > > > > > <diff zapped> > > > > > > Hi ports, Tim, > > > > > > On amd64, it builds and runs fine. > > > > > > On i386, it builds without issues, but it segfaults at runtime. I > > > highly suspect it's once again due to inteldrm issues on that box > > > and not related to the port itself. I'm leaving a backtrace if > > > needed, it occurred with: > > > > > > OpenBSD 6.4-current (GENERIC.MP) #987: Sat Nov 3 11:16:36 MDT 2018 > > > dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC.MP > > > > > > The segfault is reproducible with cataclysm-dda-2018.09.02 as well. > > > > > > Charlène. > > > > After a vacation, I am now unable to reproduce this on i386 > > -current. Can I get a confirmation? > > > > Thanks. > > Tim. > > > > It works fine here too :) > > Charlène.
Thanks, Charlène. Looking for someone to commit, then. Tim. Index: Makefile =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile 3 Sep 2018 19:02:21 -0000 1.6 +++ Makefile 3 Nov 2018 01:02:24 -0000 @@ -1,12 +1,12 @@ # $OpenBSD: Makefile,v 1.6 2018/09/03 19:02:21 bcallah Exp $ COMMENT= rogue-like zombie survival game -DISTNAME= cataclysm-dda-2018.09.02 +DISTNAME= cataclysm-dda-2018.11.01 CATEGORIES= games GH_ACCOUNT= CleverRaven GH_PROJECT= Cataclysm-DDA -GH_COMMIT= 47298ed1dea10582ae57a3decfe548640ac576de +GH_COMMIT= 473c84e270095e8095d5e00d8af8ddba012d9286 HOMEPAGE= http://en.cataclysmdda.com MAINTAINER= Tim Meunier <tro...@kagu-tsuchi.com> @@ -33,8 +33,8 @@ LIB_DEPENDS= devel/gettext MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" -MAKE_FLAGS= ASTYLE=0 RELEASE=1 USE_XDG_DIR=1 LOCALIZE=1 \ - LANGUAGES=all LUA=1 LUA_BINARY=${MODLUA_BIN:T} +MAKE_FLAGS= ASTYLE=0 BSD=1 RELEASE=1 USE_XDG_DIR=1 LINTJSON=0 \ + LOCALIZE=1 LANGUAGES=all LUA=1 LUA_BINARY=${MODLUA_BIN:T} .if ${FLAVOR:Mno_x11} WANTLIB+= curses @@ -53,6 +53,9 @@ MAN_TILES= -tiles USE_GMAKE= Yes NO_TEST= Yes + +post-patch: + sed -i 's,/usr,${PREFIX},' ${WRKSRC}/lua/autoexec.lua post-install: ${INSTALL_MAN} ${WRKSRC}/doc/cataclysm${MAN_TILES}.6 ${PREFIX}/man/man6/ Index: distinfo =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 3 Sep 2018 19:02:21 -0000 1.5 +++ distinfo 3 Nov 2018 01:02:24 -0000 @@ -1,2 +1,2 @@ -SHA256 (cataclysm-dda-2018.09.02-47298ed1.tar.gz) = JPSV9YJD5kx5dzvVodr8xB6deRp3JnFQN3ysWdaV61w= -SIZE (cataclysm-dda-2018.09.02-47298ed1.tar.gz) = 64529975 +SHA256 (cataclysm-dda-2018.11.01-473c84e2.tar.gz) = g0APey4DAnW6/b9vDYzNFgybfnVUx5NSIzXxWstHNDM= +SIZE (cataclysm-dda-2018.11.01-473c84e2.tar.gz) = 71795769 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-Makefile,v retrieving revision 1.6 diff -u -p -r1.6 patch-Makefile --- patches/patch-Makefile 3 Sep 2018 19:02:21 -0000 1.6 +++ patches/patch-Makefile 3 Nov 2018 01:02:24 -0000 @@ -40,6 +40,15 @@ Index: Makefile PKG_CONFIG = $(CROSS)pkg-config SDL2_CONFIG = $(CROSS)sdl2-config +@@ -754,7 +747,7 @@ ifdef LTO + endif + endif + +-all: version $(CHECKS) $(TARGET) $(L10N) $(TESTS) validate-pr ++all: version $(CHECKS) $(TARGET) $(L10N) $(TESTS) + @ + + $(TARGET): $(OBJS) @@ -773,7 +766,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(OBJS) .PHONY: version json-verify version: @@ -48,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,35 +819,35 @@ distclean: +@@ -827,36 +819,36 @@ distclean: bindist: $(BINDIST) ifeq ($(TARGETSYSTEM), LINUX) @@ -92,8 +101,10 @@ Index: Makefile ifdef LUA mkdir -p $(DATA_PREFIX)/lua - install --mode=644 lua/autoexec.lua $(DATA_PREFIX)/lua +- install --mode=644 lua/log.lua $(DATA_PREFIX)/lua - install --mode=644 lua/class_definitions.lua $(DATA_PREFIX)/lua + install -m 644 lua/autoexec.lua $(DATA_PREFIX)/lua ++ install -m 644 lua/log.lua $(DATA_PREFIX)/lua + install -m 644 lua/class_definitions.lua $(DATA_PREFIX)/lua endif - install --mode=644 data/changelog.txt data/cataicon.ico data/fontdata.json \ @@ -103,7 +114,7 @@ Index: Makefile mkdir -p $(LOCALE_DIR) ifdef LANGUAGES LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES) -@@ -1027,11 +1019,6 @@ astyle: $(ASTYLED_WHITELIST) +@@ -1029,11 +1021,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: patches/patch-src_translations_cpp =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-src_translations_cpp,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_translations_cpp --- patches/patch-src_translations_cpp 27 Dec 2017 22:00:17 -0000 1.2 +++ patches/patch-src_translations_cpp 3 Nov 2018 01:02:24 -0000 @@ -3,12 +3,12 @@ $OpenBSD: patch-src_translations_cpp,v 1 Index: src/translations.cpp --- src/translations.cpp.orig +++ src/translations.cpp -@@ -176,7 +176,7 @@ void set_language() - - // Step 2. Bind to gettext domain. - std::string locale_dir; --#if (defined __linux__ || (defined MACOSX && !defined TILES)) -+#if (defined __linux__ || defined __OpenBSD__ || (defined MACOSX && !defined TILES)) +@@ -190,7 +190,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" ); +-#elif (defined __linux__ || (defined MACOSX && !defined TILES)) ++#elif (defined __linux__ || defined __OpenBSD__ || (defined MACOSX && !defined TILES)) if( !FILENAMES["base_path"].empty() ) { locale_dir = FILENAMES["base_path"] + "share/locale"; } else { Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 3 Sep 2018 19:02:21 -0000 1.5 +++ pkg/PLIST 3 Nov 2018 01:02:25 -0000 @@ -7,6 +7,7 @@ share/cataclysm-dda/cataicon.ico share/cataclysm-dda/changelog.txt share/cataclysm-dda/core/ share/cataclysm-dda/core/basic.json +share/cataclysm-dda/core/tips.json share/cataclysm-dda/credits/ share/cataclysm-dda/credits/de.credits share/cataclysm-dda/credits/en.credits @@ -415,13 +416,16 @@ share/cataclysm-dda/json/mapgen/hunting_ share/cataclysm-dda/json/mapgen/jewel_store.json share/cataclysm-dda/json/mapgen/junkyard.json share/cataclysm-dda/json/mapgen/lab/ +share/cataclysm-dda/json/mapgen/lab/README.md share/cataclysm-dda/json/mapgen/lab/lab_central.json share/cataclysm-dda/json/mapgen/lab/lab_common.json +share/cataclysm-dda/json/mapgen/lab/lab_escape.json share/cataclysm-dda/json/mapgen/lab/lab_floorplan_cross.json share/cataclysm-dda/json/mapgen/lab/lab_floorplans.json share/cataclysm-dda/json/mapgen/lab/lab_floorplans_1side.json share/cataclysm-dda/json/mapgen/lab/lab_floorplans_finale1level.json share/cataclysm-dda/json/mapgen/lab/lab_rooms.json +share/cataclysm-dda/json/mapgen/lab/lab_rooms_wall.json share/cataclysm-dda/json/mapgen/lab/lab_trains.json share/cataclysm-dda/json/mapgen/lan_center.json share/cataclysm-dda/json/mapgen/landfill.json @@ -568,6 +572,7 @@ share/cataclysm-dda/json/monsters/zed_ex share/cataclysm-dda/json/morale_types.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/NC_ARSONIST.json @@ -587,14 +592,22 @@ 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.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_EVAC_GUARD1.json share/cataclysm-dda/json/npcs/TALK_EVAC_GUARD2.json share/cataclysm-dda/json/npcs/TALK_EVAC_GUARD3.json share/cataclysm-dda/json/npcs/TALK_EVAC_HUNTER.json 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_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_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/destination_locations.json share/cataclysm-dda/json/npcs/epilogues.json @@ -705,6 +718,8 @@ share/cataclysm-dda/json/uncraft/ammo/76 share/cataclysm-dda/json/uncraft/ammo/9mm.json share/cataclysm-dda/json/uncraft/ammo/flintlock.json share/cataclysm-dda/json/uncraft/ammo/shot.json +share/cataclysm-dda/json/uncraft/cbm/ +share/cataclysm-dda/json/uncraft/cbm/cbm.json share/cataclysm-dda/json/uncraft/classes/ share/cataclysm-dda/json/uncraft/classes/ammo.json share/cataclysm-dda/json/uncraft/generic.json @@ -741,6 +756,7 @@ share/cataclysm-dda/json/vehicles/emerge share/cataclysm-dda/json/vehicles/farm.json 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/trucks.json share/cataclysm-dda/json/vehicles/utility.json share/cataclysm-dda/json/vehicles/vans_busses.json @@ -749,6 +765,7 @@ share/cataclysm-dda/json/vitamin.json share/cataclysm-dda/lua/ share/cataclysm-dda/lua/autoexec.lua share/cataclysm-dda/lua/class_definitions.lua +share/cataclysm-dda/lua/log.lua share/cataclysm-dda/mods/ share/cataclysm-dda/mods/Animatronics/ share/cataclysm-dda/mods/Animatronics/animatronics.json @@ -848,6 +865,74 @@ share/cataclysm-dda/mods/FictonalWeapons share/cataclysm-dda/mods/FictonalWeapons/snippets.json share/cataclysm-dda/mods/Filthy_Morale/ share/cataclysm-dda/mods/Filthy_Morale/modinfo.json +share/cataclysm-dda/mods/Fuji_Structures/ +share/cataclysm-dda/mods/Fuji_Structures/items/ +share/cataclysm-dda/mods/Fuji_Structures/items/itemgroups.json +share/cataclysm-dda/mods/Fuji_Structures/items/items_games.json +share/cataclysm-dda/mods/Fuji_Structures/items/vehicle_groups.json +share/cataclysm-dda/mods/Fuji_Structures/modinfo.json +share/cataclysm-dda/mods/Fuji_Structures/monsters/ +share/cataclysm-dda/mods/Fuji_Structures/monsters/monstergroups.json +share/cataclysm-dda/mods/Fuji_Structures/npc/ +share/cataclysm-dda/mods/Fuji_Structures/npc/NC_BUNKER_MERCHANT.json +share/cataclysm-dda/mods/Fuji_Structures/npc/TALK_BUNKER_MERCHANT.json +share/cataclysm-dda/mods/Fuji_Structures/npc/classes.json +share/cataclysm-dda/mods/Fuji_Structures/npc/npc.json +share/cataclysm-dda/mods/Fuji_Structures/starts/ +share/cataclysm-dda/mods/Fuji_Structures/starts/professions.json +share/cataclysm-dda/mods/Fuji_Structures/starts/scenarios.json +share/cataclysm-dda/mods/Fuji_Structures/starts/start_locations.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/ +share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/ +share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_atc.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_atc_2.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_atc_3.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_hangars.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_parking.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_runway.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_runway_hangars.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_runway_l.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_runway_r.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_runway_term.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/airport/s_air_term.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/bunker_shop/ +share/cataclysm-dda/mods/Fuji_Structures/worldgen/bunker_shop/s_bunker_shop_b.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/bunker_shop/s_bunker_shop_g.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/gas/ +share/cataclysm-dda/mods/Fuji_Structures/worldgen/gas/s_gas_b11.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/gas/s_gas_b20.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/gas/s_gas_b21.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/gas/s_gas_g0.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/gas/s_gas_g1.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/ +share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/_house_template.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_1.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_10.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_2.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_3.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_4.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_5.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_6.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_7.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_8.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/houses/house_9.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/ +share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_00.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_01.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_10.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_11.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_road_0.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/lightindustry/s_lightindustry_road_1.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/overmap_specials.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/overmap_terrain.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/regional_overlay.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_apt.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_apt_2.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_camping.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_cardealer.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_diner.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_games.json +share/cataclysm-dda/mods/Fuji_Structures/worldgen/s_gunstore.json share/cataclysm-dda/mods/Generic_Guns/ share/cataclysm-dda/mods/Generic_Guns/gg_ammo_blacklist.json share/cataclysm-dda/mods/Generic_Guns/gg_ammo_hand_override.json @@ -891,6 +976,23 @@ share/cataclysm-dda/mods/Medieval_Stuff/ share/cataclysm-dda/mods/Medieval_Stuff/snippets.json share/cataclysm-dda/mods/Medieval_Stuff/techniques.json share/cataclysm-dda/mods/Medieval_Stuff/tools.json +share/cataclysm-dda/mods/Modular_Turrets/ +share/cataclysm-dda/mods/Modular_Turrets/blacklist.json +share/cataclysm-dda/mods/Modular_Turrets/corpses.json +share/cataclysm-dda/mods/Modular_Turrets/emit.json +share/cataclysm-dda/mods/Modular_Turrets/furniture.json +share/cataclysm-dda/mods/Modular_Turrets/item_groups.json +share/cataclysm-dda/mods/Modular_Turrets/items.json +share/cataclysm-dda/mods/Modular_Turrets/modinfo.json +share/cataclysm-dda/mods/Modular_Turrets/monster.json +share/cataclysm-dda/mods/Modular_Turrets/monster_attacks.json +share/cataclysm-dda/mods/Modular_Turrets/monster_drops.json +share/cataclysm-dda/mods/Modular_Turrets/monster_override.json +share/cataclysm-dda/mods/Modular_Turrets/monstergroups.json +share/cataclysm-dda/mods/Modular_Turrets/recipe.json +share/cataclysm-dda/mods/Modular_Turrets/roboguns.json +share/cataclysm-dda/mods/Modular_Turrets/uncraft.json +share/cataclysm-dda/mods/Modular_Turrets/uncraft_corpse.json share/cataclysm-dda/mods/More_Buildings/ share/cataclysm-dda/mods/More_Buildings/json/ share/cataclysm-dda/mods/More_Buildings/json/baseballfield_a1.json @@ -1818,6 +1920,53 @@ share/cataclysm-dda/mods/RL_Classes/modi share/cataclysm-dda/mods/Safe_autodoc/ share/cataclysm-dda/mods/Safe_autodoc/game_balance.json share/cataclysm-dda/mods/Safe_autodoc/modinfo.json +share/cataclysm-dda/mods/Salvaged_Robots/ +share/cataclysm-dda/mods/Salvaged_Robots/corpses.json +share/cataclysm-dda/mods/Salvaged_Robots/emit.json +share/cataclysm-dda/mods/Salvaged_Robots/harvest.json +share/cataclysm-dda/mods/Salvaged_Robots/item_groups.json +share/cataclysm-dda/mods/Salvaged_Robots/items.json +share/cataclysm-dda/mods/Salvaged_Robots/modinfo.json +share/cataclysm-dda/mods/Salvaged_Robots/monster_attacks.json +share/cataclysm-dda/mods/Salvaged_Robots/monster_drops.json +share/cataclysm-dda/mods/Salvaged_Robots/monstergroups.json +share/cataclysm-dda/mods/Salvaged_Robots/monsters.json +share/cataclysm-dda/mods/Salvaged_Robots/recipe.json +share/cataclysm-dda/mods/Salvaged_Robots/roboguns.json +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/ +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/40mm.json +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/item_groups.json +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/items.json +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/overmap_special.json +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/overmap_terrain.json +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/paintball.json +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/professions.json +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/readme.txt +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/robot_dispatch/ +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/robot_dispatch/dispatch_first_01.json +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/robot_dispatch/dispatch_second_01.json +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/scenarios.json +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/start_locations.json +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/tpalettes.json +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/vehicle_groups.json +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/vehicle_parts.json +share/cataclysm-dda/mods/Salvaged_Robots/robot_additions/vehicles.json +share/cataclysm-dda/mods/Salvaged_Robots/speech.json +share/cataclysm-dda/mods/Salvaged_Robots/uncraft.json +share/cataclysm-dda/mods/Salvaged_Robots/uncraft_corpse.json +share/cataclysm-dda/mods/Sleep_Deprivation/ +share/cataclysm-dda/mods/Sleep_Deprivation/bionics.json +share/cataclysm-dda/mods/Sleep_Deprivation/effects.json +share/cataclysm-dda/mods/Sleep_Deprivation/game_balance.json +share/cataclysm-dda/mods/Sleep_Deprivation/item_actions.json +share/cataclysm-dda/mods/Sleep_Deprivation/item_groups.json +share/cataclysm-dda/mods/Sleep_Deprivation/itemgroups/ +share/cataclysm-dda/mods/Sleep_Deprivation/itemgroups/drugs.json +share/cataclysm-dda/mods/Sleep_Deprivation/items/ +share/cataclysm-dda/mods/Sleep_Deprivation/items/bionics.json +share/cataclysm-dda/mods/Sleep_Deprivation/items/comestibles/ +share/cataclysm-dda/mods/Sleep_Deprivation/items/comestibles/med.json +share/cataclysm-dda/mods/Sleep_Deprivation/modinfo.json share/cataclysm-dda/mods/Slow_Zombies/ share/cataclysm-dda/mods/Slow_Zombies/main.lua share/cataclysm-dda/mods/Slow_Zombies/modinfo.json @@ -1946,6 +2095,142 @@ share/cataclysm-dda/mods/makeshift/item. share/cataclysm-dda/mods/makeshift/item_groups.json share/cataclysm-dda/mods/makeshift/modinfo.json share/cataclysm-dda/mods/makeshift/recipe.json +share/cataclysm-dda/mods/mapspecials_demo/ +share/cataclysm-dda/mods/mapspecials_demo/FEMA/ +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_blc_00.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_blc_01.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_blc_02.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_blc_03.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_brc_00.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_brc_01.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_brc_02.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_brc_03.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_entrance_00.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_entrance_01.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_entrance_02.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_entrance_03.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_le_00.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_le_01.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_le_02.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_le_03.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_mid_00.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_mid_01.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_mid_02.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_mid_03.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_re_00.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_re_01.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_re_02.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_re_03.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_te_00.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_te_01.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_te_02.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_te_03.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_tlc_00.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_tlc_01.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_tlc_02.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_tlc_03.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_trc_00.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_trc_01.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_trc_02.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/FEMA_trc_03.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/overmap_specials.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/overmap_terrain.json +share/cataclysm-dda/mods/mapspecials_demo/FEMA/palettes.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/ +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1blc_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1blc_02.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1blc_03.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1blc_04.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1blc_05.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1brc_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1brc_02.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1brc_03.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1brc_04.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1brc_05.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1le_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1le_02.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1le_03.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1le_04.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1le_05.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1mid_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1mid_02.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1mid_03.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1mid_04.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1mid_05.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1re_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1re_02.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1re_03.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1re_04.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1re_05.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1te_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1te_02.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1te_03.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1te_04.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1te_05.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1tlc_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1tlc_02.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1tlc_03.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1tlc_04.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1tlc_05.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1trc_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1trc_02.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1trc_03.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1trc_04.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_1trc_05.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2be_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2blc_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2brc_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2le_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2mid_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2re_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2te_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2tlc_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_2trc_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3be_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3blc_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3brc_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3le_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3mid_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3re_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3te_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3tlc_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_3trc_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_entrance_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_entrance_02.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/mega_parking_01.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/overmap_specials.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/overmap_terrain.json +share/cataclysm-dda/mods/mapspecials_demo/megastore/palettes.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/ +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/monster_groups.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/overmap_specials.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/overmap_terrain.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/palettes.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_blc_01.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_brc_01.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_entrance_01.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_fblc_01.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_fbrc_01.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ftlc_01.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ftrc_01.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_trc_01.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ublc_01.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ublc_02.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ublc_03.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ubrc_01.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ubrc_02.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_ubrc_03.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlca_01.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlca_02.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlca_03.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlcb_01.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlcb_02.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlcb_03.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utlcb_04.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utrc_01.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utrc_02.json +share/cataclysm-dda/mods/mapspecials_demo/missile_silo/silo_utrc_03.json +share/cataclysm-dda/mods/mapspecials_demo/modinfo.json share/cataclysm-dda/mods/more_classes_scenarios/ share/cataclysm-dda/mods/more_classes_scenarios/cs_classes.json share/cataclysm-dda/mods/more_classes_scenarios/cs_scenarios.json @@ -1998,6 +2283,7 @@ share/cataclysm-dda/raw/keybindings.json share/cataclysm-dda/raw/keybindings/vehicle.json share/cataclysm-dda/raw/sokoban.txt share/cataclysm-dda/title/ +share/cataclysm-dda/title/en.halloween share/cataclysm-dda/title/en.title share/cataclysm-dda/title/ru.title share/cataclysm-dda/title/zh_CN.title
